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

23289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
srpearce
64909df1de Merge pull request #3740 from edx/sylvia/docs/BLD-1032 
Update Video component to reflect new UI
 2014-05-16 11:52:47 -04:00
Sylvia Pearce
14f3bcfe66 Update Video docs to reflect new UI 2014-05-16 11:52:19 -04:00
Calen Pennington
af8cab2a37 Fix doc typos from #3746 2014-05-16 11:35:56 -04:00
Calen Pennington
0e4f29a87a Merge pull request #3746 from cpennington/opaque-keys-docs-link 
Update opaque_keys docs
 2014-05-16 11:34:03 -04:00
Christine Lytwynec
0533859366 disabled test_lms.py:XBlockAcidNoChildTest.test_acid_block 2014-05-16 11:17:26 -04:00
zubair-arbi
4ec689ed5e Merge pull request #3640 from edx/zub/bugfix/std1595-importcoursepermission 
remove redundent code on course import
 2014-05-16 19:05:46 +05:00
Diana Huang
12ae70b091 Merge pull request #3753 from edx/diana/update-forums-cmd 
Update get_discussion_link command to use CourseKeys
 2014-05-16 09:42:43 -04:00
Jay Zoldak
576df83974 Merge pull request #3756 from edx/zoldak/disable-flaky-test 
Skip language changing tests
 2014-05-16 09:36:52 -04:00
Jay Zoldak
7f5c810ac8 Skip language changing tests 2014-05-16 09:00:12 -04:00
Don Mitchell
f3fb82f88f Merge pull request #3750 from edx/dhm/opaque-delete-course 
Ensure all cms commands accept either deprecated or new syntax for keys
 2014-05-16 08:42:29 -04:00
zubair-arbi
74aa3a5ba0 create course gorups properly on course import 
STUD-1595
 2014-05-16 14:58:11 +05:00
Don Mitchell
84da71d923 Ensure all cms commands accept either deprecated or new syntax for keys 
LMS-2712
 2014-05-15 17:09:12 -04:00
David Adams
fb9b38b7e3 Merge pull request #3584 from edx/dcadams/metrics_tab_download_csv 
Metrics tab - fix click handlers and add download buttons
 2014-05-15 13:47:52 -07:00
Diana Huang
7a87179dc2 Update get_discussion_link command to use CourseKeys 2014-05-15 16:41:31 -04:00
Calen Pennington
f35379a838 Update opaque_keys docs 2014-05-15 16:12:40 -04:00
David Adams
9bc7a518ee Fixes issue with metrics tab click handlers 
Click handlers were not getting attached to DOM elements in some cases on slow running machines.
  Added logic to attach handlers when elements are ready.

Added 2 buttons on metrics tab:
  Download Subsection Data for downloading to csv.
  Download Problem Data for downloading to csv.
 2014-05-15 11:45:59 -07:00
Brian Wilson
aacbc5eddb Merge branch 'release' (after release-2014-05-14). 2014-05-15 14:34:22 -04:00
Jay Zoldak
a584015bca Merge pull request #3742 from edx/zoldak/disable-failing-cms-test 
Disable failing cms acceptance tests
 2014-05-15 14:27:37 -04:00
Mark Hoeber
76d511ad72 Merge pull request #3705 from edx/markhoeber/documentation/doc-400 
Release Notes 05/14/14
 2014-05-15 14:10:51 -04:00
Mark Hoeber
529d2fa33f Release Notes file setup 
DOC-400
 2014-05-15 14:10:11 -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
Jay Zoldak
026e6e4a6d Disable failing cms acceptance tests 2014-05-15 11:51:06 -04:00
Don Mitchell
75e7cbac10 Merge pull request #3736 from edx/dhm/opaque-no-asset 
Dhm/opaque no asset
 2014-05-15 11:22:43 -04:00
Alison Hodges
b99dd920be Merge pull request #3737 from edx/ahodges/documentation/fixup 
Correcting "make html" errors
 2014-05-15 11:07:32 -04:00
Calen Pennington
daf35bed8f Fix instructor csv download 2014-05-15 10:30:36 -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
brianhw
524079b42d Merge pull request #3735 from edx/usman/lms2557-bulk-email-hack 
Fix for bulk email not working in Firefox
 2014-05-15 10:00:26 -04:00
brianhw
3b5e5741d0 Merge pull request #3732 from edx/waheed/lms2706-reset-delete-not-working-staff-debug 
Reset, delete and rescore not working on staff debug info
 2014-05-15 10:00:09 -04:00
Alison Hodges
356723a634 Correcting "make html" errors 2014-05-15 09:23:05 -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
a9649973aa Merge pull request #3648 from edx/oleg/fix-download-transcript 
Add mime-type for srt and sjson when importing course.
 2014-05-15 15:18:42 +03:00
Waheed Ahmed
6b84f8ab86 Fixed on instructor dash too. 2014-05-15 17:07:10 +05:00
Usman Khalid
7192fce2f5 A hack to get instructor email to work in Firefox while the video 
annotator tool is refactored to not bundle its own tinymce globally.
 2014-05-15 16:54:15 +05:00
Oleg Marshev
b9cd6cd6ec Add sjson and srt to type map. 2014-05-15 14:02:48 +03:00
Waheed Ahmed
1648442052 Reset attempts, delete state and rescore buttons not working on staff debug. 
LMS-2706
 2014-05-15 12:47:51 +05:00
Alison Hodges
e70ea9a115 Merge pull request #3722 from edx/ahodges/documentation/DOC156 
Ahodges/documentation/doc156
 2014-05-14 16:42:54 -04:00
Alison Hodges
ca1afe4695 Reformatted tables, copy edited, and proofread. 2014-05-14 16:42:00 -04:00
Calen Pennington
ddf1874ca4 Fix merge conflicts 2014-05-14 15:59:25 -04:00
Calen Pennington
661f37ecd6 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/legacy.py
 2014-05-14 15:57:38 -04:00
Calen Pennington
44b15619e9 Fix spoc_gradebook 2014-05-14 15:23:58 -04:00
Carson Gee
52d8317ab5 Fix bug affecting video transcripts in XMLModulesStore courses 2014-05-14 15:19:15 -04:00
Stephen Sanchez
0a6ea26c25 Merge pull request #3703 from edx/sanchez/course-anonymous-ids-in-csv 
Changing Student Anon ID Dump to return Course Specific IDs.
 2014-05-14 15:04:42 -04:00
brianhw
0888e32716 Merge pull request #3723 from edx/db/revert-pr-3466 
Revert pull request #3466
 2014-05-14 14:13:28 -04:00
David Baumgold
59e3cae4c9 Revert pull request #3466 2014-05-14 13:55:26 -04:00
Alison Hodges
ac01da61ed Merge pull request #3720 from edx/ahodges/documentation/LMS2591 
Changes for LMS-2591, Instructor Dash switchover
 2014-05-14 12:55:07 -04:00
Alison Hodges
5c5994816c Changes for LMS-2591, Instructor Dash switchover 2014-05-14 12:54:40 -04:00