Commit Graph

1858 Commits

Author SHA1 Message Date
Calen Pennington
50082387eb Add a request-token to identify which xblock html was rendered as part of the current request
[STUD-2903]
2014-08-15 11:04:52 -04:00
Oleg Marshev
a94e942480 BLD-1125: Validation of content experiments after managing a group. 2014-08-14 16:34:21 +02:00
Don Mitchell
aa1b9fece9 Properly (de)serialize references in old mongo
LMS-11204
2014-08-13 11:26:12 -04:00
Tim Babych
e7fbf1327f Merge pull request #4778 from edx/tim/improve-python-group-configuration-tests
Use UrlResetMixin to test GroupConfiguration feature
2014-08-11 21:10:47 +03:00
Tim Babych
06cb6008f0 Use UrlResetMixin to test GroupConfiguration feature 2014-08-11 19:12:30 +03:00
Nimisha Asthagiri
84992cdfa5 Refactor xml_importer.py for easier reading.
Remove post-publish step.
2014-08-08 14:41:57 -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
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
Ben McMorran
f3070e6796 Reduce mongo calls on course outline and container pages 2014-08-07 12:27:38 -04:00
cahrens
932a130b16 pep8/pylint 2014-08-07 12:27:36 -04:00
cahrens
04be309ec4 Cleanup from rebase. 2014-08-07 12:27:28 -04:00
Tim Babych
ef9cf87b01 Compute graders just once per Course. 2014-08-07 12:27:26 -04:00
Tim Babych
d7f75778dd Pass parent_xblock to xblock_studio_url to avoid unnecessary calls to get_parent_xblock. 2014-08-07 12:27:26 -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
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
Daniel Friedman
8ca4c68580 Reduce parent/child lookups in create_xblock_info
STUD-1997
2014-08-07 12:27:16 -04:00
Daniel Friedman
529672ac0c Reduce calls to expensive methods in create_xblock_info
Special-case the outline page requests.

STUD-1997
2014-08-07 12:27:16 -04:00
Daniel Friedman
2118453e00 Include edited/published_by for container page only 2014-08-07 12:27:15 -04:00
cahrens
6d82cf09a4 Correct publish titles, code review feedback. 2014-08-07 12:27:14 -04:00
Andy Armstrong
ef581e1146 Apply code review comments and fix tests 2014-08-07 12:27:14 -04:00
Andy Armstrong
a359065329 Integrate visual styling into the course outline 2014-08-07 12:27:13 -04:00
Ben McMorran
73bd863712 Fix staff outline bug 2014-08-07 12:27:11 -04:00
cahrens
d447c07540 Support staff locking on the unit page
STUD-1873
2014-08-07 12:16:22 -04:00
Andy Armstrong
d2b61f146f Support faster deletes of sections 2014-08-07 12:16:21 -04:00
Ben McMorran
436d773987 Displays release date of unit in sidebar 2014-08-07 12:16:20 -04:00
Andy Armstrong
f061bbc08b Backbone version of the course outline page
STUD-1726
2014-08-07 12:16:20 -04:00
Andy Armstrong
49e0c642e2 Fix test that broke on rebase 2014-08-07 12:16:19 -04:00
cahrens
0f6de7f922 Discard changes rewrite.
STUD-1860
2014-08-07 12:16:19 -04:00
Ben McMorran
572b4fc030 Displays the date, time, and username of the most recent save and publish
Conflicts:
	cms/djangoapps/contentstore/views/item.py
2014-08-07 12:16:19 -04:00
cahrens
7cb5c4d7b8 Updates based on merge with master. 2014-08-07 12:16:18 -04:00
Ben McMorran
d40ef5e089 Adds warning when editing a container visible to students
styling for editing a live unit
2014-08-07 12:16:18 -04:00
cahrens
d6475f4558 New publishing controls on unit page (continued)
STUD-1707
2014-08-07 12:16:18 -04:00
Andy Armstrong
d65e887d1a New Publishing controls on Unit page.
STUD-1707
2014-08-07 12:16:17 -04:00
Andy Armstrong
b1eccdf2d4 Replace unit page with the container page.
STUD-1754
2014-08-07 12:16:17 -04:00
David Adams
9e45e8f982 Refactor ADVANCED_COMPONENT_TYPES
Modified to a setting in CMS common.py and aws.py
    Also factored out are: ADVANCED_PROBLEM_TYPES

    This enables third parties to add XBlocks to their system
    without having to make a code change.

    Code also added to ensure that a component should exist in both
    ADVANCED_COMPONENT_TYPES and the course advanced module list
    in order for it to be enabled in the course.
2014-08-04 12:17:45 -07:00
Sarina Canelake
bad803e451 Merge pull request #4653 from Stanford-Online/stv/i18n/empty
Translate string iff non-empty
2014-08-01 18:03:43 -04:00
Julia Hansbrough
7b1fce9e3f Merge pull request #4641 from edx/reruns/server-side-handlers
Basic notifications handling.
2014-08-01 17:30:54 -04:00
Diana Huang
69f900dd90 Basic notifications handling.
LMS-11163
2014-08-01 19:50:37 +00:00
stv
3fdfdbcd2b Translate string iff non-empty
This resolves an issue where a checklist's long_description being empty
caused gettext to dump PO file headers.

I had originally made this change to the Stanford-Online/edx-platform
repository a few weeks ago [0] to address a failing test on our fork.
I didn't take the time to diagnose the root issue; I just fixed it for
the single case.

After stumbling across the issue elsewhere, @kluo <kevkluo@gmail.com>
followed through and tracked down the cause of the behavior. It turns
out that `gettext`, by default, translates the empty string into PO file
headers; this is apparently a feature, not a bug [1].

This behavior seems counterintuitive; for our use, it seems that
translating an empty string should simply return an empty string. We
already program defensively around this in platform code [2], but it'd be
convenient to resolve this with a centralized solution, instead of a
patchwork of fixes.

[0] 4b88f54aa658db952e899222ff5ede4a1c1beb18
[1] http://stackoverflow.com/questions/18459387/translation-of-empty-string-shows-po-header
[2] https://github.com/edx/edx-platform/blob/master/cms/djangoapps/contentstore/views/checklist.py#L140
2014-08-01 11:03:47 -07:00
polesye
27013e74f4 BLD-1049: Remove Group Configurations. 2014-08-01 20:45:23 +03:00
Ben McMorran
2cc72ca015 Show category when an xblock does not have a default display name 2014-07-30 10:30:18 -04:00
Nimisha Asthagiri
86986e63ff Fixup: Studio server-side - review comments. 2014-07-29 15:27:10 -04:00
Nimisha Asthagiri
88ad29d166 LMS-11016 Studio server-side for course_listing and course_rerun.
Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
2014-07-29 15:04:17 -04:00
jmclaus
69ee9d92d6 BLD-1104: List units that use group configuration. 2014-07-29 16:16:31 +02:00
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
Don Mitchell
ff696a2f2a Merge pull request #4440 from edx/bug/import
Bug/import
2014-07-28 09:44:15 -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