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

39204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amir Qayyum Khan
8be8ac8fbf Refactored ccx coach tab plugin 2016-02-25 19:19:21 +05:00
John Eskew
e3ddb02cc7 Merge pull request #11586 from edx/jeskew/remove_all_request_dot_request 
Remove all request.REQUEST usages.
 2016-02-25 08:23:12 -05:00
Amir Qayyum Khan
e1035c7bd7 Allowed staff/admin of course to view ccx coach dashboard 2016-02-25 16:07:27 +05:00
Awais Jibran
d18f3f6c98 Improve logging in cert gen. 
ECOM-3688
 2016-02-25 14:57:31 +05:00
M. Rehan
db5fe13070 Merge pull request #11624 from edx/mrehan/topic-not-found-tnl-4136 
TNL-4136 fix topic detail endpoint's url to support alphanumeric and period characters in topic ID
 2016-02-25 13:13:26 +05:00
Muddasser
1e8163e283 Test should wait for ajax calls to finish before checking the changes 2016-02-25 12:43:08 +05:00
Brian Beggs
0251e8e15a Merge pull request #11545 from mitocw/feature/aq/support_mutiple_instances_ccx_mitocw#175 
Allow multiple instances of ccx
 2016-02-24 21:22:29 -05:00
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
Omar Khan
e461374973 Registration: don't require terms of service if checkbox is hidden 2016-02-24 16:18:32 +07: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
Ehtesham
78a61c1fb0 [TNL-4029] Show error if server returns customised error message 2016-02-24 11:05:46 +05:00
muhammad-ammar
d226b55b04 don't catch exception to raise http500 
TNL-4043
 2016-02-24 11:03:17 +05:00
muzaffaryousaf
ee637c58ea Set notes page size to 25 
TNL-4108
 2016-02-24 11:03:17 +05:00
muhammad-ammar
ea89d2eea4 hide notes tab if feature flag is disabled or harvard notes enabled 
TNL-2816
 2016-02-24 11:03:16 +05:00
muhammad-ammar
cd01dc89a4 clear search input when search results tab is closed 
TNL-4055
 2016-02-24 11:03:16 +05:00
muhammad-ammar
ce57700d68 hide paging footer when only one page 2016-02-24 11:03:15 +05:00
muzaffaryousaf
71ec1b94f6 Fixing & adding Bokchoys for edx notes pagination. 
TNL-3910
 2016-02-24 11:03:15 +05:00
muzaffaryousaf
bfa2ea5bd8 Remove sanitization from python & adding it to the templates. 
TNL-4012
 2016-02-24 11:03:15 +05:00
muhammad-ammar
13b14e0a60 Paginate edxnotes frontend 
TNL-3908
 2016-02-24 11:03:14 +05:00
Ehtesham
840f5017f4 [TNL-3940] Adding pagination in stub server and updating unit tests 2016-02-24 11:03:14 +05:00
muhammad-ammar
e2333214b1 paginate edxnotes views 
TNL-3840
 2016-02-24 11:03:14 +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
Felipe Montoya
5fe1a114ea Enable the changes to the ELASTIC_SEARCH_CONFIG setting to be read from cms.env.json or yaml as it is for the lms. 2016-02-23 16:50:28 -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
Mushtaq Ali
2da452b839 ECOM-3760 fix editors not showing up on subsection config popup for self-paced course 2016-02-24 00:35:05 +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