Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,728 Commits 1 Branch 0 Tags
043c08bf5bfce6285ae2e6f78ee78d660abcd836
Commit Graph

25728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
043c08bf5b Updating active_versions should not send old and new 
but just use old to get query info.
LMS-11396
 2014-09-15 16:02:53 -04:00
Don Mitchell
040b1c3da5 Merge pull request #5197 from edx/reruns/count_queries 
Explain query counts
 2014-09-15 15:57:11 -04:00
Don Mitchell
6568463513 Merge pull request #5223 from edx/bug/lms-11361 
Bug/lms 11361
 2014-09-15 15:25:26 -04:00
Sarina Canelake
1e1fc127e2 Merge pull request #5214 from edx/sarina/update-i18n-tooling 
Sarina/update i18n tooling
 2014-09-15 14:39:15 -04:00
Sarina Canelake
95a9ca131a Merge pull request #5148 from lduarte1991/lduarte-harvardx-pr24 
Annotation Tools: Give staff/instructors full permissions (bug fix)
 2014-09-15 14:25:19 -04:00
Don Mitchell
bf0c4f5185 Don't let destructive loc change 
leak out to callers.
Also, use the return from update_item rather than assume
it was just side effecting.
LMS-11361
 2014-09-15 13:47:07 -04:00
Sarina Canelake
363ef77e5d LTR i18n tooling 2014-09-15 13:46:06 -04:00
Sarina Canelake
49d069dd9e RTL i18n tooling 2014-09-15 13:46:06 -04:00
Jesse Zoldak
fcae6b5763 Merge pull request #5219 from edx/zoldak/disable-annotation-test 
Disable intermittently failing annotation acceptance test TNL-353
 2014-09-15 13:23:34 -04:00
Jesse Zoldak
b7ad5c5382 Merge pull request #5218 from edx/zoldak/disable-test-video-controls 
skip intermittently failing test TNL-392
 2014-09-15 13:07:31 -04:00
Jesse Zoldak
76517de87d Disable intermittently failing annotation acceptance test TNL-353 2014-09-15 12:23:47 -04:00
Jesse Zoldak
a1eb44d9c6 skip intermittently failing test TNL-392 2014-09-15 12:13:06 -04:00
Piotr Mitros
78ed5c2c54 Merge pull request #5194 from edx/pmitros/pyfs-convention-cleanup 
Clean up conventions for underscores vs. dashes in config setting.
 2014-09-15 12:08:20 -04:00
Don Mitchell
4c3b4a59b4 Merge pull request #5208 from edx/split/misc_fixups 
Split/misc fixups
 2014-09-15 11:18:25 -04:00
Sarina Canelake
a08ca41579 Merge pull request #5210 from edx/sarina/09152014-translation-update 
Update translations (autogenerated message)
 2014-09-15 10:15:31 -04:00
Renzo Lucioni
1fbccdaa20 Merge pull request #5183 from edx/renzo/new-audit-track-selection 
Prepare track selection page for new audit track
 2014-09-15 10:09:26 -04:00
Sarina Canelake
ba500b5e70 Update translations (autogenerated message) 2014-09-15 10:02:39 -04:00
Waqas Khalid
81e297a677 Merge pull request #5032 from mlkwaqas/waqas/tnl148-reset-newpost-form-on-cancel 
Forums new post form should reset state when user cancels
 2014-09-15 18:53:56 +05:00
Renzo Lucioni
f896d64ac0 Merge pull request #5195 from edx/renzo/remove-waffle 
Remove Django Waffle
 2014-09-15 09:43:22 -04:00
chrisndodge
0bb4ddef32 Merge pull request #5209 from edx/cdodge/allow-to-pass-override-cancel-URL 
pass along an extra parameter to CyberSource to sepcify a callback URL i...
 2014-09-15 09:34:29 -04:00
Don Mitchell
ad57cbe932 Get rid of obsolete field checking 2014-09-15 09:22:49 -04:00
Don Mitchell
f04e75db90 Get rid of unused fragment 2014-09-15 09:01:34 -04:00
Don Mitchell
b137f8d7ad Explain query counts 
Fix trivial excesses (2 splits configured & don't fetch courses if there are none)
LMS-11220, LMS-11391, LMS-11390
 2014-09-15 08:50:10 -04:00
Waqas Khalid
6dec04ba0f Cancel the new post resets the state of form 
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
 2014-09-15 16:10:52 +05:00
Waheed Ahmed
e18e18a855 Merge pull request #5055 from edx/waheed/bld1221-fix-video-not-play-in-firefox-on-speed-change 
Fixed video not playing after changing speed to anything other than 1.
 2014-09-15 15:06:56 +05:00
Waheed Ahmed
d147c7e51f Merge pull request #4749 from edx/waheed/lms11194-xblock-allow-html-and-script-in-dusplay-name 
Html escaped from display name in xblock.
 2014-09-15 14:52:41 +05:00
Waheed Ahmed
0448c9942d Fixed video not playing after changing speed to anything other than 1. 
BLD-1221
 2014-09-15 14:30:37 +05:00
Waheed Ahmed
f336d0490c Html escaped from display name in xblock. 
LMS-11194
 2014-09-15 13:33:48 +05:00
chrisndodge
7225420fa0 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.
 2014-09-14 21:29:27 -04:00
lduarte1991
a1541b61f2 [TNL-288] Annotation Tools: Give staff/instructors full permissions 
- changed role to 'in' condition

 - fixed comment about get_real_user

 - Adding Tests and Fixing Pep8 Violations
 2014-09-13 13:42:06 -04:00
Sarina Canelake
825dbddd95 Merge pull request #5165 from lduarte1991/lduarte-harvardx-pr25 
Annotation Tool: Fixed TinyMCE issue when changing units
 2014-09-12 16:40:02 -04:00
Renzo Lucioni
9239253614 Remove Django Waffle 2014-09-12 16:22:03 -04:00
Jim Abramson
9fc4fbc12a Merge pull request #5172 from edx/jsa/tnl24 
test that group_id attribute is present and correct in LMS responses
 2014-09-12 15:58:50 -04:00
Sarina Canelake
abb2c6bc56 Merge pull request #5146 from lduarte1991/lduarte-harvardx-pr23 
Text Annotation Tool: Reply/Grouping Bug Fix
 2014-09-12 15:48:06 -04:00
Renzo Lucioni
698c9b5914 Merge pull request #5184 from edx/renzo/upsell-tracking 
Add tracking on expand of upsell message
 2014-09-12 14:21:32 -04:00
Feanil Patel
8b92bd159b Merge pull request #5198 from edx/feanil/sandbox_matplotlib 
Add matplotlib to the sandbox requirements.
 2014-09-12 14:16:50 -04:00
Renzo Lucioni
cc6e63dd22 Prepare track selection page for new audit track 2014-09-12 13:58:13 -04:00
jsa
d3d4d33064 Ensure group info is present in LMS responses. 
TNL-24
 2014-09-12 13:47:05 -04:00
Feanil Patel
45b2e5033e Add matplotlib to the sandbox requirements. 
Used by MITx/6.341x
 2014-09-12 13:26:01 -04:00
lduarte1991
cf95dc0b75 [TNL-293] Annotation Tool: Fixed TinMCE issue when changing units 
- fixed tinymce editors condition to check only positive numbers
 2014-09-12 13:12:56 -04:00
Don Mitchell
218611c878 Merge pull request #5196 from edx/release 
hotfix-2014-09-12
 2014-09-12 12:32:40 -04:00
Renzo Lucioni
22f58be4aa Add tracking on expand of upsell message 2014-09-12 11:58:24 -04:00
Piotr Mitros
af12acc904 Clean up conventions for underscores vs. dashes in config setting. 2014-09-12 11:52:11 -04:00
Andy Armstrong
068a01a48c Merge pull request #5192 from edx/andy/ora-hotfix 
Update platform to use the latest ORA release
 2014-09-12 11:06:15 -04:00
Andy Armstrong
04595a7b3d Update platform to use the latest ORA release 2014-09-12 10:32:29 -04:00
Anton Stupak
535e6e4f57 Merge pull request #4983 from lduarte1991/lduarte-harvardx-pr20 
Annotation Tools: Turn off Private/Public option and add missing css group to MyNotes
 2014-09-12 16:24:44 +03:00
Waheed Ahmed
51b680af59 Merge pull request #5022 from edx/waheed/lms11141-fix-invalid-key-error-in-course-handler 
Fixed InvalidKeyError in course handler in studio.
 2014-09-12 17:42:05 +05:00
Waheed Ahmed
a1e911ae39 Fixed InvalidKeyError in course handler in studio. 
LMS-11141
 2014-09-12 15:16:36 +05:00
Muhammad Shoaib
4ecb846052 Ex-79 Bug Fixed. If there is no coupon code, 'Generate Registration Codes' modal dialog does not appear 2014-09-12 12:39:16 +05:00
srpearce
9ca4c566c7 Merge pull request #5044 from edx/sylvia/docs/DOC-875 
Add note about angle brackets to Dropdown topic
 2014-09-11 17:10:12 -04:00