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

4894 Commits

Author SHA1 Message Date
Brian Talbot
70da89900e Merge pull request #4484 from edx/talbs/fix-new-course-copy 
Studio: New Course Field Tip Copy Correction
 2014-07-21 11:08:23 -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
Brian Talbot
9c9e4a90b2 Studio: corrects new course field tip copy to reflect what provided course values cannot be changed later 
STUD-2001
 2014-07-20 18:17:49 -04:00
Nimisha Asthagiri
d53a666949 Merge pull request #4381 from edx/nimisha/split-converge-api 
Nimisha/split converge api
 2014-07-19 07:04:23 -04:00
Calen Pennington
483e2a6a5d split create_item and create_child out as separate methods 2014-07-18 21:11:37 -04:00
polesye
2a6a874a8f BLD-1099: Edit group configurations. 2014-07-18 10:03:08 +03: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
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
fb927dd790 Merge pull request #4450 from Stanford-Online/jbau/edx/fix-shib-student-register 
fix shib reg from course about page
 2014-07-17 13:53:51 -04:00
swdanielli
3f1e9993f5 recommender prototype 2014-07-17 11:21:01 -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
Jason Bau
e1fcac93c5 fix shib reg from course about page 2014-07-17 10:51:32 -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
louyihua
9d284d2f61 Fix quotation mark & apostrophe related i18n bug 
Just done by using the escapejs function :)
 2014-07-16 23:56:30 +08:00
cahrens
8a484b64d3 Disable test that is leaving modal open. 
STUD-1963
 2014-07-15 16:52:52 -04:00
Will Daly
f86b031a20 Merge pull request #4416 from edx/will/timepicker-css-in-unit-editor 
Add JQuery timepicker CSS to the unit and container templates
 2014-07-15 07:59:41 -04:00
Tim Babych
d7b396a98b Update (optional) Group Configuration urls to use settings.COURSE_KEY_PATTERN. 2014-07-15 12:28:37 +03:00
Tim Babych
246e0e6f66 Merge pull request #4411 from edx/anton/group-experiments 
Create new group configurations page
 2014-07-15 08:19:34 +03: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
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
Will Daly
0c90b04ecd Add JQuery timepicker CSS to the unit and container templates 2014-07-14 14:07:39 -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
Don Mitchell
57ec402433 Merge pull request #4397 from edx/split-migrator/lms-2936-ok 
Refactor split migrator
 2014-07-14 12:10:42 -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
polesye
205d24f5cf BLD-1121: Create new group configurations page. 2014-07-14 17:44:48 +03:00
Stephen Sanchez
0a73d403d7 Merge pull request #4238 from edx/sanchez/TIM-645-File-Upload-Service 
Updating settings and requirements for platform to support file upload
 2014-07-14 09:22:40 -04:00
clytwynec
1807948f2e Merge pull request #4391 from edx/clytwynec/clean_up_lettuce_output 
Clytwynec/clean up lettuce output
 2014-07-14 09:09:25 -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
Mat Peterson
98649072bd skipping test_clone_course 2014-07-11 15:40:09 -04:00
Diana Huang
96420f30f1 Minor cleanups 
Remove unnecessary check.
Fix merge conflict
 2014-07-11 15:40:09 -04:00
Diana Huang
97331d4c16 Fix merge conflict 2014-07-11 15:40:09 -04:00
Sarina Canelake
cfb7f99c8e Add filter to ignore deprecation warnings by default 
Add filter to only show first occurance of DepWarning
 2014-07-11 15:40:09 -04:00
Mat Peterson
df1a9304c1 Made fill_in_run public in mongo and added fill_in_run to mixed which funnels to mongo 2014-07-11 15:40:09 -04:00
Sarina Canelake
ff2822cf48 Fix cms tests 2014-07-11 15:40:09 -04:00
Mat Peterson
1b71ace4b0 studio new style assumption corrections 2014-07-11 15:40:08 -04:00
Mat Peterson
e39cc5dfa3 Switch offering to course and run 2014-07-11 15:40:08 -04:00
Mat Peterson
4f6088cbd1 Fixed some isinstance errors with opaque-keys 2014-07-11 15:40:08 -04:00
Christine Lytwynec
cd580ac247 overriding a few more log levels for acceptance tests 2014-07-11 12:01:03 -04:00
Ned Batchelder
84cfea8ead Remove an unneeded unicode conversion 2014-07-10 17:06:16 -04:00
Abdallah
cf16975bd2 unicode fixes 2014-07-10 17:06:16 -04:00
Sarina Canelake
50709c163f Merge pull request #4367 from edx/sarina/i18n-course-handouts 
i18n LMS and Studio components of course handouts
 2014-07-10 14:47:23 -04:00
Julia Hansbrough
177e8a241d Merge pull request #3858 from aboudreault/xblock-resource-missing-mimetypes 
Add missing mimetypes for xblock resources
 2014-07-10 13:51:16 -04:00
Sarina Canelake
a5dc426cc8 i18n LMS and Studio components of course handouts 2014-07-10 11:28:00 -04:00
Adam
379edd2317 Merge pull request #4352 from edx/release 
Release
 2014-07-10 10:54:16 -04:00
Muhammad Ammar
81a5a7b962 CMS Video Handout Tests 2014-07-10 05:45:49 +00:00