Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,621 Commits 1 Branch 0 Tags
ac445d6eff0fac0be6c3aaee3265efafc8ee66ca
Commit Graph

5708 Commits

Author SHA1 Message Date
Waqas Khalid
a730f81132 Missing discussion blackout throwing exception 
When the list is empty in discussion blackout
on studio side it causes the exception on lms
side when we try to access the discussion. We
were expecting the values and try to parse it
in two values start and end date whereas parsing
empty values to two values causing the exception.
Now values will be parse when value exists. Empty
value will be ignored.

TNL-1390
 2015-02-16 19:43:03 +05:00
Clinton Blackburn
052fa8eafc Merge pull request #6935 from edx/clintonb/course-structure 
Generating Course Structure Asynchronously on Course Publish
 2015-02-13 13:37:05 -05: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
David Ormsbee
24fcab7f24 Very rough cut at generating a course outline after publishing. 2015-02-11 16:13:10 -05:00
Adam Palay
d4fff463d1 fix unicode error on cms settings page 2015-02-11 11:02:26 -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
Martyn James
a46b4daf7f Merge pull request #6937 from edx/mjames/SOL-353 
Reorganise reindexing operation
 2015-02-10 10:58:49 -05: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
Braden MacDonald
2982ecd40d Disabled flaky JS tests pending refactor to Backbone 2015-02-09 15:00:17 -08:00
cahrens
d88b0c488e store.has_course fails on old mongo with unicode chars. 
xml_importer now calls store.has_course even if create_course_if_not_present is False.
 2015-02-09 10:00:33 -05:00
cahrens
78a8fd807a If existing course is found on import, make sure dest_course_id is correct. 
TNL-1362
 2015-02-09 10:00:33 -05:00
cahrens
149c4e78c1 Update tests in reaction to ModuleStoreTestCase cleanup. 2015-02-09 10:00:32 -05:00
cahrens
a89304b991 Cleanup to make tests agnostic to the modulestore being used. 2015-02-09 10:00:32 -05:00
cahrens
040f96223c Update for split modulestore as default. 2015-02-09 10:00:14 -05:00
cahrens
f5d3d6050d Test of draft content depends on old mongo. 2015-02-09 10:00:12 -05:00
cahrens
840b42a9f1 Specify old mongo modulestore. 
Testing migration from old mongo to split.
 2015-02-09 09:26:06 -05:00
cahrens
b5e798062b Specify old mongo modulestore. 
Tests verify operation counts for old mongo. Should be extended to split in the future.
 2015-02-09 09:26:06 -05:00
cahrens
818a950815 Change to work with split modulestore. 
Cannot create an xblock in a course that doesn't exist.
 2015-02-09 09:26:05 -05:00
cahrens
e9f2f626ca Change to work with split modulestore. 
make_asset_key does not start with "/" for split locators.
 2015-02-09 09:26:05 -05:00
cahrens
29e235213c Update for default store being split. 
Note that now 2 courses can be imported where the only difference between them is run.
 2015-02-09 09:26:04 -05:00
cahrens
e66e2eda20 Use old mongo store to create courses. 
export_courses_to_output_path uses old mongo locator to create directory structure.
 2015-02-09 09:26:04 -05:00
cahrens
4e6c532717 Force usage of the old mongo modulestore. 
The way that assets are accessed (the usage of _id) seems specific to old mongo and fails with split.
 2015-02-09 09:26:04 -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
Christine Lytwynec
4c809fb6ae Merge pull request #6893 from edx/clytwynec/reshard_cms_lettuce_tests 
re-shard cms lettuce tests back to 1 shards
 2015-02-05 17:29:54 -05:00
polesye
d02d3b7926 TNL-1299: Update default video. 2015-02-05 10:55:36 +02:00
Calen Pennington
2bb1aafaaf Merge pull request #6752 from cpennington/modulestore-test-case-cleanup 
Clean up ModuleStoreTestCase
 2015-02-04 15:57:01 -05:00
Christine Lytwynec
5ae4681bd8 re-shard cms lettuce tests back to 2 shards 2015-02-04 13:47:01 -05:00
Akiva Leffert
50730da1b6 Merge branch 'release' 2015-02-04 13:14:29 -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
muzaffaryousaf
e5a440ef7a Refactoring the mocked user service. 
TNL-836
 2015-02-04 12:32:38 +05:00
Calen Pennington
3cf2fe7dc1 Merge pull request #6865 from cpennington/add-memory-dump-signal 
Add memory dump signal
 2015-02-03 10:33:34 -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
Sarina Canelake
4fc4b2f3de LMS: correcting poorly scoped font-family rule for footer links inside of p, ul, ol elements. 
Fix link stylings in LMS and CMS footers
 2015-02-02 16:42:08 -05:00
Calen Pennington
a69c4efd21 Add the ability to send SIGPROF to an edx-platform process to obtain a memory dump 2015-02-02 13:12:58 -05:00
Bertrand Marron
4789c5c9d0 Use HTTP_X_FORWARDED_PROTO header in studio 2015-02-02 16:54:26 +01:00
Martyn James
7601046729 Merge pull request #6852 from edx/dcikatic/SOL-302-hide-reindex 
SOL-302 Hide reindex button if 'ENABLE_COURSEWARE_INDEX' false
 2015-02-02 08:34:26 -05:00
Dino Cikatic
772908d79d SOL-302 Hide reindex button if 'ENABLE_COURSEWARE_INDEX' false 2015-02-02 11:22:36 +01:00
Martyn James
1b769b53cd Default search engine to None, so that all search/indexing operations are disabled until enabled 2015-01-30 16:40:03 -05:00
Greg Price
20eb84d431 Merge pull request #6828 from edx/gprice/video-upload-ordering 
Sort Studio video uploads by creation date
 2015-01-30 15:08:09 -05: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
Sarina Canelake
af763c287e Update text in Studio footer as per legal 
[OPEN-444]
 2015-01-30 11:33:46 -05:00
Muzaffar yousaf
ae102de3be Merge pull request #6777 from edx/muzaffar/student-info-tnl836 
Get user anonymous id via xblock user service.
 2015-01-30 19:35:26 +05:00