Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

3993 Commits

Author SHA1 Message Date
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
1f5c95ba9a Remove unused code when download from youtube. 2014-06-25 16:12:16 +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
zubair-arbi
56e0b86394 make only section name in headers editable 
STUD-1679
 2014-06-04 15:00:52 +05:00
Piotr Mitros
16078ba8a7 Added completion and audio XBlocks 2014-06-03 11:17:24 -04:00
Greg Price
0d37b4b254 Merge branch 'release' 
Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py
 2014-06-02 15:29:40 -04:00
Sarina Canelake
f683a4c576 Merge pull request #3943 from edx/flowerhack/cleanup-opaque-keys 
Change Location, CourseLocator, etc to reference opaque-keys library
 2014-05-30 17:38:27 -04:00
Julia Hansbrough
6ccb11f03e Change Location, CourseLocator, etc to reference opaque-keys library 2014-05-30 20:32:38 +00:00
Don Mitchell
77b8cbbaa9 Merge pull request #3932 from edx/dhm/bug_orphans 
Delete orphans was trying to get non-existent 'draft' modulestore
 2014-05-30 13:28:12 -04:00
Dave St.Germain
ed9ab3ad71 Merge pull request #3501 from edx/dcs/matlab-api-key 
Allow courses to set Matlab API key globally, in advanced settings.
 2014-05-30 11:40:32 -04:00
Don Mitchell
f0063d97c6 Delete orphans was trying to get non-existent 'draft' modulestore 2014-05-30 10:28:26 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library 
[LMS-2757]
 2014-05-29 17:03:35 -04:00
muhammad-ammar
026c6523e8 Merge pull request #3882 from edx/ammar/test-youtube-availibility 
Check YouTube Availability for Video Tests
 2014-05-29 23:53:58 +05:00
Don Mitchell
85565a3de8 lms dashboard ignores errored courses 2014-05-29 14:38:42 -04:00
Andy Armstrong
6b3e100cc1 Allow editing of container xblocks/xmodules 
STUD-1312
 2014-05-29 14:02:45 -04:00
Muhammad Ammar
7afcb9348c Check YouTube Availabitlity for Video Tests 2014-05-29 15:08:47 +00:00
Calen Pennington
a2ce703327 Don't access course.id on ErrorDescriptors when listing courses from mongo 2014-05-29 10:25:32 -04:00
Don Mitchell
c37e241230 Make reverse matching robust to errored courses 
Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
 2014-05-29 10:17:24 -04:00
Dave St.Germain
0173eaf9d2 Updated payload for new matlab endpoint. 2014-05-28 15:32:46 -04:00
Don Mitchell
62bccd4e93 Split mongo correctly serializes and deserialized references 
STUD-1592, STUD-1603, LMS-2642
 2014-05-28 08:29:13 -04:00
Don Mitchell
9d2db736df Merge pull request #3869 from edx/dhm/bug_get_children 
Redirect most studio access through draft modulestore
 2014-05-27 11:57:15 -04:00
Greg Price
f25dd8dd8b Merge pull request #3888 from edx/dhm/bug_get_children 
Redirect most studio access through draft modulestore
 2014-05-27 11:51:50 -04:00
Don Mitchell
1be1283f26 Redirect most studio access through draft modulestore 
rather than have caller figure out whether to call draft or direct.
Fixes get_children to always find draft children in studio.
STUD-1662
 2014-05-27 11:16:29 -04:00
louyihua
559a2c8888 i18n: Make XBlock buttons & components have localizable display names 
1. Current code uses type name as the display names for XBlock buttons, so the name of these five buttons can't be localized. This fix contains code that adds a 'display_name' field for the buttons, and makes their names localizable.
2. The display names of components in advanced, html and problem types can be localized now.
 2014-05-27 11:16:54 +08:00