Commits · 6568463513fdbb536f58a5c5c5a759ad548742de · edx / edx-platform · GitLab

15 Sep, 2014 26 commits
- Merge pull request #5223 from edx/bug/lms-11361 · 65684635
```
Bug/lms 11361
```
  Don Mitchell committed Sep 15, 2014
  65684635 Browse Files
- Merge pull request #5214 from edx/sarina/update-i18n-tooling · 1e1fc127
```
Sarina/update i18n tooling
```
  Sarina Canelake committed Sep 15, 2014
  1e1fc127 Browse Files
- Merge pull request #5148 from lduarte1991/lduarte-harvardx-pr24 · 95a9ca13
```
Annotation Tools: Give staff/instructors full permissions (bug fix)
```
  Sarina Canelake committed Sep 15, 2014
  95a9ca13 Browse Files
- Don't let destructive loc change · bf0c4f51
```
leak out to callers.
Also, use the return from update_item rather than assume
it was just side effecting.
LMS-11361
```
  Don Mitchell committed Sep 15, 2014
  bf0c4f51 Browse Files
- LTR i18n tooling · 363ef77e
  Sarina Canelake committed Sep 15, 2014
  
  363ef77e Browse Files
- RTL i18n tooling · 49d069dd
  Sarina Canelake committed Sep 15, 2014
  
  49d069dd Browse Files
- Merge pull request #5219 from edx/zoldak/disable-annotation-test · fcae6b57
```
Disable intermittently failing annotation acceptance test TNL-353
```
  Jesse Zoldak committed Sep 15, 2014
  fcae6b57 Browse Files
- Merge pull request #5218 from edx/zoldak/disable-test-video-controls · b7ad5c53
```
skip intermittently failing test TNL-392
```
  Jesse Zoldak committed Sep 15, 2014
  b7ad5c53 Browse Files
- Disable intermittently failing annotation acceptance test TNL-353 · 76517de8
  Jesse Zoldak committed Sep 15, 2014
  
  76517de8 Browse Files
- skip intermittently failing test TNL-392 · a1eb44d9
  Jesse Zoldak committed Sep 15, 2014
  
  a1eb44d9 Browse Files
- Merge pull request #5194 from edx/pmitros/pyfs-convention-cleanup · 78ed5c2c
```
Clean up conventions for underscores vs. dashes in config setting.
```
  Piotr Mitros committed Sep 15, 2014
  78ed5c2c Browse Files
- Merge pull request #5208 from edx/split/misc_fixups · 4c3b4a59
```
Split/misc fixups
```
  Don Mitchell committed Sep 15, 2014
  4c3b4a59 Browse Files
- Merge pull request #5210 from edx/sarina/09152014-translation-update · a08ca415
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Sep 15, 2014
  a08ca415 Browse Files
- Merge pull request #5183 from edx/renzo/new-audit-track-selection · 1fbccdaa
```
Prepare track selection page for new audit track
```
  Renzo Lucioni committed Sep 15, 2014
  1fbccdaa Browse Files
- Update translations (autogenerated message) · ba500b5e
  Sarina Canelake committed Sep 15, 2014
  
  ba500b5e Browse Files
- Merge pull request #5032 from mlkwaqas/waqas/tnl148-reset-newpost-form-on-cancel · 81e297a6
```
Forums new post form should reset state when user cancels
```
  Waqas Khalid committed Sep 15, 2014
  81e297a6 Browse Files
- Merge pull request #5195 from edx/renzo/remove-waffle · f896d64a
```
Remove Django Waffle
```
  Renzo Lucioni committed Sep 15, 2014
  f896d64a Browse Files
- Merge pull request #5209 from edx/cdodge/allow-to-pass-override-cancel-URL · 0bb4ddef
```
pass along an extra parameter to CyberSource to sepcify a callback URL i...
```
  chrisndodge committed Sep 15, 2014
  0bb4ddef Browse Files
- Get rid of obsolete field checking · ad57cbe9
  Don Mitchell committed Sep 15, 2014
  
  ad57cbe9 Browse Files
- Get rid of unused fragment · f04e75db
  Don Mitchell committed Sep 15, 2014
  
  f04e75db Browse Files
- Cancel the new post resets the state of form · 6dec04ba
```
When user is creating new post and then cancel it
the data remains in the form which appears when we
click on new post again. The state of form should
be reset.

TNL-148
```
  Waqas Khalid committed Sep 15, 2014
  6dec04ba Browse Files
- Merge pull request #5055 from edx/waheed/bld1221-fix-video-not-play-in-firefox-on-speed-change · e18e18a8
```
Fixed video not playing after changing speed to anything other than 1.
```
  Waheed Ahmed committed Sep 15, 2014
  e18e18a8 Browse Files
- Merge pull request #4749 from edx/waheed/lms11194-xblock-allow-html-and-script-in-dusplay-name · d147c7e5
```
Html escaped from display name in xblock.
```
  Waheed Ahmed committed Sep 15, 2014
  d147c7e5 Browse Files
- Fixed video not playing after changing speed to anything other than 1. · 0448c994
```
BLD-1221
```
  Waheed Ahmed committed Sep 15, 2014
  0448c994 Browse Files
- Html escaped from display name in xblock. · f336d049
```
LMS-11194
```
  Waheed Ahmed committed Sep 15, 2014
  f336d049 Browse Files
- 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.
```
  chrisndodge committed Sep 14, 2014
  7225420f Browse Files
13 Sep, 2014 1 commit
- [TNL-288] Annotation Tools: Give staff/instructors full permissions · a1541b61
```
 - changed role to 'in' condition

 - fixed comment about get_real_user

 - Adding Tests and Fixing Pep8 Violations
```
  lduarte1991 committed Sep 13, 2014
  a1541b61 Browse Files
12 Sep, 2014 13 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
- Remove Django Waffle · 92392536
  Renzo Lucioni committed Sep 12, 2014
  
  92392536 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
- Prepare track selection page for new audit track · cc6e63dd
  Renzo Lucioni committed Sep 12, 2014
  
  cc6e63dd 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
- Clean up conventions for underscores vs. dashes in config setting. · af12acc9
  Piotr Mitros committed Sep 12, 2014
  
  af12acc9 Browse Files