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

25696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Sylvia Pearce
96c0babe44 Add note about angle brackets to Dropdown topic 2014-09-11 17:04:30 -04:00
srpearce
a0964f7141 Merge pull request #5182 from edx/sylvia/docs/minorfixes 
Minor updates to three problem types
 2014-09-11 16:50:42 -04:00
Sylvia Pearce
a41e6c4e46 remove note from Annotations 2014-09-11 16:48:25 -04:00
Sarina Canelake
13c8dd27b9 Update i18n_translators_guide.rst 2014-09-11 16:19:03 -04:00
Sylvia Pearce
3575755d4d Minor updates to three problem types 2014-09-11 15:39:15 -04:00
Adam
d9567c3537 Merge pull request #5178 from edx/release 
Release
 2014-09-11 15:15:13 -04:00
Andy Armstrong
82675b2baa Merge pull request #5176 from edx/andya/lms-ux-reference-templates 
Add support for UX reference templates in LMS
 2014-09-11 14:32:25 -04:00
Christina Roberts
610710cff8 Merge pull request #5133 from edx/christina/cohorts-api 
Create auto cohorts when list_cohorts is called.
 2014-09-11 14:30:45 -04:00
Andy Armstrong
7683cba2c3 Add support for UX reference templates in LMS 2014-09-11 13:52:48 -04:00
cahrens
020094b8fb Create auto cohorts when list_cohorts is called and return number of users per cohort. 
TNL-186
 2014-09-11 13:51:34 -04:00
Adam
abf5f176bb Merge pull request #5177 from edx/usman/fix-xml-imports 
Moved imports to startup.py.
 2014-09-11 13:29:10 -04:00
lduarte1991
3204016487 Annotation Tools: Clean-up 2014-09-11 12:38:48 -04:00
Nimisha Asthagiri
dedd88ccf4 Merge pull request #4977 from edx/split/paver 
Split/paver LMS-11211
 2014-09-11 12:28:41 -04:00
Calen Pennington
3ec3bbbe99 Merge pull request #5162 from cpennington/split/import-export-performance 
Performance improvements to split mongo and old-mongo, based on import/export tests.
 2014-09-11 11:54:22 -04:00
Calen Pennington
b9908ec2f1 Only format test assertion messages when they are needed (they are a performance hit when testing large courses) 2014-09-11 11:52:10 -04:00
Calen Pennington
c0616aeb2c Remove unneccesary uses of SON (which is slower than dict) 2014-09-11 11:52:09 -04:00
Calen Pennington
a72cbfe68a Add an index on _id.revision to allow separating draft and published during export 2014-09-11 11:52:09 -04:00
Calen Pennington
ce88f61670 Create indexes before running cross-modulestore import/export tests 2014-09-11 11:52:06 -04:00
Brian Talbot
35d92f42c8 Merge pull request #4963 from edx/talbs/platform-footer 
LMS: edX-centric  New Footer Style/Markup clean-up
 2014-09-11 11:23:48 -04:00
Usman Khalid
fc895fe8bf Moved imports to startup.py. 2014-09-11 20:14:37 +05:00
Julia Hansbrough
3a0dea20e1 Merge pull request #5168 from edx/flowerhack/third-party-stats 
Flowerhack/third party stats
 2014-09-11 11:04:38 -04:00
Nimisha Asthagiri
2930e29a01 LMS-11373 Fix Studio drag and drop race condition. 2014-09-11 10:53:05 -04:00
Nimisha Asthagiri
7637f063e9 LMS-11371 Fix register bug - encoding of course_id. 2014-09-11 10:53:05 -04:00
Don Mitchell
935d5dee34 LMS-11331, LMS-11345 Make auth check branch agnostic; fix deserialize keys 2014-09-11 10:53:05 -04:00
Nimisha Asthagiri
3a772752de LMS-11286 Paver Bokchoy support for Split; default store set to Split. 2014-09-11 10:48:09 -04:00
Calen Pennington
1d9c272a2e LMS-11282 Paver Lettuce Acceptance support for Split; default store set to Draft. 2014-09-11 10:48:08 -04:00
Nimisha Asthagiri
4d36276573 LMS-11297 BokChoy and Acceptance tests configure default_store with update_module_store_settings. 2014-09-11 10:48:08 -04:00
Calen Pennington
b033a214cf Merge pull request #5131 from cpennington/split/prod-import-export-tests 
Split-mongo block uniqueness constraint [LMS-11364]
 2014-09-11 10:43:43 -04:00
Don Mitchell
4ebe26696e Merge branch 'release' 
Conflicts:
	common/djangoapps/student/views.py
 2014-09-11 10:31:53 -04:00
Waheed Ahmed
02a2851019 Merge pull request #4329 from edx/waheed/lms6492-fix-404-when-users-last-visted-subsection-unpublished 
Fixed 404 on courseware when users last visited subsection becomes unpublished.
 2014-09-11 19:24:16 +05:00
Will Daly
f6bcf84edb Merge pull request #5167 from edx/will/third-party-acceptance 
Enable third party auth in LMS acceptance tests
 2014-09-11 09:55:08 -04:00