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

35402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Adam Palay
aaaba4708d add timeout to lettuce test to reduce flakiness 2016-02-23 12:40:49 -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
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
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
Nimisha Asthagiri
70469c16b2 Block Structure API: Replace has_block with __contains__ 2016-02-22 11:25:46 -05:00
Ben Patterson
3afc2a9fa7 Ensure test waits for the library list to populate before continuing. 2016-02-22 10:01:03 -05:00
Zubair Afzal
040578b315 Merge pull request #11599 from edx/zub/feature-flag-jwt-auth 
enable jwt auth with feature flag
 2016-02-20 03:54:18 +05:00
zubair-arbi
182826261d enable jwt auth with feature flag 2016-02-20 02:31:51 +05:00
Christine Lytwynec
41febaa875 Merge pull request #11565 from edx/clytwynec/ac-234 
Remove hgroup usage
 2016-02-19 16:06:22 -05:00
Nimisha Asthagiri
4bbe9a2021 Merge pull request #11326 from edx/mobile/remove-dead-code 
Mobile API: remove unused endpoints
 2016-02-19 15:14:13 -05:00
Christine Lytwynec
a2645b639a Change .heading-group>h2 to .heading-group>p 2016-02-19 13:48:14 -05:00
Douglas Hall
8f7c158f12 Merge pull request #11594 from edx/douglashall/edx_proctoring_0_12_10 
Upgraded edx-proctoring to 0.12.10
 2016-02-19 08:04:31 -05:00
Usman Khalid
4be5aeb194 Merge pull request #11550 from edx/muzaffar/tnl4013 
Using display_name_with_default  instead of display_name.
 2016-02-19 17:51:27 +05:00
muzaffaryousaf
509522414a Using display_name_with_default instead of display_name. 
TNL-4103
 2016-02-19 16:50:23 +05:00
Kevin Falcone
3a296a9183 Don't delete the whole db cache dir 
It also contains the lettuce caches.
 2016-02-18 22:43:47 -05:00
Douglas Hall
4a246dd134 Upgraded edx-proctoring to 0.12.10 2016-02-18 21:06:14 -05:00
Adam
4dbcf9a1d3 Merge pull request #11587 from edx/release 
Release
 2016-02-18 17:19:29 -05:00
Eric Fischer
09d0f435ce Merge pull request #11422 from edx/efischer/reset_state_fix 
Reset state fix
 2016-02-18 17:08:44 -05:00
Adam
5f0d969b8b Merge pull request #11585 from edx/hotfix/2016-02-18-mathjax 
update mathjax to 2.6 (TNL-4104) and (TNL-4094)
 2016-02-18 15:43:09 -05:00
Eric Fischer
920cc3d222 Inform openassessment to clear submission 
The openassessment xblock stores some information that assumes
a given student module is never cleared, it needs to be informed of
this operation.
 2016-02-18 15:41:13 -05:00
Michael Frey
5903ef832c Merge pull request #11584 from edx/release 
Merging release back to master
 2016-02-18 14:55:25 -05:00
Matjaz Gregoric
f4e462c728 Merge pull request #11316 from open-craft/remove-django-template-loaders 
Remove default django template loaders.
 2016-02-18 20:38:47 +01:00
Adam Palay
e57487db83 update mathjax to 2.6 (TNL-4104) and (TNL-4094) 
update mathjax class names to support common html, html-css, and svg
 2016-02-18 14:13:34 -05:00
Michael Frey
da0992b4e8 Merge pull request #11570 from edx/patch-2016-02-17 
Patch release 2016-02-17
 2016-02-18 13:39:20 -05:00
Mark Sadecki
94d5b5dba3 Merge pull request #11576 from edx/cptvitamin/AC-332 
removes unnecessary alt attribute value (empty value is more appropriate)
 2016-02-18 13:26:47 -05:00
Mushtaq Ali
689bb73b84 Merge pull request #11551 from edx/mushtaq/fix-tnl4006 
Studio homepage escaping
 2016-02-18 22:52:01 +05:00
Nimisha Asthagiri
c088df0835 Remove unused Mobile latest_updates field 2016-02-18 12:12:05 -05:00