Commits · 661f37ecd60ba313eecff6217642c462dc61356b · edx / edx-platform

14 May, 2014 21 commits
- 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
- 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 #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 19 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
- 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
- More ORA fixes for opaque-keys. · b3927830
  Diana Huang committed May 13, 2014
  
  b3927830 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
- Fix cms tests after merge from master · 8534ef55
  Calen Pennington committed May 13, 2014
  
  8534ef55 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
- Fix more broken tests after merge from master · 5c345b3b
  Calen Pennington committed May 13, 2014
  
  5c345b3b Browse Files
- Merge pull request #3702 from edx/will/opaque-keys-ora-fixes · 7fcaa20c
```
Will/opaque keys ora fixes
```
  Will Daly committed May 13, 2014
  7fcaa20c 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
- fix bug · 9b313d73
  Adam Palay committed May 13, 2014
  
  9b313d73 Browse Files
- add failing tests for non-ascii characters in grade cutoffs on progress page (LMS-2687) · 2b95b0ba
  Adam Palay committed May 13, 2014
  
  2b95b0ba Browse Files
- Fix merge conflicts · 6c546fbf
  Calen Pennington committed May 13, 2014
  
  6c546fbf Browse Files
- Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master · 240d91da
```
Conflicts:
	cms/djangoapps/contentstore/management/commands/tests/test_import.py
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/bulk_email/tests/test_course_optout.py
	lms/djangoapps/bulk_email/tests/test_email.py
	lms/djangoapps/bulk_email/tests/test_err_handling.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/instructor/tests/test_email.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/tests/test_legacy_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_email.py
	lms/djangoapps/instructor/tests/test_legacy_enrollment.py
	lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
	lms/djangoapps/instructor/tests/test_legacy_gradebook.py
	lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_reset.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/templates/courseware/instructor_dashboard.html
```
  Calen Pennington committed May 13, 2014
  240d91da Browse Files
- Fix ssl redirection test · 16faafde
  Calen Pennington committed May 13, 2014
  
  16faafde Browse Files
- Update instructor dash to support ora2 submissions API with opaque keys · c6a02870
  Will Daly committed May 13, 2014
  
  c6a02870 Browse Files