Commits · 698c9b59140e2418fc2f1314f1ca48d93ad72293 · edx / edx-platform · GitLab

12 Sep, 2014 10 commits
- Merge pull request #5184 from edx/renzo/upsell-tracking · 698c9b59
```
Add tracking on expand of upsell message
```
  Renzo Lucioni committed Sep 12, 2014
  698c9b59 Browse Files
- Merge pull request #5198 from edx/feanil/sandbox_matplotlib · 8b92bd15
```
Add matplotlib to the sandbox requirements.
```
  Feanil Patel committed Sep 12, 2014
  8b92bd15 Browse Files
- Add matplotlib to the sandbox requirements. · 45b2e503
```
Used by MITx/6.341x
```
  Feanil Patel committed Sep 12, 2014
  45b2e503 Browse Files
- Merge pull request #5196 from edx/release · 218611c8
```
hotfix-2014-09-12
```
  Don Mitchell committed Sep 12, 2014
  218611c8 Browse Files
- Add tracking on expand of upsell message · 22f58be4
  Renzo Lucioni committed Sep 12, 2014
  
  22f58be4 Browse Files
- Merge pull request #5192 from edx/andy/ora-hotfix · 068a01a4
```
Update platform to use the latest ORA release
```
  Andy Armstrong committed Sep 12, 2014
  068a01a4 Browse Files
- Update platform to use the latest ORA release · 04595a7b
  Andy Armstrong committed Sep 12, 2014
  
  04595a7b Browse Files
- Merge pull request #4983 from lduarte1991/lduarte-harvardx-pr20 · 535e6e4f
```
Annotation Tools: Turn off Private/Public option and add missing css group to MyNotes
```
  Anton Stupak committed Sep 12, 2014
  535e6e4f Browse Files
- Merge pull request #5022 from edx/waheed/lms11141-fix-invalid-key-error-in-course-handler · 51b680af
```
Fixed InvalidKeyError in course handler in studio.
```
  Waheed Ahmed committed Sep 12, 2014
  51b680af Browse Files
- Fixed InvalidKeyError in course handler in studio. · a1e911ae
```
LMS-11141
```
  Waheed Ahmed committed Sep 12, 2014
  a1e911ae Browse Files
11 Sep, 2014 30 commits
- Merge pull request #5044 from edx/sylvia/docs/DOC-875 · 9ca4c566
```
Add note about angle brackets to Dropdown topic
```
  srpearce committed Sep 11, 2014
  9ca4c566 Browse Files
- Add note about angle brackets to Dropdown topic · 96c0babe
  Sylvia Pearce committed Sep 11, 2014
  
  96c0babe Browse Files
- Merge pull request #5182 from edx/sylvia/docs/minorfixes · a0964f71
```
Minor updates to three problem types
```
  srpearce committed Sep 11, 2014
  a0964f71 Browse Files
- remove note from Annotations · a41e6c4e
  Sylvia Pearce committed Sep 11, 2014
  
  a41e6c4e Browse Files
- Update i18n_translators_guide.rst · 13c8dd27
  Sarina Canelake committed Sep 11, 2014
  
  13c8dd27 Browse Files
- Minor updates to three problem types · 3575755d
  Sylvia Pearce committed Sep 11, 2014
  
  3575755d Browse Files
- Merge pull request #5178 from edx/release · d9567c35
```
Release
```
  Adam committed Sep 11, 2014
  d9567c35 Browse Files
- Merge pull request #5176 from edx/andya/lms-ux-reference-templates · 82675b2b
```
Add support for UX reference templates in LMS
```
  Andy Armstrong committed Sep 11, 2014
  82675b2b Browse Files
- Merge pull request #5133 from edx/christina/cohorts-api · 610710cf
```
Create auto cohorts when list_cohorts is called.
```
  Christina Roberts committed Sep 11, 2014
  610710cf Browse Files
- Add support for UX reference templates in LMS · 7683cba2
  Andy Armstrong committed Sep 11, 2014
  
  7683cba2 Browse Files
- Create auto cohorts when list_cohorts is called and return number of users per cohort. · 020094b8
```
TNL-186
```
  cahrens committed Sep 11, 2014
  020094b8 Browse Files
- Merge pull request #5177 from edx/usman/fix-xml-imports · abf5f176
```
Moved imports to startup.py.
```
  Adam committed Sep 11, 2014
  abf5f176 Browse Files
- Annotation Tools: Clean-up · 32040164
  lduarte1991 committed Sep 11, 2014
  
  32040164 Browse Files
- Merge pull request #4977 from edx/split/paver · dedd88cc
```
Split/paver LMS-11211
```
  Nimisha Asthagiri committed Sep 11, 2014
  dedd88cc Browse Files
- Merge pull request #5162 from cpennington/split/import-export-performance · 3ec3bbbe
```
Performance improvements to split mongo and old-mongo, based on import/export tests.
```
  Calen Pennington committed Sep 11, 2014
  3ec3bbbe Browse Files
- Only format test assertion messages when they are needed (they are a performance… · b9908ec2
```
Only format test assertion messages when they are needed (they are a performance hit when testing large courses)
```
  Calen Pennington committed Sep 11, 2014
  b9908ec2 Browse Files
- Remove unneccesary uses of SON (which is slower than dict) · c0616aeb
  Calen Pennington committed Sep 11, 2014
  
  c0616aeb Browse Files
- Add an index on _id.revision to allow separating draft and published during export · a72cbfe6
  Calen Pennington committed Sep 11, 2014
  
  a72cbfe6 Browse Files
- Create indexes before running cross-modulestore import/export tests · ce88f616
  Calen Pennington committed Sep 11, 2014
  
  ce88f616 Browse Files
- Merge pull request #4963 from edx/talbs/platform-footer · 35d92f42
```
LMS: edX-centric  New Footer Style/Markup clean-up
```
  Brian Talbot committed Sep 11, 2014
  35d92f42 Browse Files
- Moved imports to startup.py. · fc895fe8
  Usman Khalid committed Sep 11, 2014
  
  fc895fe8 Browse Files
- Merge pull request #5168 from edx/flowerhack/third-party-stats · 3a0dea20
```
Flowerhack/third party stats
```
  Julia Hansbrough committed Sep 11, 2014
  3a0dea20 Browse Files
- LMS-11373 Fix Studio drag and drop race condition. · 2930e29a
  Nimisha Asthagiri committed Sep 11, 2014
  
  2930e29a Browse Files
- LMS-11371 Fix register bug - encoding of course_id. · 7637f063
  Nimisha Asthagiri committed Sep 11, 2014
  
  7637f063 Browse Files
- LMS-11331, LMS-11345 Make auth check branch agnostic; fix deserialize keys · 935d5dee
  Don Mitchell committed Sep 11, 2014
  
  935d5dee Browse Files
- LMS-11286 Paver Bokchoy support for Split; default store set to Split. · 3a772752
  Nimisha Asthagiri committed Sep 11, 2014
  
  3a772752 Browse Files
- LMS-11282 Paver Lettuce Acceptance support for Split; default store set to Draft. · 1d9c272a
  Calen Pennington committed Sep 11, 2014
  
  1d9c272a Browse Files
- LMS-11297 BokChoy and Acceptance tests configure default_store with update_module_store_settings. · 4d362765
  Nimisha Asthagiri committed Sep 11, 2014
  
  4d362765 Browse Files
- Merge pull request #5131 from cpennington/split/prod-import-export-tests · b033a214
```
Split-mongo block uniqueness constraint [LMS-11364]
```
  Calen Pennington committed Sep 11, 2014
  b033a214 Browse Files
- Merge branch 'release' · 4ebe2669
```
Conflicts:
	common/djangoapps/student/views.py
```
  Don Mitchell committed Sep 11, 2014
  4ebe2669 Browse Files