Commits · c72b0bb293d109b9cfca0d595f865ba96080949e · edx / edx-platform · GitLab

09 May, 2014 40 commits
- Resolve merge conflicts relative to master · c72b0bb2
  Calen Pennington committed May 09, 2014
  
  c72b0bb2 Browse Files
- Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master · 155ffe37
```
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
```
  Calen Pennington committed May 09, 2014
  155ffe37 Browse Files
- Merge pull request #3609 from edx/sarina/i18n-cleanup · 193a8163
```
Clarify strings for i18n
```
  Sarina Canelake committed May 09, 2014
  193a8163 Browse Files
- Merge pull request #3156 from edx/dcs/LMS-1740 · eab8445e
```
Fixes LMS-1740 by activating the zooming diagram with the spacebar.
```
  Dave St.Germain committed May 09, 2014
  eab8445e Browse Files
- Merge pull request #3667 from edx/ned/more-links-in-pr-guidelines · 4ea3945d
```
Add more links in the PR guidelines.
```
  Ned Batchelder committed May 09, 2014
  4ea3945d Browse Files
- Add more links in the PR guidelines. · c7543dd3
  Ned Batchelder committed May 09, 2014
  
  c7543dd3 Browse Files
- Merge pull request #2686 from edx/feature/ichuang/add-reset-links-to-staff-debug · 379745e3
```
add problem reset link to staff debug page
```
  Carson Gee committed May 09, 2014
  379745e3 Browse Files
- Merge pull request #3617 from edx/sylvia/docs/DOC-359 · d756b4a9
```
Sylvia/docs/doc 359
```
  srpearce committed May 09, 2014
  d756b4a9 Browse Files
- Add VitalSource information · 28a2efea
  Sylvia Pearce committed May 09, 2014
  
  28a2efea Browse Files
- Merge pull request #3650 from edx/sylvia/docs/DOC-206 · fa0e958b
```
Sylvia/docs/doc 206
```
  srpearce committed May 09, 2014
  fa0e958b Browse Files
- Update Video component UI text · c1ef41fe
  Sylvia Pearce committed May 09, 2014
  
  c1ef41fe Browse Files
- Merge pull request #3663 from edx/markhoeber/documentation/doc-309 · dbb87e26
```
Note about course staff and discussion admin roles
```
  Mark Hoeber committed May 09, 2014
  dbb87e26 Browse Files
- Note about course staff and discussion admin roles · 3a185b26
```
doc-309
```
  Mark Hoeber committed May 09, 2014
  3a185b26 Browse Files
- Merge pull request #3662 from edx/diana/minor-ddt-fix · 558e9c8f
```
Fix ddt decorators
```
  Diana Huang committed May 09, 2014
  558e9c8f Browse Files
- Use ddt decorators as specified in doc. · f3a7be5a
  Diana Huang committed May 09, 2014
  
  f3a7be5a Browse Files
- Merge pull request #3661 from edx/opaque-keys-mod_key · 01ae09aa
```
Opaque keys mod key
```
  Don Mitchell committed May 09, 2014
  01ae09aa Browse Files
- Fix message handling to be more internationalizable · 7c1e6d83
  Carson Gee committed May 09, 2014
  
  7c1e6d83 Browse Files
- Fix missing field access · bd4595fa
  Don Mitchell committed May 09, 2014
  
  bd4595fa Browse Files
- Merge pull request #3658 from edx/opaque-keys-location-to-son · 660f9050
```
Opaque keys location to son
```
  Don Mitchell committed May 09, 2014
  660f9050 Browse Files
- Merge pull request #3659 from edx/opaque-keys-validate · ae99a170
```
Opaque keys validate
```
  Don Mitchell committed May 09, 2014
  ae99a170 Browse Files
- Merge pull request #3645 from edx/opaque-keys-student-module · a558980e
```
Opaque keys student module
```
  Don Mitchell committed May 09, 2014
  a558980e Browse Files
- Revert StudentModule.module_state_key to field rather than computed property · 7be81341
  Don Mitchell committed May 09, 2014
  
  7be81341 Browse Files
- Merge pull request #3653 from edx/gprice/discussion-link-command · 8f90dd83
```
Add command to get discussion_link for a course
```
  Greg Price committed May 09, 2014
  8f90dd83 Browse Files
- Merge pull request #3657 from edx/opaque-keys-access · b89b1e07
```
Don't fetch the course just to find out if the user has access to it.
```
  Don Mitchell committed May 09, 2014
  b89b1e07 Browse Files
- fixed asset search query. · 46a976d7
```
moved location_to_son to LocationBase.py.
```
  Nimisha Asthagiri committed May 09, 2014
  46a976d7 Browse Files
- Validate the args to SSCK · 69a2d988
  Don Mitchell committed May 09, 2014
  
  69a2d988 Browse Files
- Merge pull request #3651 from edx/opaque-keys-xmodule-lib-cleanup · b337d4f8
```
Responses to comments on https://github.com/edx/edx-platform/pull/3539
```
  Don Mitchell committed May 09, 2014
  b337d4f8 Browse Files
- Clarify strings for i18n · 81a8bc39
  Sarina Canelake committed May 09, 2014
  
  81a8bc39 Browse Files
- Responses to comments on https://github.com/edx/edx-platform/pull/3539 · f73939ab
```
Conflicts:
	common/lib/xmodule/xmodule/modulestore/locations.py
```
  Don Mitchell committed May 09, 2014
  f73939ab Browse Files
- Merge pull request #3655 from edx/opaque-keys-common-lib-xmodule · b3b118ee
```
Opaque keys common lib xmodule
```
  Don Mitchell committed May 09, 2014
  b3b118ee Browse Files
- Don't fetch the course just to find out if the user has access to it. · 6834376b
  Don Mitchell committed May 09, 2014
  
  6834376b Browse Files
- Merge pull request #3642 from cpennington/opaque-keys-return-course · d5468fff
```
Fix some tests on the opaque keys branch
```
  Calen Pennington committed May 09, 2014
  d5468fff Browse Files
- Merge pull request #3652 from edx/sylvia/docs/DOC-390 · f4d97ca5
```
Fixed typos in example code for drag and drop problems
```
  srpearce committed May 09, 2014
  f4d97ca5 Browse Files
- Merge pull request #3634 from edx/ammar/bok-choy-video-tests-batch6 · 50a99de6
```
Bok-Choy Video Tests Batch6
```
  muhammad-ammar committed May 09, 2014
  50a99de6 Browse Files
- Use a validly formed bogus task id · e042eb62
  Calen Pennington committed May 09, 2014
  
  e042eb62 Browse Files
- Clean up partial import statemen · 002bfd47
  Calen Pennington committed May 09, 2014
  
  002bfd47 Browse Files
- Make dashboard.tests a python module · ac7675be
  Calen Pennington committed May 09, 2014
  
  ac7675be Browse Files
- Fix syntax error · 60cecc4e
  Calen Pennington committed May 09, 2014
  
  60cecc4e Browse Files
- Clean up how courses are iterated on instructor dashboard · 6334d7dd
  Calen Pennington committed May 09, 2014
  
  6334d7dd Browse Files
- Fix cohort.course_id naming · 7bb6d6f2
  Calen Pennington committed May 09, 2014
  
  7bb6d6f2 Browse Files