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

6885 Commits

Author SHA1 Message Date
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
Akiva Leffert
50730da1b6 Merge branch 'release' 2015-02-04 13:14:29 -05:00
Calen Pennington
199a8b783f Enforce the use of XModuleFactory only in contexts where something will clean up after it 2015-02-04 09:09:14 -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
Giulio Gratta
560ce55896 Add cosmetic price field to studio & logic 
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
 2015-02-03 09:40:00 -08:00
Ben Patterson
b71c20c031 Revert "Add Cosmetic Display Price field to studio & logic to show it" 2015-02-03 09:41:54 -05:00
Waheed Ahmed
e868db2e4d Fixed multiple textbooks links to only last uploaded textbook. 
TNL-1304
 2015-02-03 19:31:28 +05:00
Ned Batchelder
b048d98eb9 Merge pull request #6851 from edx/ned/fix-gettext-literals 
Fix a number of incorrect translation string uses.
 2015-02-03 08:38:58 -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
db3d6fd9ab Merge pull request #6182 from Stanford-Online/giulio/course-price-upstream 
Add Cosmetic Display Price field to studio & logic to show it
 2015-02-02 20:07:58 -05:00
Chris
2967f18d3f Merge pull request #6739 from edx/clrux/lms-navigation-accessibility-update 
Accessibility fixes for UX-1572
 2015-02-02 07:05:00 -05:00
zubair-arbi
7d7cb7850f don't add xblock with 'detached' tag as direct child of course for split in 'create_child' method 
PLAT-420
 2015-02-02 12:31:57 +05:00
Chris Rodriguez
3acb5c53f0 Accessibility issues addressing UX-1572 2015-01-30 14:16:59 -05:00
Chris
0a0d306b6a Merge pull request #6750 from edx/clrux/lms-navigation-content-focus-update 
Accessibility issues addressing UX-1573
 2015-01-30 12:26:23 -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
Chris Rodriguez
370eb970b1 Accessibility issues addressing UX-1573 
Conflicts:
	common/lib/xmodule/xmodule/css/sequence/display.scss
 2015-01-29 16:39:27 -05:00
Jonathan Piacenti
f1fff439a6 Add clearer error message for library content blocks on incompatible modulestores. 2015-01-29 20:36:19 +00: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
jsa
dbc465a518 reuse instances of OSFS in old mongo 2015-01-28 18:23:23 -05:00
Adam Palay
4a76a629f6 Revert "Fix tolerance broken" 
This reverts commit 66b949b745.
 2015-01-28 18:23:22 -05:00
John Eskew
e600d6e3b1 Add BlockData class to wrap all block data loaded from the Split 
modulestore, in order to separate serializable block data from
out-of-band, non-saved, temporary metadata.

Eliminate the deepcopy causing performance problems with import/export.

https://openedx.atlassian.net/browse/PLAT-416
 2015-01-28 18:23:22 -05:00
Calen Pennington
6cb55e1a36 Stringify ObjectIds before attempting to make a filename out of them 2015-01-28 18:23:22 -05:00
Calen Pennington
1160306438 Replace SplitMongo thread_cache usage with use of request_cache 2015-01-28 18:23:22 -05:00
Will Daly
b467ae8cde Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS" 
This reverts commit b8184d188f.
 2015-01-28 17:26:46 -05:00
Chris Rodriguez
9e2494b21d Video player branding addition for XuetangX 2015-01-28 06:39:21 -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
Giulio Gratta
c18ee8cc09 Add cosmetic price field to studio & logic 
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
 2015-01-27 15:15:43 -08:00
Andy Armstrong
6201af652b Merge pull request #6765 from edx/andya/requirejs-in-lms 
Add RequireJS to the LMS
 2015-01-27 17:57:33 -05:00
Will Daly
b8184d188f Add RequireJS and RequireJS Optimizer configuration to the LMS 
[second attempt which addresses bug building Studio]
 2015-01-27 17:56:29 -05:00
Omar Al-Ithawi
38db6e695d Giant fixups for the editors around the studio 2015-01-27 11:11:55 +02:00
Syed Hassan Raza
e2ecb0db46 Invalid youtube_id raise NotFoundError for transcripts 
TNL-1229
 2015-01-27 11:48:08 +05:00
Omar Al-Ithawi
1714d23ae8 TinyMCE RTL in course bulk email 2015-01-25 18:07:08 +02:00
David Baumgold
ccc2dd8327 Merge pull request #6722 from Stanford-Online/giulio/shorten-course-module-py-line-lengths 
Shortened line length of studio help strings
 2015-01-22 16:16:33 -05:00
Giulio Gratta
47a0e3441e Shortened line length of studio help strings 2015-01-22 09:48:41 -08:00
Usman Khalid
3d4a853e00 Merge pull request #5926 from Stanford-Online/kluo/lti-grades-past-due 
Make LTI grade submissions respect deadlines
 2015-01-22 19:55:21 +05:00
Kevin Luo
af9dce82a3 Make LTI grade submissions respect deadlines 2015-01-21 17:05:46 -08:00
Will Daly
fcd7736d29 Merge pull request #6721 from edx/will/revert-requirejs-changes 
Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
 2015-01-21 19:07:34 -05:00
Braden MacDonald
4198da1ae1 Merge pull request #6657 from open-craft/fix-library-old-mongo-default 
Fix errors with libraries when old mongo is default (first) modulestore (SOL-234)
 2015-01-21 15:05:12 -08:00
Will Daly
1f2b155746 Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS" 
This reverts commit 1d6fceda50.
 2015-01-21 17:13:27 -05:00
Braden MacDonald
025f046b04 Fix errors with libraries when old mongo is default (first) modulestore 2015-01-21 11:01:52 -08:00
Will Daly
1d6fceda50 Add RequireJS and RequireJS Optimizer configuration to the LMS 
Respond to review comments:

- Rename build and config files for consistency between lms/studio.
- Fix merge conflicts with lms require config.
- Devstack uses optimized pipeline to skip require JS optimizer step
- Add tests for render_require_js_path_overrides
 2015-01-20 14:27:23 -05:00
John Eskew
a4bbed3bc1 Add performance test which finds the BSON size of varying amounts 
of asset metadata in both the old Mongo and Split modulestores.
 2015-01-20 11:18:24 -05:00
John Eskew
b14eaa038c Merge pull request #6627 from edx/jeskew/perf_test_asset_metadata_find_mongo 
Add performance test when finding asset metadata.
 2015-01-16 17:03:02 -05:00
John Eskew
01f2e1fd0b Add performance test when finding asset metadata. 
Re-factor report generation and add report for "find" performance test.
 2015-01-16 16:05:29 -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