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

35669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Patterson
9513107857 Dev user should be able to specify LETTUCE_BROWSER. 2016-02-26 09:26:03 -05:00
Christine Lytwynec
5ef52633b6 add aria-controls to buttons and remove label from dropdown container 2016-02-26 09:02:51 -05:00
John Eskew
e87bb74c22 Add app_label to models to prevent Django1.9 warnings. 2016-02-25 17:34:31 -05:00
Alison Hodges
4653301516 Merge pull request #11649 from edx/ahodges/DOC-2720p 
Syncs preface with edx-doc repo version
 2016-02-25 14:09:39 -05:00
Eric Fischer
adb8896174 Merge pull request #11658 from edx/laq/multiple_login_failures 
Avoid MultipleObjectsReturned errors with LoginFailures
 2016-02-25 13:59:32 -05:00
Peter Pinch
3be2737f5b Merge pull request #11356 from mitocw/gdm_ccx_course_modules_#170 
Added extra field to CCX model for Course Models
 2016-02-25 13:45:15 -05:00
Ned Batchelder
c913734a47 Merge pull request #11610 from edx/ned/edx-lint-0.4.2 
Upgrade edx-lint to 0.4.2
 2016-02-25 13:40:23 -05:00
Alison Hodges
8057903556 Syncs preface and browsers file with edx-doc repo version 2016-02-25 12:27:28 -05:00
Eric Fischer
8442e4d1a8 Add laq in Authors List (replay) 
Replayed by @efischer19 due to git issues, initially commited by @laq
 2016-02-25 12:03:31 -05:00
Eric Fischer
97ac2845c1 Fix for LoginFailure.MultipleObjectsReturned in is_user_locked_out (replay) 
The get_or_create function is vulnerable to race conditions in MySQL, which can
cause the model LoginFailure to, in some cases, have more than one row for the
same user, breaking the login for that user.

Addinf functionality to expect and clean the error by deleting extra rows (by
oldest lockout date), leaving just one entry and allowing the user to login.

Replayed and squashed by @efischer19, initially commited by @laq
 2016-02-25 12:03:28 -05:00
sanfordstudent
c518543cbd Merge pull request #11602 from edx/sstudent/MA-1919 
MA-1919 making mobile handout links accommodate jump to id's and cour…
 2016-02-25 11:07:58 -05:00
Douglas Hall
4bad8881e5 Merge pull request #11659 from edx/douglashall/release_edx_proctoring_0_12_11 
Incremented edx-proctoring version to 0.12.11
 2016-02-25 10:58:45 -05:00
Mushtaq Ali
78b6983666 Merge pull request #11597 from edx/mushtaq/ECOM-3760-fix-self-paced-subsection-config 
Fix subsection config for self-paced course
 2016-02-25 20:50:07 +05:00
Ned Batchelder
3fa573d795 Use edx-lint 0.4.2 2016-02-25 10:41:24 -05:00
Giovanni Di Milia
0c637cdca9 Added extra field to CCX model for Course Models 
REST APIs modified
 2016-02-25 10:27:39 -05:00
Sanford Student
75a26b62b5 MA-1919 making mobile handout links accommodate jump to id's and course links 2016-02-25 10:20:13 -05:00
Douglas Hall
ba992214a5 Incremented edx-proctoring version to 0.12.11 2016-02-25 09:40:57 -05:00
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