Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,985 Commits 1 Branch 0 Tags
6eb2e18469015ddeef915fedeec423aedb1ce12e
Commit Graph

36985 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Hall
6eb2e18469 Merge pull request #12483 from edx/douglashall/SOL-1776/add_studio_acceptance_tests 
SOL-1776 Added Studio settings image upload acceptance tests
 2016-05-18 15:28:55 -04:00
Adam
55bfb74c6d Merge pull request #12481 from edx/fix-memory-leak 
clear request cache after celery task finishes (TNL-2705)
 2016-05-18 14:31:22 -04:00
Christina Roberts
9f1971ce83 Merge pull request #12501 from edx/christina/tnl-1619-xss 
Christina/tnl 1619 xss
 2016-05-18 14:02:19 -04:00
Douglas Hall
e2c65c57f1 Added Studio settings image upload acceptance tests 2016-05-18 13:33:25 -04:00
cahrens
fd1d72cc8d Wait for seek to complete before pressing play. 
TNL-4540
 2016-05-18 13:13:20 -04:00
Adam Palay
04dd61bead remove logging 2016-05-18 12:56:35 -04:00
Peter Fogg
06fa08394d Merge pull request #12491 from edx/peter-fogg/catalog-api-jwt-key 
Use the correct JWT key when authenticating against the course catalog API.
 2016-05-18 12:17:44 -04:00
Christina Roberts
16e9f9c6c7 Merge pull request #12500 from edx/christina/tnl-1619 
Can no longer play outside of the start/end time for the clip.
 2016-05-18 11:55:23 -04:00
Adam Palay
a7d638de9e clear request cache after celery task finishes (TNL-2705) 
set max_num_courses_in_cache on modulestore
 2016-05-18 10:43:54 -04:00
Syed Hasan raza
3e747c379f Merge pull request #12443 from edx/shr/log/PLAT-1023-PLAT-1031-Detail-Logging 
Detail Logging xmodule exceptions
 2016-05-18 13:59:54 +05:00
attiyaIshaque
2c5319e468 Merge pull request #12190 from edx/aj/sust-24-globalstaff-course-access 
Aj/sust 24 globalstaff course access
 2016-05-18 12:44:49 +05:00
attiyaishaque
48e7fc8125 Bokchoy Test Deleted. 2016-05-18 11:40:59 +05:00
attiyaishaque
275a31ec42 Change in Bokchoy test according to new design. 2016-05-18 11:40:58 +05:00
attiyaishaque
19ea9ae9a0 Unit tests added and changes in enroll_staff view. 2016-05-18 11:40:58 +05:00
attiyaishaque
b19264974b Adding unit test 2016-05-18 11:40:58 +05:00
attiyaishaque
94b58c2df6 Adding bokchoy test and change in html file. 2016-05-18 11:40:57 +05:00
Awais Jibran
3fb6592443 SUST-24 Initial commit 
Add bokchoy test and changes in html
 2016-05-18 11:40:57 +05:00
clrux
7b34f4317d Merge pull request #12502 from edx/clrux/ac-474 
Corrects duplicate main element wrapper on Wiki article template
 2016-05-17 17:36:43 -04:00
Alison Hodges
214091d33b Merge pull request #12467 from edx/ahodges/xrefs 
Updates and corrects href links to readthedocs
 2016-05-17 17:35:41 -04:00
John Eskew
e5a5704b38 Merge pull request #12495 from edx/jeskew/release_to_master_merge 
Merge release to master for 2016-05-17 release
 2016-05-17 17:16:16 -04:00
clrux
5db315bebf Merge pull request #12371 from edx/clrux/ac-405 
AC-405 calculator image to icon
 2016-05-17 17:11:56 -04:00
clrux
f0b33e33ff Merge pull request #12244 from edx/clrux/ac-399 
AC-399 adding alt for circuit schematic controls
 2016-05-17 17:11:38 -04:00
clrux
f7eba02808 Merge pull request #12411 from edx/clrux/ac-396 
AC-396 updating courseware nav to display correctly on high contrast displays
 2016-05-17 17:11:09 -04:00
Clinton Blackburn
c67ef7a8fa Merge pull request #12457 from edx/clintonb/user-update 
User administration updates
 2016-05-17 16:35:09 -04:00
Matt Drayer
f2ffbab0ec mattdrayer: Add receipt page + JS test fixes 2016-05-17 15:41:29 -04:00
AlasdairSwan
7a0d7818bc Offscreen a11y test fix 2016-05-17 15:41:28 -04:00
Matt Drayer
c6249f4227 mattdrayer/WL-466: Use LMS Courses API 2016-05-17 15:41:28 -04:00
AlasdairSwan
646d0b9b68 ECOM-4450 Added help tab and model styling to Pattern Library pages 2016-05-17 15:41:28 -04:00
cahrens
cafc15cf7d Move city and country fields to the very end. 
OSPR-1155
 2016-05-17 15:41:28 -04:00
Douglas Hall
4bdeaf7696 Always include the course price in the course_about template context 2016-05-17 15:41:27 -04:00
Douglas Hall
defb08e845 Include course price in course_about template context if either the ecommerce service is enabled or shoppingcart is enabled 2016-05-17 15:41:27 -04:00
Matt Drayer
fe1e659fb7 mattdrayer/rc/2016-05-17: Check for "code" on receipt line item attribute. 2016-05-17 15:41:27 -04:00
Peter Fogg
5abb77328e Use the correct JWT key when querying the Catalog API. 
ECOM-4441
 2016-05-17 15:28:19 -04:00
Chris Rodriguez
36cbdf576b Corrects duplicate main element wrapper on Wiki article template 2016-05-17 15:15:58 -04:00
Alison Hodges
95894da528 Updates and corrects href links to readthedocs 2016-05-17 15:01:00 -04:00
Peter Fogg
b38c4ed9be Provide a link to the catalog admin from the api_admin approval page. 
ECOM-4441
 2016-05-17 14:52:19 -04:00
cahrens
9d28237326 Can no longer play outside of the start/end time for the clip. 
This functionality was removed in PR 7111, but not all impacted
tests were deleted.
 2016-05-17 14:45:24 -04:00
Diana Huang
1ba73efcfc Merge pull request #12496 from edx/diana/fix-badge-bok-choy-tests 
Fix flaky bok-choy test
 2016-05-17 14:42:08 -04:00
Christina Roberts
d15166e6a3 Merge pull request #12482 from edx/christina/minimal-xss-fix 
Safe template cleanup in settings.html
 2016-05-17 14:18:27 -04:00
Waheed Ahmed
381dc5c274 Merge pull request #12489 from edx/waheed/use-course-overview-to-get-course 
Use CourseOverview instead of modulestore.
 2016-05-17 21:48:34 +05:00
Waheed Ahmed
ee65c8783d Use CourseOverview instead of modulestore. 2016-05-17 21:00:53 +05:00
Asad Iqbal
5d6362f3d5 Merge pull request #12147 from edx/asadiqbal08/WL-420 
asadiqbal08/WL-420 Updating drag and drop version. 
merging.
 2016-05-17 20:20:26 +05:00
Diana Huang
d38b43cce3 Set self.browser consistently in page objects. 2016-05-17 11:08:22 -04:00
Christina Roberts
8c418c62fe Merge pull request #12033 from sigberto/submission-history-tz 
Display correct timezone on timestamp for question submission
 2016-05-17 10:52:30 -04:00
Ahsan Ulhaq
7a43b57037 Merge pull request #12401 from edx/ahsan/removal-underscore-string-from-commerce-js 
Ahsan/removal underscore string from commerce js
 2016-05-17 19:49:17 +05:00
Peter Fogg
1bd2ec2535 Merge pull request #12474 from edx/peter-fogg/date-summary-fixes 
Fixes for courseware date formatting/translation.
 2016-05-17 10:13:15 -04:00
Ahsan Ulhaq
300002b54d Add js test for analytics event on LMS receipt page 
ECOM-4281
 2016-05-17 18:56:05 +05:00
Peter Fogg
80bfa36d09 Fixes for courseware date formatting/translation. 2016-05-17 09:20:07 -04:00
Christine Lytwynec
73806beeec Merge pull request #12478 from edx/clytwynec/ac-367 
Add skip_clean option to pa11ycrawler
 2016-05-17 09:05:21 -04:00
Syed Hassan Raza
ba280e2cf9 Detail Logging xmodule exceptions 2016-05-17 17:31:59 +05:00