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

6230 Commits

Author SHA1 Message Date
Martin Segado
bbeb79cbe7 Add correct_or_past_due option for showanswer and update relevant documentation 2014-07-24 02:44:03 -04:00
Diana Huang
167e2b675b Split branch settings code review fixes LMS-11056 2014-07-23 21:59:33 -04:00
Nimisha Asthagiri
1dc6ea39f3 Split branch settings LMS-11056 2014-07-23 20:36:15 -04:00
Nimisha Asthagiri
3eecc9639a Make overriding branch settings thread-safe LMS-11125 2014-07-23 17:41:08 -04:00
Christina Roberts
aab561b269 Merge pull request #4491 from edx/christina/export-split 
Getting draft split_test_module instances to import/export.
 2014-07-23 12:20:57 -04:00
cahrens
77702fae09 Getting draft split_test_module instances to import/export. 
STUD-327
 2014-07-23 11:27:23 -04:00
Sarina Canelake
91196573e6 Fix small i18n typos 2014-07-22 09:38:32 -04:00
Sarina Canelake
d0449cdff2 get_courses_for_wiki return course_keys across all modulestores [LMS-2914] 2014-07-21 17:17:48 -04:00
Don Mitchell
6074e0b117 Split get_courses_for_wiki implementation [LMS-2914] 
- Move Mongo tests to mixed ddt tests
- Check if `fields` is None before updating search targets
- Fix for double course version
 2014-07-21 17:17:48 -04:00
John Jarvis
7023eb4c19 resolving merge conflicts 2014-07-21 13:42:06 -04:00
Nimisha Asthagiri
a03134b371 Merge remote-tracking branch 'origin/release' into rc/2014-07-16 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
 2014-07-21 10:35:55 -04:00
Nimisha Asthagiri
c139c2a516 Merge pull request #4493 from edx/studio/bulk-edit-dont-update-ancestors 
Don't update ancestors while bulk editing.
 2014-07-21 08:12:24 -04:00
zubair-arbi
cfa873cc1d ignore MAC meta files on import and also remove any such files from the course 
STUD-1725
 2014-07-21 13:16:00 +05:00
Nimisha Asthagiri
80f078cf61 Don't update ancestors while bulk editing. 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
 2014-07-20 23:38:33 -04:00
Calen Pennington
483e2a6a5d split create_item and create_child out as separate methods 2014-07-18 21:11:37 -04:00
Mathew Peterson
06ef306f7f more split_draft methods 2014-07-17 22:48:11 -04:00
Nimisha Asthagiri
7efd0cb49e converge Split APIs with Mixed and Draft 2014-07-17 22:48:11 -04:00
Nimisha Asthagiri
a501aa9400 don't update ancestors while bulk editing. 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
 2014-07-17 21:58:11 -04:00
Nimisha Asthagiri
682c9fffd1 fix bulk_write context manager. 2014-07-17 21:57:43 -04:00
Don Mitchell
801dcd07a2 Merge pull request #4462 from edx/bug/delete_draft 
Piecemeal conversion to draft needs to allow
 2014-07-17 15:45:54 -04:00
Don Mitchell
1103d057d7 Piecemeal conversion to draft needs to allow 
already converted children.
STUD-1965
 2014-07-17 13:54:54 -04:00
Jason Bau
be80e0058e Merge pull request #4464 from edx/jbau/remove-branch-setting-cache 
removing thread-local cache for branch_setting
 2014-07-17 13:03:08 -04:00
Jason Bau
f12fa05ae1 removing thread-local cache for branch_setting 2014-07-17 11:05:47 -04:00
Calen Pennington
1607b7fc0d Merge pull request #4445 from cpennington/cross-store-xml-import-export 
Add tests for xml import/export between different modulestores
 2014-07-17 10:55:55 -04:00
Calen Pennington
d354571e95 Use field scopes to compute which metadata to strip from the definition during XML import of XMLModule subclasses 2014-07-17 10:35:37 -04:00
Calen Pennington
9a4e1f5cd1 Only compute block types with children once 2014-07-17 10:35:37 -04:00
Calen Pennington
3c7aa18d25 Don't use raw asserts in split (to handle different types of UsageKeys sanely) 2014-07-17 10:35:37 -04:00
Calen Pennington
1bc0b323b1 Explicitly create the AssetKey for all assets coming out of a ContentStore 2014-07-17 10:35:36 -04:00
Calen Pennington
4e67c2a9b3 Add the manual testing course for testing xml import/export across modulestores 2014-07-17 10:35:36 -04:00
Calen Pennington
8e0189bcf7 Skip DraftVersioningModuleStore tests 2014-07-17 10:35:35 -04:00
Calen Pennington
7a55f1207d Add tests of cross-modulestore import/export 
[LMS-2945]
 2014-07-17 10:35:04 -04:00
louyihua
db39e6a311 Make TinyMCE editor translatable 
Combine TinyMCE's built-in translation scheme with the django's translation framework.
So edX's translators can also make translations for TinyMCE used in edX.
 2014-07-17 02:37:01 +08:00
Calen Pennington
ae3942baa2 Remove warning filter from library code (should be set by applications/tests directly) 2014-07-16 11:14:24 -04:00
Don Mitchell
a9695828ab Remove LocMapperStore 
LMS-2918
 2014-07-16 09:21:25 -04:00
Don Mitchell
713c2a4474 Handle bad children pointers during publish 
rather than aborting the publish, ignore them.
    Needed for import
 2014-07-15 21:21:39 -04:00
Jason Bau
fb39111af3 Merge pull request #4417 from edx/jbau/event-responsetype 
Change answer <-> response matching in capa.get_submission_metadata
 2014-07-15 16:51:42 -04:00
Sarina Canelake
666f563ee6 Merge pull request #4418 from Stanford-Online/dcadams/make_registration_button_conditional 
Make text on register button on About page conditional.
 2014-07-15 16:37:00 -04:00
David Adams
aa1b623904 Make text on register button on About page conditional. 
Added a new advanced setting; invitation_only

 If invitation_only display "Enrollment in this course is by invitation only"
 Otherwise, if outside of enrollment period display "Enrollment is Closed"

 This issue is logged at LMS-2670

 Also fixed in this PR is issue LMS-2717; even though the Register button was greyed out,
 clicking it sent one to the registration page.
 2014-07-15 12:51:12 -07:00
Nimisha Asthagiri
851fe47a95 Merge pull request #4370 from edx/nimisha/split-drop-database-2952 
Implement close_connections and drop_database on modulestores.
 2014-07-14 18:17:48 -04:00
Jason Bau
faff8c577e Change answer <-> response matching in capa.get_submission_metadata 2014-07-14 17:09:06 -04:00
Nimisha Asthagiri
d7cf8b7fa0 Implement close_connections and drop_database on modulestores. 2014-07-14 16:01:10 -04:00
cahrens
66173ab9e6 Add "visible_to_staff_only" field to support staff locking in Studio. 
STUD-1875
 2014-07-14 14:46:40 -04:00
Nimisha Asthagiri
bc03fb0881 Merge pull request #4380 from edx/nimisha/mongo-bwc-config 
auto-migrate old mongo to draft modulestore
 2014-07-14 13:46:00 -04:00
Carson Gee
95dd2aad0b Merge pull request #3836 from mitocw/cg/add_default_logging 
Adding django default log handlers into logging configuration
 2014-07-14 13:08:05 -04:00
Nimisha Asthagiri
23c5febc17 Added deprecation warnings. 2014-07-14 11:59:40 -04:00
Nimisha Asthagiri
7503cc2473 reverting back to migrating the settings in the env files 2014-07-14 11:59:40 -04:00
Nimisha Asthagiri
4859eee23b Move modulestore django settings migration code down into the modulestore layer so it works for all django-based callers. 2014-07-14 11:59:40 -04:00
Don Mitchell
639658913d Refactor split migrator 
LMS-2936

Also, a bunch of ancillary cleanups.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_publish.py

Conflicts:
	cms/djangoapps/contentstore/management/commands/migrate_to_split.py
	cms/djangoapps/contentstore/management/commands/tests/test_rollback_split_course.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	common/lib/xmodule/xmodule/modulestore/split_migrator.py
	common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
	common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py
	common/lib/xmodule/xmodule/modulestore/tests/test_split_w_old_mongo.py
 2014-07-14 11:20:29 -04:00
Don Mitchell
9cf082e727 Merge pull request #4369 from edx/bug/stud-1962 
Bug/stud 1962
 2014-07-11 16:57:00 -04:00
Mat Peterson
cd82abae6c More test fixes 
Fix opaque key TODOs left over from split-migrator changes and fixed test_image_import to use the correct course

Reset get_location_from_path to pre deprecated opaque-keys

Fix CMS acceptance test

Fixed usage key reassignment in item.py
 2014-07-11 15:40:09 -04:00