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

2244 Commits

Author SHA1 Message Date
Ned Batchelder
84cfea8ead Remove an unneeded unicode conversion 2014-07-10 17:06:16 -04:00
Abdallah
cf16975bd2 unicode fixes 2014-07-10 17:06:16 -04:00
Muhammad Ammar
81a5a7b962 CMS Video Handout Tests 2014-07-10 05:45:49 +00:00
Nimisha Asthagiri
8855b12b76 Update tests to allow LMS tests to use published branch setting. 
Conflicts:
	cms/djangoapps/contentstore/views/tests/test_container_page.py
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/student/tests/test_login.py
	common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/branding/tests.py
	lms/djangoapps/courseware/tests/test_submitting_problems.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/instructor_task/tests/test_base.py
	lms/djangoapps/instructor_task/tests/test_integration.py
 2014-07-09 21:10:12 -04:00
Nimisha Asthagiri
ea32529866 Fix all modulestore calls to pass in user ids. 2014-07-09 21:10:12 -04:00
Nimisha Asthagiri
f5abef88c2 LMS-2947 remove get_error_courses in Split. 
LMS-2950 move delete_course to Mongo.
 2014-07-09 21:10:12 -04:00
Julia Hansbrough
545cfd8406 Merge pull request #4353 from edx/flowerhack/lms-deprecated-urls 
Enables LMS to handle deprecated URLs
 2014-07-09 18:23:00 -04:00
Julia Hansbrough
d9dd45662e Enables LMS to handle deprecated URLs 
LMS-2651
 2014-07-09 21:51:37 +00:00
Nimisha Asthagiri
ce9aea80b1 Move context_managers to base class, overridden by mixed. 2014-07-09 15:55:53 -04:00
Don Mitchell
211f0797fb Merge pull request #4294 from edx/split_mongo_assets_cherry 
Split mongo assets cherry
 2014-07-09 14:22:04 -04:00
Andy Armstrong
afb311ff51 Fix user handling bug in split test module 
STUD-1948
 2014-07-08 15:01:22 -04:00
Don Mitchell
cc6dfbbc75 Asset support in split 
LMS-2876
 2014-07-07 17:11:43 -04:00
Andy Armstrong
5f11aa9aee Revert "First attempt to fix split test" 
This reverts commit a16f5487bc.
 2014-07-07 16:49:11 -04:00
Andy Armstrong
a16f5487bc First attempt to fix split test 2014-07-07 16:40:17 -04:00
Tim Babych
34ac6abe1c Merge pull request #4316 from edx/anton/group-experiments 
BLD-1117, BLD-1217: Add read-only list of Group Configurations, Create feature flag.
 2014-07-07 20:03:43 +03:00
Tim Babych
a153092cb5 Add FEATURE['ENABLE_GROUP_CONFIGURATIONS'] and os.environ['FEATURE_GROUP_CONFIGURATIONS']. 2014-07-03 15:30:18 +03:00
louyihua
ac8d6fc1a6 Make the strings in "Advanced Settings" page localizable 
The fields should be translated before render into html templates.
 2014-07-03 10:57:26 +08:00
Calen Pennington
3893a9aee6 Merge pull request #4258 from cpennington/studio-deprecated-urls 
Make Studio able to handle deprecated key formats in urls
 2014-07-02 14:26:46 -04:00
polesye
d38b51cb4a BLD-1117: Add read-only list of Group Configurations. 2014-07-02 18:26:27 +03:00
Ben McMorran
f670ff74e4 Uses ModuleStoreEnum in is_xblock_visible_to_students 2014-06-30 15:34:39 -04:00
Calen Pennington
1c882da397 Make Studio able to handle deprecated key formats in urls 2014-06-30 14:29:10 -04:00
Ben McMorran
09908bde4c Merge pull request #4229 from edx/studio/uses-mixed-modulestore-xblock-visibility 
Adds is_xblock_visible_to_students
 2014-06-30 12:00:52 -04:00
Ben McMorran
397bdb4348 Adds is_xblock_visible_to_students 2014-06-27 14:52:14 -04:00
Nimisha Asthagiri
eecff6e0aa ModulestoreEnum class. 2014-06-27 14:37:35 -04:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540 
Refactor get_parent_locations STUD-1663
 2014-06-26 18:00:11 -04:00
cahrens
a4b172d9d8 Display names, help text, and "deprecated" for Advanced Settings. 
STUD-302, STUD-303
 2014-06-26 16:54:22 -04:00
Alexander Kryklia
35aacfb6f2 Merge pull request #4105 from edx/alex/remove_unused_code_when_downloading_from_youtube 
Remove unused code when download from youtube.
 2014-06-26 14:44:45 +03:00
Alexander Kryklia
1f5c95ba9a Remove unused code when download from youtube. 2014-06-25 16:12:16 +03:00
Oleg Marshev
715fde27c4 Redirect Chinese students to a Chinese CDN for video. 2014-06-24 18:39:52 +03:00
Andy Armstrong
20675857dc Merge pull request #3999 from edx/christina/updating-split-test 
Ability to change the associated group configuration for a split test
 2014-06-20 14:15:41 -04:00
cahrens
73e7ced6f9 Introduce constants for studio_view, student_view, and author_view. 2014-06-20 11:41:23 -04:00
Andy Armstrong
11c25e8c1a Add Studio handling for changes to group configurations 
STUD-1658
 2014-06-20 11:41:22 -04:00
Mat Peterson
3a35121099 Useless code path in import_from_xml causing errors removed 2014-06-20 13:21:40 +00:00
Ben McMorran
702bdd36a9 Merge pull request #4060 from edx/benmcmorran/edit-tracking 
Tracks last edited date and user, and adds has_changes for blocks
 2014-06-18 13:13:26 -04:00
Ben McMorran
ea97dd4508 Tracks last edited date and user, and adds has_changes for blocks. 2014-06-18 11:36:49 -04:00
Jay Zoldak
14a80e9c3c Merge pull request #4114 from edx/zoldak/fix-negative-assertion 
Speed up test by fixing negative assertion
 2014-06-17 09:12:11 -04:00
Jay Zoldak
6d53bf710d Merge pull request #4115 from edx/zoldak/fix-test-captions-closed 
Speed up test for closed caption state
 2014-06-17 09:11:47 -04:00
zubair-arbi
6cb6680139 fix reply/return to annotation links 
STUD-1629
 2014-06-17 12:16:07 +05:00
Jay Zoldak
4ac1079a99 Speed up test for closed caption state 2014-06-16 13:59:19 -04:00
Jay Zoldak
c33261aefc Speed up test by fixing negative assertion 2014-06-16 13:47:14 -04:00
Andy Armstrong
6704d59db0 Allow xblocks to be added as advanced problem types 2014-06-13 17:51:46 -04:00
polesye
d9d11a21ef BLD-933: Add table of contents. 2014-06-11 13:42:57 +03:00
Sarina Canelake
2aea261d48 Merge branch 'release' 
Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py
 2014-06-10 16:59:23 -04:00
Julia Hansbrough
2757ac4fcb Opaque-keys: response to code review 2014-06-09 15:13:31 -04:00
Don Mitchell
c808277007 Change document_class back to dict 2014-06-09 15:13:31 -04:00
Don Mitchell
acc02b0e09 Fix to excess asset query 2014-06-09 15:13:23 -04:00
Julia Hansbrough
e3459cd3cb Opaque-Keys: Response to code review 2014-06-09 15:12:22 -04:00
Julia Hansbrough
3f3e9724d0 Add fallback for org based roles 2014-06-09 15:10:49 -04:00
cahrens
5ab61fc4b2 Implement a custom editor for the split_module. 
STUD-1529
 2014-06-05 12:16:16 -04:00
polesye
7b2d67f209 BLD-1049: Allow the video player to work with redirected links. 2014-06-05 09:34:54 +03:00