Commit Graph

9424 Commits

Author SHA1 Message Date
Mathew Peterson
9a039e93ec Adding auto_publishing to split_draft
Added update_item, create_item, create_child to split_draft.py

Cleaned up TODOs in test_mixed_modulestore.py

Unit test for auto-publish

LMS-11017

Added tests to test_mixed_modulestore.py for has_changes and added black_list to _auto_publish

Moved DIRECT_ONLY_CATEGORIES to draft_and_publish.py

Deleted test_split_draft_modulestore.py

Added _auto_publish to create course

Publish cleanups for update_version, source_version

Changed has_changes to use source_version

Removing mixed test that no longer makes sense in auto_publish world

Addressed TODOs in test_branch_setting
2014-07-28 20:49:30 +00:00
polesye
c5c3913783 BLD-1091: Hide user_partitions from Advanced settings. 2014-07-28 22:07:57 +03:00
Usman Khalid
b594bd480a Merge pull request #4427 from edx/usman/lms6507-mako-dir
Use /tmp/mako_lms and /tmp/mako_cms for compiled mako templates.
2014-07-28 21:52:20 +05:00
Don Mitchell
ff696a2f2a Merge pull request #4440 from edx/bug/import
Bug/import
2014-07-28 09:44:15 -04:00
Ben Patterson
1bd6c71112 Merge pull request #4571 from edx/benp/acc-env-settings
Simplify acceptance test env pipeline handler settings.
2014-07-28 09:31:20 -04:00
Ben Patterson
4f34029b43 Simplify acceptance test env settings for pipeline handlers.
It will now inherit from common settings.
2014-07-28 07:53:49 -04:00
Ben McMorran
bf8183f61e Merge pull request #4544 from edx/benmcmorran/fixes-from-bulk-publishing
Return edit info from update_item and refactor item.py to use usage_key_with_run
2014-07-26 17:02:31 -04:00
Ben McMorran
66301fcfe2 Refactor to use usage_key_with_run in item.py 2014-07-25 15:24:11 -04:00
Calen Pennington
48645020d1 Merge pull request #4392 from louyihua/lms-window-origin
Add defininition of window.location.origin in both studio and LMS
2014-07-25 14:27:27 -04:00
John Jarvis
9016aa9854 Merge pull request #4558 from edx/jarv/remove-syslog-addr
removing syslog_addr
2014-07-25 11:00:59 -04:00
John Jarvis
5b686f9bdf removing syslog_addr
This is not currently being used in production and will not
be used moving forward since logs are remoted using splunk
2014-07-25 10:43:58 -04:00
Nimisha Asthagiri
c930e17fe1 Merge pull request #4534 from edx/nimisha/import-perf-unit-test-STUD-1994
Unit test for import performance STUD-1994
2014-07-25 09:37:06 -04:00
Don Mitchell
e897b46151 On import, don't move the course into the course_dir but just
do the import from wherever it unpacked.
Avoids an exception where the top-level dir had a subdir of same name
as one being moved, but also just makes it faster.
2014-07-25 09:35:47 -04:00
Nimisha Asthagiri
cd33165a52 Unit test for import performance STUD-1994 2014-07-24 16:34:26 -04:00
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
Usman Khalid
682e3108a8 Use /tmp/mako_lms and /tmp/mako_cms for compiled mako templates.
Currently a new temp directory is created for every process via
mkdtemp_clean() which cleans it on process exit.

However, this is not compatible with using --preload option of
gunicorn. With this option the tmp directory is created on gunicorn
start and is shared by all the workers. But when a worker exits it
deletes the directory. And so on the next requent the tmp directory
needs to be recreated and the templates need to be recompiled.

LMS-6507
2014-07-15 17:37:23 +05: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
louyihua
7f1c784629 Add defininition of window.location.origin in both CMS/LMS
The same bug in studio was fixed in #3893, and as TinyMCE is also used in LMS, it should be also fixed in LMS.
Here a common javascript file called 'ie_shim.js' is added, so that in the future it can be used for other IE compatibility purposes too.
2014-07-15 11:34:52 +08:00