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

5696 Commits

Author SHA1 Message Date
Martyn James
a46b4daf7f Merge pull request #6937 from edx/mjames/SOL-353 
Reorganise reindexing operation
 2015-02-10 10:58:49 -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
Sarina Canelake
011a5f9410 Merge pull request #6754 from OmarIthawi/edraak/omarithawi/bulk-mail-rtl 
TinyMCE RTL in course bulk email
 2015-01-30 09:12:56 -05:00
Jonathan Piacenti
f1fff439a6 Add clearer error message for library content blocks on incompatible modulestores. 2015-01-29 20:36:19 +00:00
Jim Abramson
116dba39a8 Merge pull request #6711 from edx/jsa/fix-rerun-exception 
avoid database error when recording task exception
 2015-01-29 12:51:02 -05:00
jsa
ace2bffae6 avoid database error when recording task exception 2015-01-29 11:25:45 -05:00
Adam
1ad0e9fdd8 Merge pull request #6560 from openfun/openfun/studio-csrf-error 
Fix csrf error on studio login
 2015-01-29 10:52:17 -05:00
muzaffaryousaf
3a09af07e5 Fixing the broken tests. 
TNL-1185
 2015-01-29 18:37:22 +05:00
Adam
b17290cd75 Merge pull request #6802 from edx/adam/fix-translation 
fix settings page not handling unicode (TNL-1237)
 2015-01-29 08:02:09 -05:00
Régis Behmo
dce56b135e Make sure login form can't be submitted too early 
Tyhe sign in form should not be submitted before the submit event is
ready to be intercepted. This can occur if the user clicks too fast on
the sign in button.
 2015-01-29 09:10:59 +01:00
Régis Behmo
c3c35f076c Fix csrf error on studio login 
Context: We have witnessed multiple, seemingly random "CSRF verification
failed" errors while signing in (with valid ID) to the Studio.

Explanation: The login form does not initially include a CSRF field.
The CSRF header of the request is appended to the studio login request
headers by intercepting the form validation. This intercept is performed
by the login.js script. Unfortunately, the login.js script is loaded
pretty late (at the end of the template). So if the login form is
validated sufficiently fast, the login.js script has no time to load and
append the X-CSRFToken header to the request.

Proposed solution: the CSRF token is already passed to the template via
the login view, so we just add a hidden field to the login form to
include the csrf token.
 2015-01-29 09:10:59 +01: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
Andy Armstrong
a9127c1897 Merge pull request #6804 from edx/will/revert-require-js-optimizer-again 
Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
 2015-01-28 18:30:16 -05:00