Sarina Canelake
|
afac5145e3
|
Merge pull request #3757 from edx/sarina/fix-git_import
Sarina/fix git import
|
2014-05-16 16:12:33 -04:00 |
|
Calen Pennington
|
56a6b99f61
|
Merge pull request #3759 from cpennington/opaque-keys-rtfd-requirements
Add napoleon to the requirements to build our docs
|
2014-05-16 15:10:27 -04:00 |
|
Calen Pennington
|
bad2941f09
|
Add napoleon to the requirements to build our docs
|
2014-05-16 13:49:55 -04:00 |
|
Sarina Canelake
|
b3462d1c67
|
Fix issues with psychometrics and git import
|
2014-05-16 11:47:14 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Oleg Marshev
|
b9cd6cd6ec
|
Add sjson and srt to type map.
|
2014-05-15 14:02:48 +03: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 |
|
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 |
|
Alison Hodges
|
00fb23d5ed
|
Merge pull request #3689 from edx/ahodges/documentation/DOC405
DOC-405: privileges in Studio=privileges in LMS
|
2014-05-14 11:32:51 -04:00 |
|
Alison Hodges
|
614494aa1a
|
DOC-405: privileges in Studio=privileges in LMS
|
2014-05-14 11:32:01 -04:00 |
|
Jay Zoldak
|
8ffc51689e
|
Merge pull request #3598 from edx/zoldak/rebalance-cms-shards
Rebalance CMS acceptance test shards
|
2014-05-14 11:29:31 -04:00 |
|
Julia Hansbrough
|
ce8e6cd0d0
|
Merge pull request #3711 from edx/flowerhack/fix-subhist
Fix improper parsing of location string
|
2014-05-14 11:19:12 -04:00 |
|
Alison Hodges
|
8b38d9d382
|
Merge pull request #3698 from edx/ahodges/documenttion/DOC387
Ahodges/documenttion/doc387
|
2014-05-14 11:18:11 -04:00 |
|
Alison Hodges
|
aa7de7e2be
|
Staff Debug includes links to reset/rescore/delete state for a student
|
2014-05-14 11:17:22 -04:00 |
|
Adam
|
08eb8fa7c1
|
Merge pull request #3706 from edx/adam/fix-non-ascii-grade-range
Adam/fix non ascii grade range
|
2014-05-14 10:52:28 -04:00 |
|
Mark Hoeber
|
ba7171b013
|
Merge pull request #3719 from edx/markhoeber/documentation/change-log-fix
May change log fix
|
2014-05-14 10:48:00 -04:00 |
|
Mark Hoeber
|
f321d7a8ee
|
May change log fix
|
2014-05-14 10:27:04 -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 |
|
Stephen Sanchez
|
5cc41a6c9b
|
Changing Student Anon ID Dump to return Course Specific IDs.
|
2014-05-14 09:56:36 -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 |
|
Calen Pennington
|
ecdb9ec461
|
Address review comments
|
2014-05-14 09:37:38 -04:00 |
|
Waheed Ahmed
|
df3d6e3b06
|
Merge pull request #3714 from edx/waheed/lms1596-change-text-admin-dash
Text changed in admin_dashboard for course enrollments.
|
2014-05-14 18:30:51 +05:00 |
|
Waheed Ahmed
|
2b8fafec56
|
Text changed in admin_dashboard for course enrollments.
LMS-1596
|
2014-05-14 15:40:50 +05: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
|
2eda8a677a
|
Merge pull request #3699 from edx/flowerhack/fix-safe-exec
Compare stringified course_ids to regexes for courses allowed to execute...
|
2014-05-13 17:36:44 -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 |
|