Commit Graph

1582 Commits

Author SHA1 Message Date
Jonathan Piacenti
8ad4d081fb Added library import and export via .tar.gz'd XML files. 2015-03-10 21:29:29 +00:00
asadiqbal
5a7ac441e5 Entrance Exam authoring and messaging updates
Multi-commit history:
- hide drag functionality for entrance exam section.
- hide entrance exam subsection elements e.g. delete, drag, name etc.
- show unit/verticals expanded in case of entrance exam
- modify code in order to allow user to update entrance exam score from UI.
- write down unit tests.
- write down Jasmine tests.
- add bok-choy test
- updated bok-choy test
- internationalize string
- repositioned sequential block creatori
- SOL-221 (entrance exam message)
- SOL-199 LMS Part (show entrance exam content) and hide the course navigation bar.
- redirect the view in case of entrance exam.
- update code structure as per suggestions
- write down unit tests
- fix pep8
- instead of hiding the exam requirement message, now also showing the exam the completion message (success state).
- write down unit test to show exam completion message.
- Update code as per review suggestions
- update doc string
- addressed review suggestions
- change sequential message text
- css adjustments
- added new css class for entrance exam score in studio
- added Jasmine test for remaning coverage
- sequential message should appear under the context of entrance exam subsection.
- updated text in CMS and LMS as per suggestions.
- added unit text to insure sequential message should not be present in other chapters rather then entrance exam.
- skip setter if empty prerequisite course list
- exclude logic from xblock_info.js that is specifically related to entrance exam.
- added js tests and updated code as per suggestions
- added tests
- addressed several PR issues
- Several small fixes (style, refactoring)
- Fixed score update issue
- added some more unit tests.
- code suggested changes.
- addressed PR feedback
2015-03-10 09:24:43 -04:00
Alison Hodges
3d7ee895d7 Fixes DOC-1731: label change and time frame info 2015-03-06 17:08:24 -05:00
David Baumgold
dca05a6095 Merge branch 'release' 2015-03-06 08:54:22 -05:00
E. Kolpakov
c225d86e83 SettingsService for accessing server-wide settings from XBlock 2015-03-05 18:24:47 +03:00
Greg Price
83c474622e Fix 500 errors on video upload page
Some status strings were accidentally tuples thanks to stray commas, and
ugettext raised an exception as a result.

JIRA: MA-323
2015-03-04 18:15:48 -05:00
Daniel Friedman
e622e63c7b Catch PluginMissingError when generating component templates 2015-02-26 13:46:28 -05:00
Dino Cikatic
b597df2e39 Changing search_reindex call to be more inline with DRF convention 2015-02-24 10:58:50 -05:00
Sarina Canelake
6900bd27fe Merge pull request #7013 from stvstnfrd/pylint/low
Fix Pylint violations (easy)
2015-02-20 16:36:52 -05:00
muzaffaryousaf
a31e38416d Adds content group "Delete" and "Usage" functionality to group configurations page on cms.
TNL-1185
2015-02-20 14:56:22 +05:00
stv
69695a8f12 Fix Pylint: W0107(unnecessary-pass) 2015-02-19 19:56:52 -08:00
stv
66f28fd8da Fix Pylint: I0022(deprecated-pragma) 2015-02-19 19:56:51 -08:00
Muzaffar yousaf
5d4e84eb37 Merge pull request #6984 from edx/muzaffar/studio-group-config-tnl1446
Applying unicode to the content experiment display name.
2015-02-13 20:58:41 +05:00
Sarina Canelake
1b07bcdf67 Merge pull request #6949 from stvstnfrd/gettext/empty
Remove superfluous empty string check
2015-02-13 08:31:31 -05:00
muzaffaryousaf
bff205579b Minor refactoring.
TNL-1146
2015-02-13 14:56:33 +05:00
muzaffaryousaf
4189bd19f7 Applying unicode to the usage label with test.
TNL-1146
2015-02-13 14:54:34 +05:00
cahrens
0d2969909f Enable course reruns by default.
TNL-1380
2015-02-11 17:16:52 -05:00
Adam
296167e531 Merge pull request #6950 from edx/release
Release
2015-02-10 16:06:24 -05:00
stv
405f03a6e9 Remove superfluous empty string check
Since we began monkey-patching `django.utils.translation` [1], we no
longer need to check for empty strings before translating them.
Previously, the empty string would be translated into translation
metadata. Now, translating the empty string intuitively yields the empty
string.

[1] 86633df3db
2015-02-10 09:47:48 -08:00
Calen Pennington
89d4749057 get the raw DescriptorSystem, not the CombinedSystem when instantiating xmodules (TNL-1226)
get the raw DescriptorSystem, not the CombinedSystem when instantiating xmodules (TNL-1226)

quality fixes

remove trailing comma
2015-02-10 09:47:44 -05:00
Martyn James
181d0e46c5 Reorganise reindexing operation 2015-02-09 22:13:25 -05:00
cahrens
a89304b991 Cleanup to make tests agnostic to the modulestore being used. 2015-02-09 10:00:32 -05:00
cahrens
9e6249ddd6 Enable split for new courses. 2015-02-09 09:26:04 -05:00
Calen Pennington
79fe947a92 Add test of PLAT-417 2015-02-06 09:59:49 -05:00
Calen Pennington
b353ed2ea2 Better support specifying of modulestore configuration in test cases
The existing pattern of using `override_settings(MODULESTORE=...)` prevented
us from having more than one layer of subclassing in modulestore tests.

In a structure like:

    @override_settings(MODULESTORE=store_a)
    class BaseTestCase(ModuleStoreTestCase):
        def setUp(self):
            # use store

    @override_settings(MODULESTORE=store_b)
    class ChildTestCase(BaseTestCase):
        def setUp(self):
            # use store

In this case, the store actions performed in `BaseTestCase` on behalf of
`ChildTestCase` would still use `store_a`, even though the `ChildTestCase`
had specified to use `store_b`. This is because the `override_settings`
decorator would be the innermost wrapper around the `BaseTestCase.setUp` method,
no matter what `ChildTestCase` does.

To remedy this, we move the call to `override_settings` into the
`ModuleStoreTestCase.setUp` method, and use a cleanup to remove the override.
Subclasses can just defined the `MODULESTORE` class attribute to specify which
modulestore to use _for the entire `setUp` chain_.

[PLAT-419]
2015-02-04 09:09:14 -05:00
Calen Pennington
03a05fd9d4 Always call super(..).setUp() from setUp 2015-02-04 09:09:14 -05:00
Ned Batchelder
fb595c89f3 Fix a number of incorrect translation string uses
These were found by the new pylint checker I wrote! :)
2015-02-02 22:38:27 -05:00
Dino Cikatic
772908d79d SOL-302 Hide reindex button if 'ENABLE_COURSEWARE_INDEX' false 2015-02-02 11:22:36 +01:00
Greg Price
3978d91644 Sort Studio video uploads by creation date
This provides a better UX for video uploaders, because recent uploads
are readily visible at the beginning of the table.
2015-01-30 13:23:44 -05:00
Matt Drayer
1c839cc09d Addressed several outstanding issues related to initial entrance exams feature delivery 2015-01-28 23:56:32 -05:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Greg Price
ef8843ab1a Fix bugs in CSV download of video upload data
This fixes two bugs:
1. All statuses were listed as "Unknown"
2. Non-ASCII characters in a header column translation resulted in a 500
2015-01-28 18:23:22 -05:00
Waheed Ahmed
4ac7b55757 Fixed transcript skip first line if it contains BOM(Byte Order Mark).
TNL-935
2015-01-28 12:26:16 +05:00
Greg Price
874cd5c78f Improve code for video upload feature
Fix i18n for video status strings (broken in commit 4b53f4d) and remove
unnecessary complexity from a test case. This also removes the status
whitelist in the video upload configuration. Because status is included
in the CSV report, it is not necessary to filter the included videos by
status.
2015-01-20 11:45:21 -05:00
Ned Batchelder
e64d45b705 Merge pull request #6563 from edx/ned/fix-6013
Fixes for #6013: Implement user service to return currently-logged-in user
2015-01-16 15:12:31 -05:00
Martyn James
9ac7176b8f Merge pull request #6223 from edx/feature/SOL-20
Merge feature SOL-20
2015-01-16 12:54:45 -05:00
Martyn James
dcc8e95648 Implements SOL-20. Filtering for assets table by asset type 2015-01-16 12:53:24 -05:00
Jason Bau
7f1b60b286 Implement user service to return currently-logged-in user
returns XBlockuser with 2 data layers
2015-01-16 11:40:06 -05:00
Waheed Ahmed
47a372282a Fixed transcript skip first line if it contains BOM(Byte Order Mark).
TNL-935
2015-01-16 12:21:43 +05:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
cahrens
9607aa233c Remove unnecessary pylint suppression.
Possibly caused by a bad merge.
2015-01-15 10:37:25 -05:00
Daniel Friedman
fff84928fa Create and edit content groups in Studio 2015-01-15 10:37:24 -05:00
Andy Armstrong
21a9873757 Don't allow visibility editing in content libraries 2015-01-15 10:33:48 -05:00
cahrens
4b00566e4d Update course access check. 2015-01-15 10:33:48 -05:00
Andy Armstrong
4fa33e25ed Studio support for cohorted courseware
TNL-652
2015-01-15 10:33:45 -05:00
jsa
17d892c521 make block.get_parent() work.
Co-Authored-By: Christina Roberts <christina@edx.org>
Co-Authored-By: Daniel Friedman <dfriedman@edx.org>
Co-Authored-By: Don Mitchell <dmitchell@edx.org>
2015-01-15 10:33:44 -05:00
polesye
c7153be040 TNL-213: Let Students Add Personal Notes to Course Content.
Co-Authored-By: Jean-Michel Claus <jmc@edx.org>
Co-Authored-By: Brian Talbot <btalbot@edx.org>
Co-Authored-By: Tim Babych <tim@edx.org>
Co-Authored-By: Oleg Marshev <oleg@edx.org>
Co-Authored-By: Chris Rodriguez <crodriguez@edx.org>
2015-01-14 23:34:11 +02:00
E. Kolpakov
195d5b57bc pylint fixes 2015-01-12 09:58:51 -08:00
E. Kolpakov
1a387d8217 Test for paging in items.py 2015-01-12 13:42:55 +03:00