Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
23,352 Commits 1 Branch 0 Tags
150b5cd29888ef7ed1d65cc8d484376786ca8cdd
Commit Graph

8261 Commits

Author SHA1 Message Date
Calen Pennington
39e264041e Merge pull request #3778 from cpennington/mixed-modulestore-bad-keys 
Handle malformed keys in MixedModuleStore configuration
 2014-05-21 11:05:50 -04:00
Don Mitchell
c085578383 Fix student progress @sarina bug 2014-05-20 18:08:33 -04:00
Don Mitchell
115f5b2cd1 Merge pull request #3791 from edx/dhm/bug_open_ended_notifications 
Dhm/bug open ended notifications
 2014-05-20 13:39:27 -04:00
Don Mitchell
f7558c40e8 Fixes ../courseware/Peer_Grading_Panel/peergrading:L12P5_grading/ reported bug 2014-05-20 11:44:51 -04:00
Sarina Canelake
9dc48c00b4 Merge pull request #3779 from edx/sarina/fix-grades-management-commands 
Sarina/fix grades management commands
 2014-05-20 11:35:54 -04:00
Don Mitchell
e2332d1922 Fix old dashboard list cohorts 2014-05-20 10:37:03 -04:00
Calen Pennington
ef10833309 Handle malformed keys in MixedModuleStore configuration 2014-05-20 10:27:59 -04:00
Sarina Canelake
189f53bc71 Fix grades management commands 2014-05-19 16:11:45 -04:00
Don Mitchell
5a62c83d05 Handle some records not having lower_id 2014-05-19 13:31:03 -04:00
Calen Pennington
a3b6ef8bae Rename variables to make type clearer 2014-05-19 10:58:38 -04:00
Calen Pennington
4df122a92e Update annotations modules to use the course_id from the runtime, rather than extracting it from the page 2014-05-19 09:37:53 -04:00
Calen Pennington
2ce6719153 Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master 2014-05-19 09:29:34 -04:00
Calen Pennington
8f72394e81 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/templates/widgets/header.html
 2014-05-19 09:20:08 -04:00
polesye
aedde3397e SymbolicResponse fix error message. 2014-05-19 09:00:09 +03:00
Don Mitchell
1c6a0f0a6c Merge pull request #3761 from edx/dhm/opaque-export 
Dhm/opaque export
 2014-05-16 16:40:06 -04:00
Don Mitchell
d636c56af2 xml export of drafts was exporting everything 
now only exports the drafts into the draft subdir
STUD-1627
 2014-05-16 15:29:25 -04:00
Calen Pennington
d4280e8529 Fix merge conflicts 2014-05-16 14:10:50 -04:00
Calen Pennington
18c91d0f1d Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/tests/utils.py
	cms/djangoapps/contentstore/views/import_export.py
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	common/djangoapps/student/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/static/js/staff_debug_actions.js
	lms/templates/notes.html
	lms/templates/staff_problem_info.html
 2014-05-16 14:01:20 -04:00
Sarina Canelake
1919df71a2 Fix split test child id 2014-05-16 13:52:42 -04:00
clytwynec
6396373bd5 Merge pull request #3758 from edx/clytwynec/disable-XBlockAcidNoChildTest 
disabled test_lms.py:XBlockAcidNoChildTest.test_acid_block
 2014-05-16 12:01:05 -04:00
Calen Pennington
af8cab2a37 Fix doc typos from #3746 2014-05-16 11:35:56 -04:00
Christine Lytwynec
0533859366 disabled test_lms.py:XBlockAcidNoChildTest.test_acid_block 2014-05-16 11:17:26 -04:00
Jay Zoldak
7f5c810ac8 Skip language changing tests 2014-05-16 09:00:12 -04:00
Calen Pennington
f35379a838 Update opaque_keys docs 2014-05-15 16:12:40 -04:00
Brian Wilson
aacbc5eddb Merge branch 'release' (after release-2014-05-14). 2014-05-15 14:34:22 -04:00
Calen Pennington
77b895cb98 Merge pull request #3673 from cpennington/opaque-keys-merge-master 
Merge master into opaque-keys
 2014-05-15 13:24:50 -04:00
Calen Pennington
2a4b3c969a Fix merge conflicts 2014-05-15 10:25:20 -04:00
Calen Pennington
ff026ea8af Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	common/lib/xmodule/xmodule/video_module/video_handlers.py
 2014-05-15 10:25:08 -04:00
Carson Gee
de637f329e Merge pull request #3725 from carsongee/cg/transcript_xmlmodulestore_fix 
Fix bug affecting video transcripts in XMLModulesStore courses
 2014-05-15 08:50:36 -04:00
Don Mitchell
aa7a4cedaa BlockUsageLocators are not AssetKeys. 2014-05-15 08:39:58 -04:00
Oleg Marshev
b9cd6cd6ec Add sjson and srt to type map. 2014-05-15 14:02:48 +03:00
Carson Gee
52d8317ab5 Fix bug affecting video transcripts in XMLModulesStore courses 2014-05-14 15:19:15 -04:00
David Baumgold
59e3cae4c9 Revert pull request #3466 2014-05-14 13:55:26 -04:00
Calen Pennington
6ca0a7a1d6 Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master 2014-05-14 10:00:25 -04:00
Calen Pennington
7e55d5eb5c Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 2014-05-14 10:00:16 -04:00
Calen Pennington
40e7cab8fb Fix failing mongo modulestore unit tests 2014-05-14 09:59:54 -04:00
Diana Huang
43b2d670e7 Merge pull request #3713 from edx/fix-ora-errors 
More missing ORA fixes.
 2014-05-14 09:40:35 -04:00
Diana Huang
25e026438d More missing ORA fixes. 2014-05-13 17:47:26 -04:00
Diana Huang
72b27c1800 Merge pull request #3709 from edx/fix-ora-errors 
Some more places where we have ORA errors
 2014-05-13 17:37:03 -04:00
Julia Hansbrough
6c46fb98ca Compare stringified course_ids to regexes for courses allowed to execute unsafe code 2014-05-13 21:34:15 +00:00
Diana Huang
b39278309d More ORA fixes for opaque-keys. 2014-05-13 16:39:56 -04:00
Calen Pennington
8534ef559d Fix cms tests after merge from master 2014-05-13 16:33:14 -04:00
Calen Pennington
6c546fbf1f Fix merge conflicts 2014-05-13 15:31:40 -04:00
Calen Pennington
240d91daeb Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/management/commands/tests/test_import.py
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/bulk_email/tests/test_course_optout.py
	lms/djangoapps/bulk_email/tests/test_email.py
	lms/djangoapps/bulk_email/tests/test_err_handling.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/instructor/tests/test_email.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/tests/test_legacy_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_email.py
	lms/djangoapps/instructor/tests/test_legacy_enrollment.py
	lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
	lms/djangoapps/instructor/tests/test_legacy_gradebook.py
	lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_reset.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/templates/courseware/instructor_dashboard.html
 2014-05-13 15:30:56 -04:00
Calen Pennington
16faafded9 Fix ssl redirection test 2014-05-13 14:13:45 -04:00
Andy Armstrong
4adc608f48 Specify that split_test_modules support children. 2014-05-13 12:36:45 -04:00
Brian Wilson
d6a74a644d Merge branch 'master' into release 
Conflicts:
	cms/static/js/views/modals/edit_xblock.js
 2014-05-13 11:10:48 -04:00
Calen Pennington
484c529d99 Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master 2014-05-13 10:23:24 -04:00
Waheed Ahmed
7a96faf9a3 Merge pull request #3585 from dragonfi/master 
Fix #3347: "Run Code" reloads page in Matlab Problem
 2014-05-13 19:06:40 +05:00
Carson Gee
eadf3b59e2 Merge pull request #3464 from mitocw/cg/course_image_fixes 
Additional logic to handle more course_image URL edge cases
 2014-05-13 09:19:07 -04:00