Commits · 47cd0f3e623fe713fdabc1620abef8d64304e8dc · edx / edx-platform

16 Sep, 2014 1 commit
- EX-81 / Ex-84 changes · 47cd0f3e
  asadiqbal08 committed Sep 16, 2014
  
  47cd0f3e Browse Files
15 Sep, 2014 1 commit

Merge pull request #5170 from… · 7225420f

Merge pull request #5170 from edx/muhhshoaib/Ex-79-BUG-if-no-coupon-code-defined-registration-codes-modal-dialog-box-does-not-appear

Ex-79 Bug Fixed. If there is no coupon code, 'Generate Registration Codes' modal dialog does not appear.

committed Sep 14, 2014

7225420f Browse Files

12 Sep, 2014 16 commits
- Merge pull request #5165 from lduarte1991/lduarte-harvardx-pr25 · 825dbddd
```
Annotation Tool: Fixed TinyMCE issue when changing units
```
  Sarina Canelake committed Sep 12, 2014
  825dbddd Browse Files
- Merge pull request #5172 from edx/jsa/tnl24 · 9fc4fbc1
```
test that group_id attribute is present and correct in LMS responses
```
  Jim Abramson committed Sep 12, 2014
  9fc4fbc1 Browse Files
- Merge pull request #5146 from lduarte1991/lduarte-harvardx-pr23 · abb2c6bc
```
Text Annotation Tool: Reply/Grouping Bug Fix
```
  Sarina Canelake committed Sep 12, 2014
  abb2c6bc Browse Files
- 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
- Ensure group info is present in LMS responses. · d3d4d330
```
TNL-24
```
  jsa committed Sep 12, 2014
  d3d4d330 Browse Files
- Add matplotlib to the sandbox requirements. · 45b2e503
```
Used by MITx/6.341x
```
  Feanil Patel committed Sep 12, 2014
  45b2e503 Browse Files
- [TNL-293] Annotation Tool: Fixed TinMCE issue when changing units · cf95dc0b
```
- fixed tinymce editors condition to check only positive numbers
```
  lduarte1991 committed Sep 12, 2014
  cf95dc0b 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
- Ex-79 Bug Fixed. If there is no coupon code, 'Generate Registration Codes'… · 4ecb8460
```
Ex-79 Bug Fixed. If there is no coupon code,  'Generate Registration Codes' modal dialog does not appear
```
  Muhammad Shoaib committed Sep 12, 2014
  4ecb8460 Browse Files
11 Sep, 2014 22 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