Commits · 1162dbc18fda91b07a5942873387d60fd67b2cfc · Hsin-Yu Chien / edx-platform-release

May 18, 2016
- Enable VERIFY_XSS checking by default. · 1162dbc1
  Diana Huang authored 8 years ago
  
  1162dbc1
- Merge pull request #12501 from edx/christina/tnl-1619-xss · 9f1971ce
  Christina Roberts authored 8 years ago
```
Christina/tnl 1619 xss
```
  9f1971ce
- Wait for seek to complete before pressing play. · fd1d72cc
  cahrens authored 8 years ago
```
TNL-4540
```
  fd1d72cc
- Merge pull request #12491 from edx/peter-fogg/catalog-api-jwt-key · 06fa0839
  Peter Fogg authored 8 years ago
```
Use the correct JWT key when authenticating against the course catalog API.
```
  06fa0839
- Merge pull request #12500 from edx/christina/tnl-1619 · 16e9f9c6
  Christina Roberts authored 8 years ago
```
Can no longer play outside of the start/end time for the clip.
```
  16e9f9c6
- Merge pull request #12443 from edx/shr/log/PLAT-1023-PLAT-1031-Detail-Logging · 3e747c37
  Syed Hasan raza authored 8 years ago
```
Detail Logging xmodule exceptions
```
  3e747c37
- Merge pull request #12190 from edx/aj/sust-24-globalstaff-course-access · 2c5319e4
  attiyaIshaque authored 8 years ago
```
Aj/sust 24 globalstaff course access
```
  2c5319e4
- Bokchoy Test Deleted. · 48e7fc81
  attiyaishaque authored 8 years ago
  
  48e7fc81
- Change in Bokchoy test according to new design. · 275a31ec
  attiyaishaque authored 8 years ago
  
  275a31ec
- Unit tests added and changes in enroll_staff view. · 19ea9ae9
  attiyaishaque authored 8 years ago
  
  19ea9ae9
- Adding unit test · b1926497
  attiyaishaque authored 8 years ago
  
  b1926497
- Adding bokchoy test and change in html file. · 94b58c2d
  attiyaishaque authored 8 years ago
  
  94b58c2d
- SUST-24 Initial commit · 3fb65924
  Awais Jibran authored 9 years ago
```
Add bokchoy test and changes in html
```
  3fb65924
May 17, 2016
- Merge pull request #12502 from edx/clrux/ac-474 · 7b34f431
  clrux authored 8 years ago
```
Corrects duplicate main element wrapper on Wiki article template
```
  7b34f431
- Merge pull request #12467 from edx/ahodges/xrefs · 214091d3
  Alison Hodges authored 8 years ago
```
Updates and corrects href links to readthedocs
```
  214091d3
- Merge pull request #12495 from edx/jeskew/release_to_master_merge · e5a5704b
  John Eskew authored 8 years ago
```
Merge release to master for 2016-05-17 release
```
  e5a5704b
- Merge pull request #12371 from edx/clrux/ac-405 · 5db315be
  clrux authored 8 years ago
```
AC-405 calculator image to icon
```
  5db315be
- Merge pull request #12244 from edx/clrux/ac-399 · f0b33e33
  clrux authored 8 years ago
```
AC-399 adding alt for circuit schematic controls
```
  f0b33e33
- Merge pull request #12411 from edx/clrux/ac-396 · f7eba028
  clrux authored 8 years ago
```
AC-396 updating courseware nav to display correctly on high contrast displays
```
  f7eba028
- Merge pull request #12457 from edx/clintonb/user-update · c67ef7a8
  Clinton Blackburn authored 8 years ago
```
User administration updates
```
  c67ef7a8
- mattdrayer: Add receipt page + JS test fixes · f2ffbab0
  Matt Drayer authored 8 years ago
  
  f2ffbab0
- Offscreen a11y test fix · 7a0d7818
  AlasdairSwan authored 8 years ago
  
  7a0d7818
- mattdrayer/WL-466: Use LMS Courses API · c6249f42
  Matt Drayer authored 8 years ago
  
  c6249f42
- ECOM-4450 Added help tab and model styling to Pattern Library pages · 646d0b9b
  AlasdairSwan authored 8 years ago
  
  646d0b9b
- Move city and country fields to the very end. · cafc15cf
  cahrens authored 8 years ago
```
OSPR-1155
```
  cafc15cf
- Always include the course price in the course_about template context · 4bdeaf76
  Douglas Hall authored 8 years ago
  
  4bdeaf76
- Include course price in course_about template context if either the ecommerce... · defb08e8
  Douglas Hall authored 8 years ago
```
Include course price in course_about template context if either the ecommerce service is enabled or shoppingcart is enabled
```
  defb08e8
- mattdrayer/rc/2016-05-17: Check for "code" on receipt line item attribute. · fe1e659f
  Matt Drayer authored 8 years ago
  
  fe1e659f
- Use the correct JWT key when querying the Catalog API. · 5abb7732
  Peter Fogg authored 8 years ago
```
ECOM-4441
```
  5abb7732
- Corrects duplicate main element wrapper on Wiki article template · 36cbdf57
  Chris Rodriguez authored 8 years ago
  
  36cbdf57
- Updates and corrects href links to readthedocs · 95894da5
  Alison Hodges authored 8 years ago
  
  95894da5
- Provide a link to the catalog admin from the api_admin approval page. · b38c4ed9
  Peter Fogg authored 8 years ago
```
ECOM-4441
```
  b38c4ed9
- Can no longer play outside of the start/end time for the clip. · 9d282373
  cahrens authored 8 years ago
```
This functionality was removed in PR 7111, but not all impacted
tests were deleted.
```
  9d282373
- Merge pull request #12496 from edx/diana/fix-badge-bok-choy-tests · 1ba73efc
  Diana Huang authored 8 years ago
```
Fix flaky bok-choy test
```
  1ba73efc
- Merge pull request #12482 from edx/christina/minimal-xss-fix · d15166e6
  Christina Roberts authored 8 years ago
```
Safe template cleanup in settings.html
```
  d15166e6
- Merge pull request #12489 from edx/waheed/use-course-overview-to-get-course · 381dc5c2
  Waheed Ahmed authored 8 years ago
```
Use CourseOverview instead of modulestore.
```
  381dc5c2
- Use CourseOverview instead of modulestore. · ee65c878
  Waheed Ahmed authored 8 years ago
  
  ee65c878
- Merge pull request #12147 from edx/asadiqbal08/WL-420 · 5d6362f3
  Asad Iqbal authored 8 years ago
```
asadiqbal08/WL-420 Updating drag and drop version. 
merging. 
```
  5d6362f3
- Set self.browser consistently in page objects. · d38b43cc
  Diana Huang authored 8 years ago
  
  d38b43cc
- Merge pull request #12033 from sigberto/submission-history-tz · 8c418c62
  Christina Roberts authored 8 years ago
```
Display correct timezone on timestamp for question submission
```
  8c418c62