Commits · 240fcc1d5a9c10f577fdddfdd46735b83f6bae1a · edx / edx-platform

22 May, 2014 16 commits
- Fix merge conflicts · 240fcc1d
  Calen Pennington committed May 22, 2014
  
  240fcc1d Browse Files
- Merge remote-tracking branch 'edx/master' into opaque-keys · cd862b32
```
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html
```
  Calen Pennington committed May 22, 2014
  cd862b32 Browse Files
- Merge pull request #3798 from edx/ahodges/documentation/DOC402 · 9955e9e3
```
Adaptive hint correct_answer must be lc
```
  Alison Hodges committed May 22, 2014
  9955e9e3 Browse Files
- Adaptive hint correct_answer must be lc · dc00ade1
  Alison Hodges committed May 22, 2014
  
  dc00ade1 Browse Files
- Merge pull request #3818 from edx/ahodges/documentation/DOC368 · 4e38b10a
```
Ahodges/documentation/doc368
```
  Alison Hodges committed May 22, 2014
  4e38b10a Browse Files
- Reorganized, updated, & streamlined sections in Running Your Course · 5ce9b418
  Alison Hodges committed May 22, 2014
  
  5ce9b418 Browse Files
- Merge pull request #3820 from edx/dhm/bug_ok_serial_numbers · 253ed3b8
```
Dhm/bug ok serial numbers
```
  Don Mitchell committed May 22, 2014
  253ed3b8 Browse Files
- Merge pull request #3766 from edx/zub/bugfix/std1616-editdraft · 72d9a91f
```
create draft request gets already created version if it exists
```
  zubair-arbi committed May 22, 2014
  72d9a91f Browse Files
- fixup! Serial number commands deserialize course keys · ba59e3b8
  Calen Pennington committed May 22, 2014
  
  ba59e3b8 Browse Files
- Merge pull request #3821 from edx/ok-permissions-asserts · 0631c635
```
Added asserts to ensure course_ids are course key objects.
```
  Nimisha Asthagiri committed May 22, 2014
  0631c635 Browse Files
- Merge pull request #3774 from edx/waheed/lms2719-fix-register-on-edge · a7184c03
```
Fixed register button on edge homepage.
```
  Waheed Ahmed committed May 22, 2014
  a7184c03 Browse Files
- Fixed register button on edge homepage. · b6a90e0b
```
LMS-2719
```
  Waheed Ahmed committed May 22, 2014
  b6a90e0b Browse Files
- Merge pull request #3810 from cpennington/ok-management-commands · 4b69cf54
```
Fix management commands
```
  Calen Pennington committed May 21, 2014
  4b69cf54 Browse Files
- Merge pull request #3815 from cpennington/ok-certificaties · 942c2eab
```
Fix certificate requests
```
  Calen Pennington committed May 21, 2014
  942c2eab Browse Files
- Merge pull request #3807 from cpennington/ok-cleaner-logging · 76953d72
```
Clean up logging in import_export.py
```
  Calen Pennington committed May 21, 2014
  76953d72 Browse Files
- Merge pull request #3813 from cpennington/ok-mongoengine-fields · 75ad81be
```
Make mongoengine field for UsageKeys expect a Location
```
  Calen Pennington committed May 21, 2014
  75ad81be Browse Files
21 May, 2014 24 commits
- Added asserts to ensure course_ids are course key objects. · d43386a0
  Nimisha Asthagiri committed May 21, 2014
  
  d43386a0 Browse Files
- Merge pull request #3708 from edx/clytwynec/rake2paver-quality · 18ee082c
```
Switch quality tasks to paver
```
  clytwynec committed May 21, 2014
  18ee082c Browse Files
- Serial number commands deserialize course keys · 30184dbd
  Don Mitchell committed May 21, 2014
  
  30184dbd Browse Files
- Merge pull request #3806 from edx/dhm/opaque_migrate_0036 · bef8134e
```
Migration for role_coursenum deprecated roles
```
  Don Mitchell committed May 21, 2014
  bef8134e Browse Files
- Merge pull request #3808 from cpennington/ok-course-mode-errors · 708d758d
```
Call other CourseModeView methods using serialized course_id
```
  Calen Pennington committed May 21, 2014
  708d758d Browse Files
- Merge pull request #3809 from cpennington/ok-dead-code · 1f9c7b2e
```
Remove dead code
```
  Calen Pennington committed May 21, 2014
  1f9c7b2e Browse Files
- fixup! Fix management commands · 1c60da02
  Calen Pennington committed May 21, 2014
  
  1c60da02 Browse Files
- Merge pull request #3765 from edx/sylvia/docs/TIM-243 · fb300029
```
Sylvia/docs/tim 243
```
  srpearce committed May 21, 2014
  fb300029 Browse Files
- Merge pull request #3579 from edx/andya/container-add-buttons · eb362fba
```
Allow creation of components on container page
```
  Christina Roberts committed May 21, 2014
  eb362fba Browse Files
- Merge pull request #3811 from cpennington/ok-dont-use-empty · 32e0387f
```
Don't use Empty directly, let the manager handle it
```
  Calen Pennington committed May 21, 2014
  32e0387f Browse Files
- Deprecate old ORA; add links to new ORA permanent docs · d8d7c2fd
  Sylvia Pearce committed May 21, 2014
  
  d8d7c2fd Browse Files
- Merge pull request #3812 from cpennington/ok-simpler-loc-mapper · 61e621fc
```
Make the arguments to translate_location_to_course_locator more specific
```
  Calen Pennington committed May 21, 2014
  61e621fc Browse Files
- Merge pull request #3814 from cpennington/ok-conditional-test · 3b58997b
```
Fix ConditionalTest test system
```
  Calen Pennington committed May 21, 2014
  3b58997b Browse Files
- Fix certificate requests · 4c3c8a9a
  Calen Pennington committed May 21, 2014
  
  4c3c8a9a Browse Files
- Merge pull request #3816 from cpennington/ok-psychometrics · 150b5cd2
```
Fix PsychometricData query
```
  Calen Pennington committed May 21, 2014
  150b5cd2 Browse Files
- Allow creation of components on container page · 541d20ef
```
This commit implements STUD-1490, allowing creation of components
on the container page. It also enables the delete and duplicate
buttons now that new content can be created that would benefit.

Note that it also creates shared functionality for adding components,
and refactors the unit page to use it too.
```
  Andy Armstrong committed May 21, 2014
  541d20ef Browse Files
- Merge pull request #2776 from aboudreault/embargo-restrict-additions · 5752312b
```
Extended Embargo feature to support site access restriction and ip network
```
  Julia Hansbrough committed May 21, 2014
  5752312b Browse Files
- Fix PsychometricData query · d52c58c7
  Calen Pennington committed May 21, 2014
  
  d52c58c7 Browse Files
- Fix ConditionalTest test system · c62b6b00
  Calen Pennington committed May 21, 2014
  
  c62b6b00 Browse Files
- Make mongoengine field for UsageKeys expect a Location · 4c2e612a
  Calen Pennington committed May 21, 2014
  
  4c2e612a Browse Files
- Make the arguments to translate_location_to_course_locator more specific · 48362529
  Calen Pennington committed May 21, 2014
  
  48362529 Browse Files
- Don't use Empty directly, let the manager handle it · 06d680cd
  Calen Pennington committed May 21, 2014
  
  06d680cd Browse Files
- Fix management commands · 1f849e44
  Calen Pennington committed May 21, 2014
  
  1f849e44 Browse Files
- Remove dead code · 4af2249a
  Calen Pennington committed May 21, 2014
  
  4af2249a Browse Files