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

35454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lenacom
3aafbe591a fixed test changed by mistake 2016-03-09 16:57:45 +03:00
lenacom
f07bc1ce28 fixed comments 2016-03-09 16:52:02 +03:00
lenacom
85f494db15 fixed comment 2016-03-01 13:02:57 +03:00
lenacom
016c8200ae fixed comments 2016-03-01 09:39:24 +03:00
lenacom
236cf4e30d removed check for 'root' 2016-02-29 19:12:44 +03:00
lenacom
f048a28fa0 added ending comma 2016-02-29 16:23:15 +03:00
lenacom
ae439310e1 New optional parameters for course blocks API: lti_url, block_types 2016-02-29 15:58:05 +03: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
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
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
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
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
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