Commits · e911d579112f721d8911a17a513837589e531fb3 · edx / edx-platform · GitLab

15 May, 2014 16 commits
- Revert "Revert pull request #3466" · e911d579
```
This reverts commit 59e3cae4.
```
  lduarte1991 committed May 15, 2014
  e911d579 Browse Files
- Merge branch 'release' (after release-2014-05-14). · aacbc5ed
  Brian Wilson committed May 15, 2014
  
  aacbc5ed Browse Files
- Merge pull request #3742 from edx/zoldak/disable-failing-cms-test · a584015b
```
Disable failing cms acceptance tests
```
  Jay Zoldak committed May 15, 2014
  a584015b Browse Files
- Merge pull request #3705 from edx/markhoeber/documentation/doc-400 · 76d511ad
```
Release Notes 05/14/14
```
  Mark Hoeber committed May 15, 2014
  76d511ad Browse Files
- Release Notes file setup · 529d2fa3
```
DOC-400
```
  Mark Hoeber committed May 15, 2014
  529d2fa3 Browse Files
- Disable failing cms acceptance tests · 026e6e4a
  Jay Zoldak committed May 15, 2014
  
  026e6e4a Browse Files
- Merge pull request #3737 from edx/ahodges/documentation/fixup · b99dd920
```
Correcting "make html" errors
```
  Alison Hodges committed May 15, 2014
  b99dd920 Browse Files
- Merge pull request #3735 from edx/usman/lms2557-bulk-email-hack · 524079b4
```
Fix for bulk email not working in Firefox
```
  brianhw committed May 15, 2014
  524079b4 Browse Files
- Merge pull request #3732 from edx/waheed/lms2706-reset-delete-not-working-staff-debug · 3b5e5741
```
Reset, delete and rescore not working on staff debug info
```
  brianhw committed May 15, 2014
  3b5e5741 Browse Files
- Correcting "make html" errors · 356723a6
  Alison Hodges committed May 15, 2014
  
  356723a6 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
- 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
- Fixed on instructor dash too. · 6b84f8ab
  Waheed Ahmed committed May 15, 2014
  
  6b84f8ab Browse Files
- A hack to get instructor email to work in Firefox while the video · 7192fce2
```
annotator tool is refactored to not bundle its own tinymce globally.
```
  Usman Khalid committed May 15, 2014
  7192fce2 Browse Files
- Add sjson and srt to type map. · b9cd6cd6
  Oleg Marshev committed May 15, 2014
  
  b9cd6cd6 Browse Files
- Reset attempts, delete state and rescore buttons not working on staff debug. · 16484420
```
LMS-2706
```
  Waheed Ahmed committed May 15, 2014
  16484420 Browse Files
14 May, 2014 19 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 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 #3723 from edx/db/revert-pr-3466 · 0888e327
```
Revert pull request #3466
```
  brianhw committed May 14, 2014
  0888e327 Browse Files
- Revert pull request #3466 · 59e3cae4
  David Baumgold committed May 14, 2014
  
  59e3cae4 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 #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
- Changing Student Anon ID Dump to return Course Specific IDs. · 5cc41a6c
  Stephen Sanchez committed May 14, 2014
  
  5cc41a6c 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 5 commits
- Merge pull request #3710 from edx/db/add-to-authors-file · f8f542b6
```
Added @ksteph to AUTHORS file
```
  David Baumgold committed May 13, 2014
  f8f542b6 Browse Files
- Added @ksteph to AUTHORS file · c6ea63d3
```
See https://github.com/edx/edx-platform/pull/506
```
  David Baumgold committed May 13, 2014
  c6ea63d3 Browse Files
- Merge pull request #3696 from edx/talbs/fix-lms-dashboard-images · 2c9a7b51
```
FIX - LMS: Dashboard Course Image Dimensions
```
  Brian Talbot committed May 13, 2014
  2c9a7b51 Browse Files
- resolving display issue where older/smaller courses images wouldn't fill… · cd1ec5fd
```
resolving display issue where older/smaller courses images wouldn't fill designated area on the student dashboard
```
  Brian Talbot committed May 13, 2014
  cd1ec5fd Browse Files
- Merge pull request #3700 from edx/andya/split_test_has_children · 07311544
```
Specify that split_test_modules support children.
```
  Andy Armstrong committed May 13, 2014
  07311544 Browse Files