Commits · 30f2c9331d6402437a215bd78018165430c3caaa · edx / edx-platform · GitLab

19 May, 2014 12 commits
- Merge pull request #3763 from cpennington/opaque-keys-merge-master · 30f2c933
```
Merge latest master into opaque-keys
```
  Calen Pennington committed May 19, 2014
  30f2c933 Browse Files
- Rename variables to make type clearer · a3b6ef8b
  Calen Pennington committed May 19, 2014
  
  a3b6ef8b Browse Files
- Update annotations modules to use the course_id from the runtime, rather than… · 4df122a9
```
Update annotations modules to use the course_id from the runtime, rather than extracting it from the page
```
  Calen Pennington committed May 19, 2014
  4df122a9 Browse Files
- Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master · 2ce67191
  Calen Pennington committed May 19, 2014
  
  2ce67191 Browse Files
- Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master · 8f72394e
```
Conflicts:
	cms/templates/widgets/header.html
```
  Calen Pennington committed May 19, 2014
  8f72394e Browse Files
- Merge pull request #3768 from edx/will/ora2-release-2014-05-19 · 6c7ca7ae
```
ORA2 release 2014-05-19
```
  Will Daly committed May 19, 2014
  6c7ca7ae Browse Files
- Merge pull request #3771 from edx/sarina/051914-language-update · 03496b5d
```
Sarina/051914 language update
```
  Sarina Canelake committed May 19, 2014
  03496b5d Browse Files
- Update translations (autogenerated message) · 593f5918
  Sarina Canelake committed May 19, 2014
  
  593f5918 Browse Files
- Add Croatian language · 5fd2eef5
  Sarina Canelake committed May 19, 2014
  
  5fd2eef5 Browse Files
- ORA2 release 2014-05-19 · 8b3992bf
  Will Daly committed May 19, 2014
  
  8b3992bf Browse Files
- Merge pull request #3716 from edx/anton/i18n-symbolic-response · b3fb545b
```
SymbolicResponse fix error message.
```
  Anton Stupak committed May 19, 2014
  b3fb545b Browse Files
- SymbolicResponse fix error message. · aedde339
  polesye committed May 19, 2014
  
  aedde339 Browse Files
17 May, 2014 6 commits
- Merge pull request #3619 from edx/markhoeber/documentatoin/online-help-system · b3233f29
```
Online help system
```
  Nimisha Asthagiri committed May 16, 2014
  b3233f29 Browse Files
- Updated tests for online help · 73275eeb
  Nimisha Asthagiri committed May 16, 2014
  
  73275eeb Browse Files
- Added new context sensitive link and updated text · 27ff0db5
```
Sock template changes
```
  Mark Hoeber committed May 16, 2014
  27ff0db5 Browse Files
- Acceptance tests for online help. · 84d8fcf1
  Nimisha Asthagiri committed May 16, 2014
  
  84d8fcf1 Browse Files
- Update of all templates · 8fcbdaed
```
Changed help button to link and removed drop-down items
```
  Mark Hoeber committed May 16, 2014
  8fcbdaed Browse Files
- Dev support for context-sensitive help. · b7440a51
  Nimisha Asthagiri committed May 16, 2014
  
  b7440a51 Browse Files
16 May, 2014 22 commits
- Merge pull request #3615 from jazkarta/devstack-local-filestorage · 3b258018
```
Use local storage instead of S3 for uploads in devstack.
```
  Carson Gee committed May 16, 2014
  3b258018 Browse Files
- Merge pull request #3761 from edx/dhm/opaque-export · 1c6a0f0a
```
Dhm/opaque export
```
  Don Mitchell committed May 16, 2014
  1c6a0f0a Browse Files
- Use path already created by ansible. · db8b33d0
  Chris Rossi committed May 16, 2014
  
  db8b33d0 Browse Files
- Use local storage instead of S3 for uploads in devstack. · 42e8e306
  Chris Rossi committed May 16, 2014
  
  42e8e306 Browse Files
- Merge pull request #3760 from edx/sarina/fix-split-test-child-id · 4a842131
```
Sarina/fix split test child
```
  Sarina Canelake committed May 16, 2014
  4a842131 Browse Files
- Merge pull request #3757 from edx/sarina/fix-git_import · afac5145
```
Sarina/fix git import
```
  Sarina Canelake committed May 16, 2014
  afac5145 Browse Files
- Fix test_import_export.py · ba7abf42
  Calen Pennington committed May 16, 2014
  
  ba7abf42 Browse Files
- Fix dashboard data tests · dd6609fa
  Calen Pennington committed May 16, 2014
  
  dd6609fa Browse Files
- xml export of drafts was exporting everything · d636c56a
```
now only exports the drafts into the draft subdir
STUD-1627
```
  Don Mitchell committed May 16, 2014
  d636c56a Browse Files
- Merge pull request #3759 from cpennington/opaque-keys-rtfd-requirements · 56a6b99f
```
Add napoleon to the requirements to build our docs
```
  Calen Pennington committed May 16, 2014
  56a6b99f Browse Files
- Migrate new code from merge to use OK standards · 6d5478a4
  Calen Pennington committed May 16, 2014
  
  6d5478a4 Browse Files
- Fix merge conflicts · d4280e85
  Calen Pennington committed May 16, 2014
  
  d4280e85 Browse Files
- Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master · 18c91d0f
```
Conflicts:
	cms/djangoapps/contentstore/tests/utils.py
	cms/djangoapps/contentstore/views/import_export.py
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	common/djangoapps/student/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/static/js/staff_debug_actions.js
	lms/templates/notes.html
	lms/templates/staff_problem_info.html
```
  Calen Pennington committed May 16, 2014
  18c91d0f Browse Files
- Merge pull request #3752 from edx/db/doc-cognitive-load · 2549551e
```
Added rst version of cognitive load page
```
  David Baumgold committed May 16, 2014
  2549551e Browse Files
- link to code considerations page from contributor doc · 8afe315c
  David Baumgold committed May 16, 2014
  
  8afe315c Browse Files
- Fix split test child id · 1919df71
  Sarina Canelake committed May 16, 2014
  
  1919df71 Browse Files
- Add napoleon to the requirements to build our docs · bad2941f
  Calen Pennington committed May 16, 2014
  
  bad2941f Browse Files
- Merge pull request #3758 from edx/clytwynec/disable-XBlockAcidNoChildTest · 6396373b
```
disabled test_lms.py:XBlockAcidNoChildTest.test_acid_block
```
  clytwynec committed May 16, 2014
  6396373b Browse Files
- Merge pull request #3740 from edx/sylvia/docs/BLD-1032 · 64909df1
```
Update Video component to reflect new UI
```
  srpearce committed May 16, 2014
  64909df1 Browse Files
- Update Video docs to reflect new UI · 14f3bcfe
  Sylvia Pearce committed May 16, 2014
  
  14f3bcfe Browse Files
- Fix issues with psychometrics and git import · b3462d1c
  Sarina Canelake committed May 16, 2014
  
  b3462d1c Browse Files
- Fix doc typos from #3746 · af8cab2a
  Calen Pennington committed May 16, 2014
  
  af8cab2a Browse Files