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

6528 Commits

Author SHA1 Message Date
David Baumgold
324a1da60c Merge pull request #5474 from edx/openedx-jira-reference 
Reformat seq_module.py
 2014-10-06 13:01:12 -04:00
David Baumgold
6f47e5d4e9 Reformat seq_module.py 2014-10-06 12:55:35 -04:00
Calen Pennington
139e10d9b8 Teach mongo_connection to retry read operations in the face of AutoReconnect errors 2014-10-03 10:55:59 -04:00
Don Mitchell
785a3c823d Merge pull request #5469 from edx/split/content_update 
Fix cached definition change detection
 2014-10-03 09:16:01 -04:00
Waheed Ahmed
3bfe09b821 Fixed incorrect relative time value in time.js. 
TNL-157
 2014-10-03 15:37:46 +05:00
Piotr Mitros
54731383be Merge pull request #4003 from edx/pmitros/fix-sequential-none 
Fix case where DB gets populated with string None
 2014-10-02 15:09:26 -04:00
Don Mitchell
d723425a83 Fix cached definition change detection 
LMS-11485
 2014-10-02 14:22:07 -04:00
Adam
ca13e9aa50 Merge pull request #5424 from edx/adam/change-discussion-blackout-wording 
update discussion blackout setting warning (TNL-442)
 2014-10-02 09:12:09 -04:00
Jesse Zoldak
d9b9630c56 Merge pull request #5265 from edx/zoldak/fix-test 
Increase randomness of course name in testcase
 2014-10-01 12:13:10 -04:00
Calen Pennington
8b789bb76b Merge pull request #5441 from cpennington/split/get-item-bulk-operation 
Wrap get_item inside bulk_operations internally, to cache query for active versions
 2014-10-01 10:25:39 -04:00
Anton Stupak
f221f010e9 Merge pull request #4930 from e-kolpakov/master 
Fix for TNL-147
 2014-10-01 14:52:34 +03:00
Waheed Ahmed
e2ce977756 Fixed multiple JsInput's in problem. 
TNL-269
 2014-10-01 14:21:25 +05:00
E. Kolpakov
dcc82e1abe Added default font to a list of available fonts in text editor XModule 
Added acceptance test scenario to test for existense of "Default" font and all tinyMCE built-in fonts
Updated AUTHORS
 2014-10-01 12:52:38 +04:00
Don Mitchell
3622d0d09f Merge pull request #5439 from edx/mixed_ms_coverage 
Test caching of courses in mixed maps
 2014-09-30 16:58:31 -04:00
Calen Pennington
37cfed61e9 Wrap get_item inside bulk_operations internally, to cache query for active versions 
[LMS-11402]
 2014-09-30 16:06:01 -04:00
Calen Pennington
87558c2c9c Merge pull request #5212 from cpennington/split/import-export-performance 
Improve performance of split-mongo import/export performance
 2014-09-30 15:44:04 -04:00
Don Mitchell
30155d33bd Test caching of courses in mixed maps 2014-09-30 15:01:20 -04:00
Calen Pennington
1a17b31a8b Make definitions and structures truly append-only 2014-09-29 22:35:42 -04:00
Calen Pennington
ef23c19bf4 Prevent queries into split using deprecated CourseLocators, BlockUsageLocators, or DefinitionLocators 2014-09-29 22:35:41 -04:00
Calen Pennington
1a682dacd1 Include caching definitions in split bulk operations 2014-09-29 22:35:41 -04:00
Calen Pennington
40c3253d81 Use more idiomatic python for deleting an attribute 2014-09-29 22:35:41 -04:00
Calen Pennington
57f9701ab2 Clean up exception definitions 2014-09-29 22:35:41 -04:00
Calen Pennington
4b0686836b Make modulestores properly propogate **kwargs 2014-09-29 22:35:41 -04:00
Calen Pennington
a14fbe4c6b Clean up coverage counting a little bit 2014-09-29 22:35:41 -04:00
Calen Pennington
f9c78e07a7 Turn the course envelope into an actual object that just stores an existing course_key 2014-09-29 22:35:40 -04:00
Calen Pennington
0aaf481782 Turn on bulk operations for xml export 2014-09-29 22:35:40 -04:00
Calen Pennington
52beec8878 Switch inheritance in split-mongo over to using InheritingFieldData. 2014-09-29 22:35:40 -04:00
Calen Pennington
687708c3d0 Use InheritanceMixin in more modulestore tests 2014-09-29 22:23:02 -04:00
Adam Palay
b0cbd2f612 update discussion blackout setting warning (TNL-442) 2014-09-29 13:59:18 -04:00
Calen Pennington
234c18053d Inherit from JSONField rather than Field for json-based fields 2014-09-29 11:56:40 -04:00
Calen Pennington
3f065a5fef Export xml from the destination store during cross-modulestore import/export tests 2014-09-29 11:56:40 -04:00
Calen Pennington
b57a5a6007 Make xml exports more comparable by sorting and indenting json 2014-09-29 11:56:38 -04:00
Don Mitchell
4ca5012f3c Use split to test views 2014-09-29 11:25:55 -04:00
Calen Pennington
8acef4c637 Allow Timedelta and RelativeTime fields to handle from_json being passed timedelta objects 2014-09-29 10:32:15 -04:00
Calen Pennington
ab75ef9963 Teach mongo_connection to retry read operations in the face of AutoReconnect errors 2014-09-29 10:32:15 -04:00
Calen Pennington
7c1438034b Fix BulkAssertionMixin so that it actually asserts the truth/falsity of the contained assertions 2014-09-29 10:32:15 -04:00
Calen Pennington
d43d5d7d4e Merge pull request #5396 from cpennington/split/specialize-regex-for-case-insensitive 
Wrap get_item in bulk_operations to limit the number of queries for course structure.
 2014-09-29 09:59:26 -04:00
Calen Pennington
fe28d3873f Only execute regex queries for case-insitive lookup in split. 
[LMS-11402]
 2014-09-29 09:57:58 -04:00
Andy Armstrong
0ed3a95d3a Merge branch 'release' 
Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py
 2014-09-25 16:25:45 -04:00
John Eskew
fcf57a8e0d Merge pull request #5370 from edx/jeskew/wrap_studio_views_in_bulk_ops 
Wrap studio views in bulk operations to minimize mongo calls.
 2014-09-24 20:41:33 -04:00
John Eskew
2f06073306 Pass _get_course_module() depth param down into modulestore get_course() instead of hard-coded zero. 2014-09-24 16:23:30 -04:00
Jesse Zoldak
6a7c318d22 Increase randomness of course name in testcase 2014-09-24 15:14:11 -04:00
Sarina Canelake
3cdfdae8bb Merge pull request #5305 from lduarte1991/lduarte-harvardx-pr28 
Fixes check for Image Annotation Tool to include ID from image server and fix scrolling bug
 2014-09-24 13:10:50 -04:00
Paul Medlock-Walton
b797c6bd09 username and email request for lti module 
allow username and email can be passed to a lti third party app
ask user permission when lti button is clicked
allow course editor to customize text on lti launch button
 2014-09-24 20:05:42 +03:00
zubair-arbi
c7418a306c Merge pull request #5240 from edx/zub/bugfix/tnl-324-downloadvideoexportimport 
Don't set 'download_video' field on importing video from xml until expli...
 2014-09-24 18:12:10 +05:00
Waheed Ahmed
ca1da6c8ed Fixed transcript not follow with video on seek. 
TNL-235
 2014-09-24 13:08:50 +05:00
Andy Armstrong
fe6668a550 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt
 2014-09-23 15:53:10 -04:00
Usman Khalid
44f952daf5 Merge pull request #5293 from edx/usman/tnl388-invalid-xml-in-code-response 
If matlab grader sent unparsable response, show error message.
 2014-09-24 00:14:34 +05:00
Adam
96ac506f6f Merge pull request #5296 from edx/adam/hide-very-long-answers 
keep large answers from appearing (TNL-441)
 2014-09-23 14:01:03 -04:00
lduarte1991
b7313d6d2e Annotation Tools: Pylint Fix left over from previous PR 2014-09-23 13:03:48 -04:00