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

33542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
muzaffaryousaf
cc88cfaf64 Fixing "wrong-assert-type" pep8 warning. 
TNL-3650
 2015-10-29 15:01:49 +05:00
Peter Fogg
d9751a855a Merge pull request #10404 from edx/feature/self-paced 
Enable self-paced courses.
 2015-10-28 20:46:35 -04:00
Peter Fogg
505b2aa4d9 Disable setting course pacing during course run. 
Also adds improved styling for course pacing settings, and unit tests
around query counts for self-paced courses.

ECOM-2650
 2015-10-28 16:44:36 -04:00
Peter Fogg
5ffa06bed1 Responding to review comments. 2015-10-28 16:44:36 -04:00
Christina Roberts
e51dbc4db7 Merge pull request #10406 from edx/christina/delete-old-vendor-files 
Delete swfobject.js and analytics.js.
 2015-10-28 16:43:06 -04:00
Carol Tong
9d7a2bc97b Merge pull request #10379 from edx/carol/doc/DOC-2372 
TNL-3697/DOC-2372 Modify "Manage Users" template to indicate that course team members are not automatically enrolled in courses
 2015-10-28 15:34:59 -04:00
cahrens
c8f1987a84 Delete swfobject.js and analytics.js. 2015-10-28 14:52:43 -04:00
Peter Fogg
4805946a83 Override due dates in the LMS for self-paced courses. 2015-10-28 14:33:11 -04:00
Peter Fogg
7f673604fb Allow setting self-paced on schedule & details page. 
Currently unstyled.

ECOM-2462
 2015-10-28 14:33:11 -04:00
Peter Fogg
0107525d41 Enable self-paced courses behind a feature flag. 2015-10-28 14:33:11 -04:00
Peter Fogg
9d88bef117 Allow setting self_paced through course details endpoint. 
ECOM-2489
 2015-10-28 14:33:11 -04:00
Peter Fogg
15d77fda3f Hide due/release dates on course outline in Studio. 
ECOM-2443
 2015-10-28 14:33:11 -04:00
Peter Fogg
dc7f09fc0e Add self_paced field to course module. 2015-10-28 14:33:11 -04:00
Peter Fogg
eaf6be2a54 Fix up quality errors in config model API. 2015-10-28 14:33:11 -04:00
Peter Fogg
96b49759de Add fixture for setting config models from Bok Choy. 2015-10-28 14:33:11 -04:00
Calen Pennington
49f9e31a00 Allow auto_auth on the LMS in bok_choy tests 2015-10-28 14:33:11 -04:00
Calen Pennington
a6917e34f0 Teach auto_auth to create superusers 2015-10-28 14:33:11 -04:00
Calen Pennington
bf493fffa3 Add a django-rest-framework APIView that supports reading/writing the current value of a configuration model 2015-10-28 14:33:11 -04:00
Nimisha Asthagiri
93656e39ee Merge pull request #10390 from edx/mobile/make-course-usage-key 
Add make_course_usage_key method to modulestore
 2015-10-28 13:47:33 -04:00
Clinton Blackburn
0fece869d3 Merge pull request #10349 from edx/multi-tenancy/update-receipt-page 
Updated receipt page to use order endpoint
 2015-10-28 13:33:05 -04:00
Ben Patterson
de7113a191 Merge pull request #10399 from edx/benp/upgrade-flaky 
Upgrade flaky for multiprocessing nose support.
 2015-10-28 13:24:45 -04:00
Clinton Blackburn
9bb3f703d7 Updated receipt page to use order endpoint 
The receipt page now retrieves data for orders instead of baskets. Going forward baskets will be deleted after an order has been placed, so there should be no permanent references to baskets. Orders will continue to be persisted permanently.

ECOM-2653
 2015-10-28 12:12:57 -04:00
Brian Beggs
352c5d13ac Merge pull request #10367 from edx/bbeggs/PLAT-881 
Fix for PLAT-881: Disable CallStackManger from StudentModule
 2015-10-28 11:41:32 -04:00
Ben Patterson
2a5a29edf5 Upgrade flaky for multiprocessing nose support. 
Flaky's latest release includes support for multiprocessing in nose. Upgrading in
order to further the end-goal of providing multiprocessing capability in our
bok-choy test suite.
 2015-10-28 11:17:45 -04:00
tasawernawaz
b1955cd5c3 Merge pull request #10393 from edx/tasawer/story/ecom-2547-set-photo-id-for-initial-verfication 
Added photo_id_key while AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING is True
 2015-10-28 19:22:29 +05:00
Feanil Patel
66cc3f7141 Merge pull request #10383 from edx/feanil/update_newrelic 
Update newrelic plugin version.
 2015-10-28 09:18:53 -04:00
Tasawer
982c9a2667 Added photo_id_key while AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING is True 
ECOM-2547
 2015-10-28 10:58:44 +00:00
wajeeha-khalid
d210ca6e42 Merge pull request #10134 from edx/jia/MA-1359 
MA-1359 &  MA-1457 DiscussionAPI: return response_count for thread GET/POST
 2015-10-28 10:51:32 +05:00
Nimisha Asthagiri
6fb8335b63 Add make_course_usage_key method to modulestore 
Different modulestores create different usage_keys
for the root course block.  This commit introduces
a new method on the modulestore so each store type
can implement its own.

This is required by the new Course Blocks API since
it wants to derive a usage key from a client-supplied
course key.
 2015-10-27 22:27:44 -04:00
Nimisha Asthagiri
698e542f6b Merge pull request #9842 from ubc/tpa-mapping-api 
Implement third party auth ID mapping API
 2015-10-27 19:40:00 -04:00
Pan Luo
f69304373c Implement user mapping API 
This mapping API enables the mapping between the edX user ID and the ID
provided by identity provider (IdP). For details, please see
https://github.com/edx/edx-platform/pull/9842
 2015-10-27 15:19:42 -07:00
Jesse Zoldak
dba67df23f Merge pull request #10382 from jzoldak/zoldak/adjust-circle-parallelism 
Adjust circleCI config for parallelism
 2015-10-27 14:16:31 -04:00
Feanil Patel
d8eec000b7 Update newrelic plugin version. 
Changelog: https://docs.newrelic.com/docs/release-notes/agent-release-notes/python-release-notes
 2015-10-27 14:16:02 -04:00
Nimisha Asthagiri
c032fefc74 Merge pull request #10364 from edx/mobile/graph_traversals 
Reusable Graph Traversals
 2015-10-27 14:00:01 -04:00
Michael Frey
bb53cad0fa Merge pull request #10377 from edx/release 
Release
 2015-10-27 13:10:49 -04:00
Peter Pinch
cda95d7a28 Merge pull request #10251 from mitocw/fix/jf/enroll-coach-on-create-ccx 
Enroll the coach in the CCX on creation
 2015-10-27 12:44:15 -04:00
Jesse Zoldak
0b8e6bc0e4 Adjust circleCI config for parallelism 2015-10-27 11:57:45 -04:00
Carol Tong
40d1a63343 TNL-3697/DOC-2372: modify Manage Users template to indicate that course 
team not automatically enrolled in course
 2015-10-27 11:05:23 -04:00
Nimisha Asthagiri
22c2e7e54c Reusable Graph Traversals 2015-10-27 10:54:28 -04:00
Michael Frey
e69bc6c4e1 Merge pull request #10332 from edx/rc/2015-10-27 
Rc/2015 10 27
 2015-10-27 10:41:00 -04:00
Matt Drayer
d39d0cf55b Merge pull request #10370 from edx/asadiqbal08/SOL-1312-text-update 
SOL-1312 nit clean
 2015-10-27 10:07:31 -04:00
Jim Abramson
edf09d84e9 Merge pull request #10350 from edx/jsa/ecom-2657 
Programs: added platform support package and configuration model.
 2015-10-27 09:10:23 -04:00
asadiqbal
b2497a5112 nit 2015-10-27 16:14:30 +05:00
Nimisha Asthagiri
b1ae462ab7 Merge pull request #10361 from edx/mobile/refactor-has-access 
Refactor has_access for re-usability.
 2015-10-26 18:15:09 -04:00
Sarina Canelake
54394cf7b2 Merge pull request #10325 from stvstnfrd/debt/wiki-image 
Remove disabled wiki plugin
 2015-10-26 17:48:59 -04:00
Sarina Canelake
6bbc37de9a Merge pull request #10287 from open-craft/validate-utils-gettext-extraction 
Extract translatable strings from edx.utils.validate.js.
 2015-10-26 17:45:21 -04:00
Arbab Nazar
cabe396a46 Merge pull request #10368 from edx/arbab/change-author-file 
added name to the AUTHORS file
 2015-10-26 17:38:25 -04:00
Nimisha Asthagiri
95fdbd981c Refactor has_access for re-usability. 2015-10-26 16:26:41 -04:00
Sarina Canelake
f5e4c74e7b Merge pull request #10213 from mitocw/feature/skm/add_tests#95 
Adds more tests for get_student_grade_summary_data.
 2015-10-26 14:47:59 -04:00
arbabnazar
c3d5016c9d added name to the AUTHORS file 2015-10-26 13:51:47 -04:00