Commit Graph

2310 Commits

Author SHA1 Message Date
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
zubair-arbi
70e5044f47 update export_all_courses management command to count and list all failed export courses 2014-08-05 14:09:02 +05: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
640ea444f8 Merge pull request #4608 from edx/benmcmorran/fix-blank-xblock-names
Show category when an xblock does not have a default display name
2014-07-31 11:49:59 -04:00
Ben Patterson
9b22ceb9f8 Fix false positive test in cms acceptance
This test was passing in Jenkins, but failing in our Solano runs (and locally on firefox).
This is because it was attaching a file that was not there. This change fixes the test
and makes the attachment method smarter so it will fail if it tries attaching a non-existent
file.
2014-07-30 12:19:18 -04: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
Anton Stupak
54d60fc1b1 Merge pull request #4555 from edx/anton/remove-experiments-from-advanced-settings
Remove user_partitions from advanced settings
2014-07-29 09:03:45 +03: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
polesye
c5c3913783 BLD-1091: Hide user_partitions from Advanced settings. 2014-07-28 22:07:57 +03: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
Ben McMorran
66301fcfe2 Refactor to use usage_key_with_run in item.py 2014-07-25 15:24:11 -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
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
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
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
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
swdanielli
3f1e9993f5 recommender prototype 2014-07-17 11:21:01 -04:00