Commit Graph

8962 Commits

Author SHA1 Message Date
Nimisha Asthagiri
ba8d390fd7 Support import of ErrorDescriptors. 2014-08-08 15:00:48 -04:00
Don Mitchell
7a75b94ff7 Support xml blocks w/ multiple parents 2014-08-08 15:00:47 -04:00
Don Mitchell
e900a47b3f Provide workarounds for skip_draft where other code doesn't want its behavior 2014-08-08 15:00:47 -04:00
Don Mitchell
5fc30dc4f6 Move about overview creation to common superclass 2014-08-08 14:56:57 -04:00
Nimisha Asthagiri
70c77f48b8 fixup - re-enable Asset checking. 2014-08-08 14:54:15 -04:00
Don Mitchell
9254cfa9ce Import depth first to help w/ publishing 2014-08-08 14:53:37 -04:00
Don Mitchell
2726b437bc Trying to get split to work 2014-08-08 14:53:37 -04:00
Calen Pennington
b87d469c89 Add make_course_key to modulestores, so that external clients don't need to assume a CourseKey subtype.
Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
2014-08-08 14:44:53 -04:00
Nimisha Asthagiri
84992cdfa5 Refactor xml_importer.py for easier reading.
Remove post-publish step.
2014-08-08 14:41:57 -04:00
Don Mitchell
47851c5041 Replace create_xmodule with create_xblock
Refactor all callers (often replacing with more appropriate fn)

Also, added for_branch_setting method to old mongo and removed some
branch verification tests

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
2014-08-08 14:40:27 -04:00
Nimisha Asthagiri
9efe5d92c5 Merge pull request #4720 from edx/split/add-and-fixes
Split/add and fixes
2014-08-08 14:12:02 -04:00
Adam
26b08a0205 Merge pull request #4736 from edx/usman/lms11205-embargomiddleware-invalidkeyerror
Catch InvalidKeyError in course_id_from_url().
2014-08-08 13:27:25 -04:00
Nimisha Asthagiri
d2b59cb6e0 get_items API: have qualifiers be a separate parameter instead of assuming kwargs. 2014-08-08 12:38:42 -04:00
Anton Stupak
5bf38806f8 Merge pull request #4716 from edx/anton/studio-tooltip-manager
Studio: Add tooltips.
2014-08-08 18:04:49 +03:00
clytwynec
8c8d388d1a Merge pull request #4744 from edx/clytwynec/remove_flaky_decorator_from_tests
removing "flaky" plugin, since it is not reporting failures properly
2014-08-08 10:15:03 -04:00
polesye
37c3a50ffa Add tooltip manager in Studio. 2014-08-08 16:31:14 +03:00
Usman Khalid
131c8cbf10 Catch InvalidKeyError in course_id_from_url().
LMS-9663
2014-08-08 18:21:48 +05:00
Nimisha Asthagiri
775b50a736 Address code coverage and quality. 2014-08-08 08:31:14 -04:00
Nimisha Asthagiri
934d4e8a23 Make Split Course work with new Publishing UI. 2014-08-07 20:23:44 -04:00
Nimisha Asthagiri
f10bcc1eb6 Fix get_courses. 2014-08-07 20:10:10 -04:00
Nimisha Asthagiri
abbfa95e4c LMS-11168 Support for removing versions and branch in Split, Mixed, and SQL.
Make default_store thread-safe.
2014-08-07 18:07:41 -04:00
Nimisha Asthagiri
e9db4ad16d LMS-11019 Add feature flag to create Split Course 2014-08-07 18:07:01 -04:00
Nimisha Asthagiri
ec3011635d LMS-11179 Fix Assets with Split 2014-08-07 17:59:38 -04:00
Nimisha Asthagiri
a55b406c53 LMS-11177 Add Split to configuration settings. 2014-08-07 17:59:37 -04:00
Christine Lytwynec
0243d0afa1 removing "flaky" plugin, since it is not reporting failures properly 2014-08-07 16:48:31 -04:00
jsa
d96de4249d Merge branch 'release' 2014-08-07 16:22:39 -04:00
Christina Roberts
99bcf107f9 Merge pull request #4296 from edx/bulk-publishing
Studio Publishing redesign
2014-08-07 14:04:10 -04:00
Ben McMorran
f3070e6796 Reduce mongo calls on course outline and container pages 2014-08-07 12:27:38 -04:00
Daniel Friedman
4b6035bafb Automatically collect HAR data for performance testing 2014-08-07 12:27:38 -04:00
cahrens
8079731d96 Assign Studio tests to shards. 2014-08-07 12:27:37 -04:00
cahrens
59d44c54b1 Updates after rebase. 2014-08-07 12:27:37 -04:00
cahrens
932a130b16 pep8/pylint 2014-08-07 12:27:36 -04:00
Ben McMorran
0b06712645 Remove specific wording for live content warning 2014-08-07 12:27:35 -04:00
Ben McMorran
e4635aaa69 Don't release date if it hasn't been changed.
STUD-2056
2014-08-07 12:27:35 -04:00
Ben McMorran
391ab8469e Open "View Live Version" and "Preview Changes" in a new window
STUD-2058
2014-08-07 12:27:35 -04:00
Ben McMorran
91c1fa0207 Restore set_input_value 2014-08-07 12:27:34 -04:00
cahrens
04be309ec4 Cleanup from rebase. 2014-08-07 12:27:28 -04:00
Ben McMorran
36afbfbdde Add test for expand collapse while editing name 2014-08-07 12:27:28 -04:00
Frances Botsford
b392e96d7d explicitly set transparent bg on flat outline button to prevent browser defaults 2014-08-07 12:27:27 -04:00
Daniel Friedman
f3173c7875 Don't use click_css in add_unit. 2014-08-07 12:27:27 -04:00
Ben McMorran
d514f363fc Integrate UI text strings from doc
STUD-1856

Display "IS VISIBLE TO" when released and published

Reword staff lock prompt and notifications

Change "View Published Version" to "View Live Version"

Change "Unit Tree Location" to "Unit Location in Course"

Switch live content warning based on unpublished changes

Reword discard changes confirmation prompt

Reword unit location tip

Add "Edit the name" popup text for sections and subsections

Fix popup text for section and subsection titles

Add popup text for new section, subsection, and unit buttons

Reword popup for View Live button and add tests

Reword notification when removing staff lock

Update MessageView when has_changes changed

Change "Published" to "Published (not yet released)"

Change "Unpublished (Staff only)" to "Visible to Staff Only"
2014-08-07 12:27:26 -04:00
Alexander Kryklia
5dbfd1087b Add styling to due date and grading format of subsection. 2014-08-07 12:27:25 -04:00
Tim Babych
8d0e469cd3 Remove code and template responsible for subsection edit page 2014-08-07 12:27:25 -04:00
polesye
e8ae3d1b4a Fix Group Configuration Page after rebase. 2014-08-07 12:27:23 -04:00
polesye
61c417f7f4 STUD-2021: Fix Multiple Choice Options in Studio. 2014-08-07 12:27:23 -04:00
cahrens
121922a316 Fix rebase issue. 2014-08-07 12:27:17 -04:00
Alexander Kryklia
a63cc0b30f Edit section/subsection release dates and grading types.
Fix bok_choy test by changing course separator.
Change format of the modal title to '[Subsection/Section Name] Settings'.
Improve bok_choy test stability.
Studio: correcting modal window size name for outline settings editor
Specify full date in bok_choy tests.
Refactor bok_choy tests.
Remove .modal-editor from basic-modal.underscore
Set classes in modal window dynamically.
Studio: revising outline edit modal tip content and overall size
Rename isEditable to isEditableOnCourseOutline.
Interpolate display name.
Use graded instead of format as flag.
Studio: revising outline settings edit modal size
Fix selectors in bok_choy tests.
2014-08-07 12:27:17 -04:00
Ben McMorran
9d44417ccb Add tests for course outline warning messages
Fix failing bokchoy tests
2014-08-07 12:27:15 -04:00
Ben McMorran
4ee8256c97 Add test fixes and fix expand collapse behavior
Stop propagation of clicks in XBlockStringFieldEditor
Fix collapsed subsections expanding when creating or deleting subsections
Prevent clicking in display name textbox from toggling expand collapse
Add test for published title when not live
2014-08-07 12:27:15 -04:00
cahrens
6d82cf09a4 Correct publish titles, code review feedback. 2014-08-07 12:27:14 -04:00