Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,426 Commits 1 Branch 0 Tags
71e0ce7a0b288dd5d7cd5f0664ca98206169beed
Commit Graph

35426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
71e0ce7a0b Merge pull request #11652 from edx/ned/yaml-safe-load 
Use yaml.safe_load, since we have no need for the greater power of .load
 2016-02-24 20:06:43 -05:00
Michael Frey
860dd1bd5a Merge pull request #11651 from edx/release 
Release
 2016-02-24 16:15:16 -05:00
Peter Desjardins
0f3b99182e Merge pull request #11642 from edx/pdesjardins/DOC-2638 
Fix build failures in the docs/en_us/platform_api guide.
 2016-02-24 15:47:07 -05:00
Ned Batchelder
a9ab395d43 Use yaml.safe_load, since we have no need for the greater power of .load 2016-02-24 15:36:04 -05:00
Michael Frey
70ad954eec Merge pull request #11648 from edx/patch/2016-02-24 
Only allow ecommerce checkout if user is also activated
 2016-02-24 15:08:23 -05:00
Ned Batchelder
ca4729c221 Merge pull request #11650 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-02-24 14:32:43 -05:00
Douglas Hall
b4a172961b Merge pull request #11600 from edx/ibrahimahmed443/SOL-1611 
add student email in credit service
 2016-02-24 14:30:15 -05:00
Braden MacDonald
c90601556c Merge pull request #11635 from open-craft/braden/dndv2-version-bump 
Use latest version of drag and drop xblock
 2016-02-24 11:10:44 -08:00
sanfordstudent
a7d6b13b7e Merge pull request #11637 from edx/sstudent/MA-1038-permanent-fix 
MA-1038
 2016-02-24 14:01:03 -05:00
Ned Batchelder
d8fbdafd90 Update translations (autogenerated message) 2016-02-24 17:59:51 +00:00
Adam Palay
c63dcf0dfe render mathjax in svg by default (TNL-4145) 
mathjax preview should be inline by default
 2016-02-24 12:51:30 -05:00
Adam Palay
2cb48742b2 mark discussion deletion test as flaky 2016-02-24 12:51:09 -05:00
Michael Frey
f1ebee433f Only allow ecommerce checkout if user is also activated 2016-02-24 11:23:40 -05:00
Michael Katz
fd065c9e8c Merge pull request #11643 from edx/release 
Release 2016-02-24
 2016-02-24 11:16:16 -05:00
Brian Beggs
a8094c39fa Merge pull request #11444 from mitocw/gdm_permission_fix_#193 
Modified permission classes for CCX REST APIs
 2016-02-24 09:59:05 -05:00
Giovanni Di Milia
7683eadcaf Modified permission classes for CCX REST APIs 
Modified how the per object permissions are enforced in the CCX REST APIs
 2016-02-24 08:40:07 -05:00
Awais Jibran
d114be732f Merge pull request #11514 from attiyaIshaque/ai/tnl4067-auto-register-course 
User automatically registered to course.
 2016-02-24 11:24:58 +05:00
Michael Katz
44c27bb1bb Merge pull request #11606 from edx/rc/2016-02-23 
Release Candidate rc/2016-02-23
 2016-02-23 20:19:32 -05:00
Peter Desjardins
6ee64fc685 Adjusted the list of mock modules for the platform API documentation build. This prevents build failures when Sphinx cannot import modules. Addresses https://openedx.atlassian.net/browse/DOC-2638. 2016-02-23 17:48:22 -05:00
Ned Batchelder
c88697cae5 Merge pull request #11634 from edx/ned/better-uninstall 
A better way to manage the Python packages to uninstall.
 2016-02-23 15:02:31 -05:00
Bill DeRusha
85df4eee4c Merge pull request #11630 from edx/bderusha/soft-sec-id 
Do not send initial verification photo_id if new photo_id provided
 2016-02-23 14:47:29 -05:00
Sanford Student
3313b755fa MA-1038 2016-02-23 14:20:51 -05:00
Kevin Falcone
d00490efe5 Merge pull request #11595 from edx/jibsheet/bok-choy-gentler-reset 
Don't delete the whole db cache dir
 2016-02-23 14:17:27 -05:00
Adam
16a679bb89 Merge pull request #11633 from edx/fix-flaky-lettuce-test 
add timeout to lettuce test to reduce flakiness
 2016-02-23 13:53:29 -05:00
Ned Batchelder
526db7293a A better way to manage the Python packages to uninstall. 2016-02-23 13:51:49 -05:00
Bill DeRusha
beacf3c93a Only return unexpired initial verifications. 2016-02-23 13:38:48 -05:00
Bill DeRusha
a1a58db9be Do not send initial verification photo_id if new photo_id provided 
ECOM-2888
 2016-02-23 13:29:53 -05:00
Braden MacDonald
f6d7068319 Use latest version of drag and drop xblock 2016-02-23 10:02:44 -08:00
Adam Palay
aaaba4708d add timeout to lettuce test to reduce flakiness 2016-02-23 12:40:49 -05:00
Eric Fischer
67b128dfe0 Merge pull request #11625 from edx/efischer/revert_ora_release 
Revert "Inform openassessment to clear submission"
 2016-02-23 11:38:00 -05:00
Michael Frey
25919f7d57 Merge pull request #11615 from edx/SOL-1652 
Only allow ecommerce checkout if user is also activated
 2016-02-23 11:17:52 -05:00
Michael Frey
90146d9ae0 Only allow ecommerce checkout if user is also activated 2016-02-23 10:11:14 -05:00
Eric Fischer
5e380305ef keep version bumps 2016-02-23 10:06:13 -05:00
Ben Patterson
1ba360d987 Merge pull request #11629 from edx/benp/TNL-4151-flaky-test 
Flag test as flaky. See TNL-4151.
 2016-02-23 10:05:33 -05:00
Christine Lytwynec
0f66d852c2 Merge pull request #11581 from edx/clytwynec/ac-327 
Sequence navigation tooltip mechanism updated
 2016-02-23 09:28:32 -05:00
Your Name
b1751e70c3 User automatically registered to course. 2016-02-23 19:07:19 +05:00
Ben Patterson
a11ca6cd91 Merge pull request #11618 from edx/benp/library-test-flaky-fix 
Ensure test waits for the library list to populate before continuing.
 2016-02-23 08:51:22 -05:00
Ben Patterson
de45c0d36d Flag test as flaky. See TNL-4151. 2016-02-23 08:20:06 -05:00
Toby Lawrence
acf6c1d609 Merge pull request #11523 from edx/perf/speed-up-slow-user-role-ops 
Don't blow away the role cache when updating.
 2016-02-23 06:55:00 -05:00
Ned Batchelder
c59db6e5fc Merge pull request #11622 from eduNEXT/Bound3R/url_static-path 
missing change the url path to the sass variable
 2016-02-22 19:59:22 -05:00
Renzo Lucioni
5094fec6dc Merge pull request #11559 from edx/renzo/update-organizations 
Bump edx-organizations version to 0.4.0
 2016-02-22 18:08:41 -05:00
Eric Fischer
73fa3190cd Revert "Inform openassessment to clear submission" 
This reverts commit 920cc3d222.
 2016-02-22 17:32:44 -05:00
Michael Katz
bf5d2034a1 Revert "Added staff role on ccx to staff of master course and added a data migration for existing ccx courses." 
This reverts commit 91bf48fc8c.
 2016-02-22 15:33:01 -05:00
Bound3R
b0b977ba7f missing change the url path to the sass variable 2016-02-22 15:30:53 -05:00
Renzo Lucioni
79a4d6ce47 Bump edx-organizations version to 0.4.0 
Also install djangorestframework-oauth 1.1.0 from PyPI
 2016-02-22 15:19:31 -05:00
Christine Lytwynec
3f6b7cb004 Sequence navigation tooltip mechanism updated 2016-02-22 14:13:36 -05:00
Nimisha Asthagiri
03487073aa Merge pull request #11579 from edx/course_blocks_api/support_substructure 
Course Blocks API: Support accessing a substructure MA-1604
 2016-02-22 13:38:01 -05:00
Alison Hodges
364463160f Merge pull request #11589 from edx/ahodges/DOC-2717 
Fixes DOC-2717 for Jennifer
 2016-02-22 13:14:30 -05:00
Alison Hodges
5e62e937d6 Fixes DOC-2717 for Jennifer 2016-02-22 12:26:11 -05:00
Omar Khan
a1301ded69 Merge pull request #11544 from open-craft/omar/remove-newrelic-handler 
Remove newrelic logging handler
 2016-02-22 23:56:16 +07:00