Commits · e2c65c57f16ea24096a1dba94e95196f50ec28fe · edx / edx-platform · GitLab

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