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

4908 Commits

Author SHA1 Message Date
Tim Babych
b2139ece80 Merge pull request #4543 from edx/tim/test_export_all_courses-was-flaky 
Make test_export_all_courses not flaky
 2014-07-24 22:14:30 +03:00
Christina Roberts
fa1f4f2be7 Merge pull request #4474 from Stanford-Online/sjang92/null_tabname_bugfix 
Bugfix: New Tab name being initialized as null
 2014-07-24 14:50:00 -04:00
Tim Babych
51a8dc2326 Make test_export_all_courses do not rely on the order in which files are returned by os.walk(). 2014-07-24 19:22:26 +03:00
Sarina Canelake
8b3d9da40d Merge pull request #4209 from msegado/showanswer-correct-or-past-due 
Add "Correct or Past Due" option for showanswer
 2014-07-24 08:57:54 -04:00
Martin Segado
bbeb79cbe7 Add correct_or_past_due option for showanswer and update relevant documentation 2014-07-24 02:44:03 -04:00
polesye
fda3f5ac04 BLD-1110: Create, edit, delete groups. 2014-07-24 08:30:21 +03:00
Se Won Jang
2c3aebf91f Bugfix: Initialize new tabname to "Empty" 
In Studio, when the course administrator creates a new tab, its name was being
initialized as null in the mongo database. This caused students in LMS to get a
server error when trying to access the course page, since LMS was trying to
process the null tabname for translation, etc. Now tabname is initialized as
'Empty', which is how it was being done in the frontend.

STUD-2000
 2014-07-23 18:32:59 -07: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
Jason Bau
bd03741c79 Merge pull request #4212 from Stanford-Online/ndupoux/fixing-registration-page 
Ndupoux/fixing registration page
 2014-07-21 18:07:10 -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
njdup
770e7aac49 User registration prevents using password as username. 
Some users erroneously set their password as their username with the original layout, because the username field directly followed the password field. Users may be accustomed to the common occurrence of a password confirmation field directly following the password field.
To fix the issue, I did the following:
   - Moved the existing username and real name form fields above the password field.
   - Added a validation in the create_account handler in common/djangoapps/student/views.py, which confirms that the password field does not match the username field.

New tests created to check the added functionality.
 2014-07-21 14:04:48 -07:00
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