Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Carson Gee
faefba9182 Add ADDL_INSTALLED_APPS to studio for parity with lms 2014-05-14 10:20:21 -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
John Jarvis
71c447768d returning enrollment mode for both active and inactive users 2014-05-13 17:47:52 -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
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
Julia Hansbrough
542dff194e Fix improper parsing of location string 2014-05-13 21:29:30 +00:00
David Baumgold
f8f542b677 Merge pull request #3710 from edx/db/add-to-authors-file 
Added @ksteph to AUTHORS file
 2014-05-13 17:16:09 -04:00
David Baumgold
c6ea63d3fd Added @ksteph to AUTHORS file 
See https://github.com/edx/edx-platform/pull/506
 2014-05-13 17:14:09 -04:00
Diana Huang
b39278309d More ORA fixes for opaque-keys. 2014-05-13 16:39:56 -04:00
Brian Talbot
2c9a7b51fd Merge pull request #3696 from edx/talbs/fix-lms-dashboard-images 
FIX - LMS: Dashboard Course Image Dimensions
 2014-05-13 16:35:58 -04:00
Calen Pennington
8534ef559d Fix cms tests after merge from master 2014-05-13 16:33:14 -04:00
Brian Talbot
cd1ec5fd58 resolving display issue where older/smaller courses images wouldn't fill designated area on the student dashboard 2014-05-13 16:25:44 -04:00
Calen Pennington
5c345b3b00 Fix more broken tests after merge from master 2014-05-13 16:21:18 -04:00
Will Daly
7fcaa20c61 Merge pull request #3702 from edx/will/opaque-keys-ora-fixes 
Will/opaque keys ora fixes
 2014-05-13 16:01:20 -04:00
Andy Armstrong
073115442c Merge pull request #3700 from edx/andya/split_test_has_children 
Specify that split_test_modules support children.
 2014-05-13 15:45:39 -04:00
Adam Palay
9b313d732f fix bug 2014-05-13 15:32:46 -04:00