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

6414 Commits

Author SHA1 Message Date
Adam
58e6dcf79c Merge pull request #5107 from edx/adam/resolve-merge-conflicts 
Adam/resolve merge conflicts
 2014-09-05 14:55:24 -04:00
Nimisha Asthagiri
3f8ea64d33 Merge pull request #5083 from edx/split/revert-to-published 
LMS-11357 Split revert_to_publish: correctly revert to Published version
 2014-09-05 14:38:45 -04:00
Nimisha Asthagiri
69ce5ac849 Merge pull request #5110 from edx/split/pylint-fixes 
Pylint issues in test_mixed_modulestore.py.
 2014-09-05 14:33:36 -04:00
Nimisha Asthagiri
0bd9bc628c Update mongo count. 2014-09-05 14:13:00 -04:00
Brian Talbot
a6f2dd67e4 Merge pull request #5105 from edx/talbs/os-ggg-a11y 
LMS: Accessibility Tweaks
 2014-09-05 13:57:57 -04:00
Nimisha Asthagiri
2fa445c413 LMS-11357 Split revert_to_publish: correctly revert to Published version 2014-09-05 13:54:24 -04:00
Nimisha Asthagiri
c0ee194042 Pylint issues in test_mixed_modulestore.py. 2014-09-05 13:46:38 -04:00
Adam Palay
cfeb76e67f Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
 2014-09-05 13:20:15 -04:00
Nimisha Asthagiri
952eb215f0 Merge pull request #5078 from edx/split/has-changes-subtree 
LMS-11354 Make Split has_changes check subtree.
 2014-09-05 13:03:28 -04:00
Nimisha Asthagiri
db0f9dfc83 LMS-11354 Make Split has_changes check subtree. 2014-09-05 12:20:32 -04:00
Nimisha Asthagiri
041d72ccc6 Update mongo counts. 2014-09-04 18:14:13 -04:00
Giulio Gratta
e0b7e8cfbb increase contrast of submission_feedback text 2014-09-04 17:45:47 -04:00
Don Mitchell
b28af4fdaa Temporarily disable bulk operations b/c old mongo 
does too much work on exit and doesn't handle nesting
 2014-09-04 17:28:17 -04:00
Sarina Canelake
ae697de728 Add i18n extraction test 2014-09-04 17:03:53 -04:00
Nimisha Asthagiri
272dd2aa52 Merge pull request #5071 from edx/split/re-import-issue 
LMS-11342 Fix Split reimport issue.
 2014-09-04 10:58:12 -04:00
Alexander Kryklia
62afe9c3a5 Fix description for LTI passports field. 2014-09-04 16:17:27 +03:00
Waheed Ahmed
4993e22384 Minor styling tweaks. 
LMS-11302
 2014-09-04 14:10:37 +05:00
Nimisha Asthagiri
b6590228a3 LMS-11342 Fix Split reimport issue. 2014-09-03 23:03:00 -04:00
Calen Pennington
48bdeeeae8 Merge pull request #5052 from edx/split/bulk-rerun-LMS-11332 
Enable bulk operations on split
 2014-09-03 11:18:23 -04:00
Dave St.Germain
6261d9c828 Merge pull request #5014 from edx/dcs/BLD-1189 
Removed spacebar event handler, because it did more harm than good.
 2014-09-03 11:14:15 -04:00
Calen Pennington
f70e702503 Add specific bulk-operation test for LMS-11332, and a fix 2014-09-03 09:50:41 -04:00
Don Mitchell
96bc5cc83a Merge pull request #5001 from edx/split/edit_info 
Split/edit info
 2014-09-03 08:28:31 -04:00
Don Mitchell
a65771df93 Implement edit info as mixin on base mongo 
LMS-11183, LMS-11184
 2014-09-02 17:15:08 -04:00
Calen Pennington
1e2d5ffe03 Merge pull request #5031 from edx/andya/merge-hotfix-2014-08-29 
Merge hotfix-2014-08-29 to master
 2014-09-02 15:32:05 -04:00
Don Mitchell
85fa712fdf Change published_date to published_on 
to make consistent with other edit info timestamps
LMS-11184
 2014-09-02 13:20:23 -04:00
Calen Pennington
fb56588090 Tweak mongo count numbers 2014-09-02 10:29:23 -04:00
Don Mitchell
4878f6e83c Implement edit info as mixin for split 
LMS-11183, LMS-11184
 2014-09-02 10:10:57 -04:00
Don Mitchell
7b52d45aa6 Move edit info into xblock and runtime mixins 
LMS-11183, LMS-11184
 2014-09-02 10:08:39 -04:00
htareque
3f159ea52b username and email request for lti module 
added username and email functionality, so that username and email can be passed to the lti third party app

rev2: added customizable text box

rev3: added revisions from auraz
 2014-09-02 08:12:36 -04:00
Andy Armstrong
7b26e85478 Merge branch 'release' into andya/merge-hotfix-2014-08-29 
Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py
 2014-08-29 16:50:10 -04:00
Don Mitchell
1db107c2ce Add memoization for has_changes 2014-08-29 14:09:41 -04:00
Calen Pennington
3afc125ecb Add test to verify bad query behavior of xblock_handler 2014-08-29 14:09:41 -04:00
Calen Pennington
8dc7f34295 Improve debuggability when call-count numbers don't match up 2014-08-29 14:09:35 -04:00
zubair-arbi
89e03d5225 update get_parent_location method to select non-orphan parents from multiple parents 
STUD-2007
 2014-08-29 14:52:46 +05:00
Dave St.Germain
978ed1064c Removed spacebar event handler, because it did more harm than good. 2014-08-28 15:11:47 -04:00
Dave St.Germain
7d6c466c52 Merge pull request #4612 from edx/dcs/matlab-api-tweak 
A better check for the existence of matlabinput element.
 2014-08-28 12:07:12 -04:00
Calen Pennington
0e7e266a5b Push bulk_write_operations up into ModuleStoreRead, and rename to remove reference to writes 2014-08-27 16:29:48 -04:00
Calen Pennington
a205788c4d Work around for split not having a coherent way to work with/track updated versions of structures 2014-08-27 16:29:48 -04:00
Don Mitchell
e624ff3b04 Make path_to_location use bulk_write_operation for performance. 2014-08-27 16:29:47 -04:00
Calen Pennington
e00a8afc6b Remove qualifiers from get_courses 2014-08-27 16:29:47 -04:00
Calen Pennington
3672c9a292 Make find_matching_* work during split bulk operations 2014-08-27 16:29:47 -04:00
Calen Pennington
e7ce41061e Improve debuggability when call-count numbers don't match up 2014-08-27 16:29:47 -04:00
Calen Pennington
337b0b48aa Improve check_number_of_calls family of methods 2014-08-27 16:29:47 -04:00
Calen Pennington
db2abf4068 Make it so that versioning a structure that was read from the database works correctly 2014-08-27 16:29:46 -04:00
Calen Pennington
c292f3c609 Add tests to show that reading a structure before versioning it breaks versioning 2014-08-27 16:29:46 -04:00
Calen Pennington
4f4ef959e7 Extensive testing of bulk operations 2014-08-27 16:29:46 -04:00
Calen Pennington
562f0e3197 Add bulk operations to split modulestore 2014-08-27 16:29:46 -04:00
Calen Pennington
f731d5feda Clarify thread-safety of bulk_write context manager 2014-08-27 16:00:52 -04:00
Calen Pennington
d2ffca2cf7 Remove unneccesary checks for method existence 2014-08-27 16:00:52 -04:00
Nimisha Asthagiri
af9c9cd573 LMS-11185 Split implementation of revert_to_published 2014-08-27 15:41:14 -04:00