Commits · f35379a8387265a3613471830268e724d0788c67 · edx / edx-platform · GitLab

15 May, 2014 10 commits
- Update opaque_keys docs · f35379a8
  Calen Pennington committed May 15, 2014
  
  f35379a8 Browse Files
- Merge pull request #3673 from cpennington/opaque-keys-merge-master · 77b895cb
```
Merge master into opaque-keys
```
  Calen Pennington committed May 15, 2014
  77b895cb Browse Files
- Merge pull request #3736 from edx/dhm/opaque-no-asset · 75e7cbac
```
Dhm/opaque no asset
```
  Don Mitchell committed May 15, 2014
  75e7cbac Browse Files
- Fix instructor csv download · daf35bed
  Calen Pennington committed May 15, 2014
  
  daf35bed Browse Files
- Fix merge conflicts · 2a4b3c96
  Calen Pennington committed May 15, 2014
  
  2a4b3c96 Browse Files
- Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master · ff026ea8
```
Conflicts:
	common/lib/xmodule/xmodule/video_module/video_handlers.py
```
  Calen Pennington committed May 15, 2014
  ff026ea8 Browse Files
- Merge pull request #3725 from carsongee/cg/transcript_xmlmodulestore_fix · de637f32
```
Fix bug affecting video transcripts in XMLModulesStore courses
```
  Carson Gee committed May 15, 2014
  de637f32 Browse Files
- BlockUsageLocators are not AssetKeys. · aa7a4ced
  Don Mitchell committed May 15, 2014
  
  aa7a4ced Browse Files
- Merge pull request #3648 from edx/oleg/fix-download-transcript · a9649973
```
Add mime-type for srt and sjson when importing course. 
```
  Oleg Marshev committed May 15, 2014
  a9649973 Browse Files
- Add sjson and srt to type map. · b9cd6cd6
  Oleg Marshev committed May 15, 2014
  
  b9cd6cd6 Browse Files
14 May, 2014 26 commits
- Merge pull request #3722 from edx/ahodges/documentation/DOC156 · e70ea9a1
```
Ahodges/documentation/doc156
```
  Alison Hodges committed May 14, 2014
  e70ea9a1 Browse Files
- Reformatted tables, copy edited, and proofread. · ca1afe46
  Alison Hodges committed May 14, 2014
  
  ca1afe46 Browse Files
- Fix merge conflicts · ddf1874c
  Calen Pennington committed May 14, 2014
  
  ddf1874c Browse Files
- Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master · 661f37ec
```
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
```
  Calen Pennington committed May 14, 2014
  661f37ec Browse Files
- Fix spoc_gradebook · 44b15619
  Calen Pennington committed May 14, 2014
  
  44b15619 Browse Files
- Fix bug affecting video transcripts in XMLModulesStore courses · 52d8317a
  Carson Gee committed May 14, 2014
  
  52d8317a Browse Files
- Merge pull request #3703 from edx/sanchez/course-anonymous-ids-in-csv · 0a6ea26c
```
Changing Student Anon ID Dump to return Course Specific IDs.
```
  Stephen Sanchez committed May 14, 2014
  0a6ea26c Browse Files
- Merge pull request #3720 from edx/ahodges/documentation/LMS2591 · ac01da61
```
Changes for LMS-2591, Instructor Dash switchover
```
  Alison Hodges committed May 14, 2014
  ac01da61 Browse Files
- Changes for LMS-2591, Instructor Dash switchover · 5c599481
  Alison Hodges committed May 14, 2014
  
  5c599481 Browse Files
- Merge pull request #3689 from edx/ahodges/documentation/DOC405 · 00fb23d5
```
DOC-405: privileges in Studio=privileges in LMS
```
  Alison Hodges committed May 14, 2014
  00fb23d5 Browse Files
- DOC-405: privileges in Studio=privileges in LMS · 614494aa
  Alison Hodges committed May 14, 2014
  
  614494aa Browse Files
- Merge pull request #3598 from edx/zoldak/rebalance-cms-shards · 8ffc5168
```
Rebalance CMS acceptance test shards
```
  Jay Zoldak committed May 14, 2014
  8ffc5168 Browse Files
- Merge pull request #3711 from edx/flowerhack/fix-subhist · ce8e6cd0
```
Fix improper parsing of location string
```
  Julia Hansbrough committed May 14, 2014
  ce8e6cd0 Browse Files
- Merge pull request #3698 from edx/ahodges/documenttion/DOC387 · 8b38d9d3
```
Ahodges/documenttion/doc387
```
  Alison Hodges committed May 14, 2014
  8b38d9d3 Browse Files
- Staff Debug includes links to reset/rescore/delete state for a student · aa7de7e2
  Alison Hodges committed May 14, 2014
  
  aa7de7e2 Browse Files
- Merge pull request #3706 from edx/adam/fix-non-ascii-grade-range · 08eb8fa7
```
Adam/fix non ascii grade range
```
  Adam committed May 14, 2014
  08eb8fa7 Browse Files
- Merge pull request #3719 from edx/markhoeber/documentation/change-log-fix · ba7171b0
```
May change log fix
```
  Mark Hoeber committed May 14, 2014
  ba7171b0 Browse Files
- May change log fix · f321d7a8
  Mark Hoeber committed May 14, 2014
  
  f321d7a8 Browse Files
- Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master · 6ca0a7a1
  Calen Pennington committed May 14, 2014
  
  6ca0a7a1 Browse Files
- Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master · 7e55d5eb
  Calen Pennington committed May 14, 2014
  
  7e55d5eb Browse Files
- Fix failing mongo modulestore unit tests · 40e7cab8
  Calen Pennington committed May 14, 2014
  
  40e7cab8 Browse Files
- Changing Student Anon ID Dump to return Course Specific IDs. · 5cc41a6c
  Stephen Sanchez committed May 14, 2014
  
  5cc41a6c Browse Files
- Merge pull request #3713 from edx/fix-ora-errors · 43b2d670
```
More missing ORA fixes.
```
  Diana Huang committed May 14, 2014
  43b2d670 Browse Files
- Address review comments · ecdb9ec4
  Calen Pennington committed May 14, 2014
  
  ecdb9ec4 Browse Files
- Merge pull request #3714 from edx/waheed/lms1596-change-text-admin-dash · df3d6e3b
```
Text changed in admin_dashboard for course enrollments.
```
  Waheed Ahmed committed May 14, 2014
  df3d6e3b Browse Files
- Text changed in admin_dashboard for course enrollments. · 2b8fafec
```
LMS-1596
```
  Waheed Ahmed committed May 14, 2014
  2b8fafec Browse Files
13 May, 2014 4 commits
- More missing ORA fixes. · 25e02643
  Diana Huang committed May 13, 2014
  
  25e02643 Browse Files
- Merge pull request #3709 from edx/fix-ora-errors · 72b27c18
```
Some more places where we have ORA errors
```
  Diana Huang committed May 13, 2014
  72b27c18 Browse Files
- Merge pull request #3699 from edx/flowerhack/fix-safe-exec · 2eda8a67
```
Compare stringified course_ids to regexes for courses allowed to execute...
```
  Julia Hansbrough committed May 13, 2014
  2eda8a67 Browse Files
- Compare stringified course_ids to regexes for courses allowed to execute unsafe code · 6c46fb98
  Julia Hansbrough committed May 13, 2014
  
  6c46fb98 Browse Files