- 05 Feb, 2015 4 commits
-
-
Jesse Zoldak committed
-
Jesse Zoldak committed
-
polesye committed
-
Will Daly committed
-
- 04 Feb, 2015 11 commits
-
-
Sarina Canelake committed
-
David Baumgold committed
-
Calen Pennington committed
-
Calen Pennington committed
-
Calen Pennington committed
-
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]
Calen Pennington committed -
Calen Pennington committed
-
Davorin Sego committed
-
Sarina Canelake committed
-
Conflicts: lms/djangoapps/shoppingcart/views.py
Sarina Canelake committed -
Omar Al-Ithawi committed
-
- 03 Feb, 2015 11 commits
-
-
Will Daly committed
-
cahrens committed
-
cahrens committed
-
ECOM-891: Allow tracking of invoice transactions. Authors: Awais Qureshi and Aamir Khan
Awais Qureshi committed -
- 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
Giulio Gratta committed -
Will Daly committed
-
Chris Rodriguez committed
-
Ben Patterson committed
-
TNL-1304
Waheed Ahmed committed -
Move default country access messages out of static_templates, so they are not served by other Django views.
Will Daly committed -
These were found by the new pylint checker I wrote! :)
Ned Batchelder committed
-
- 02 Feb, 2015 6 commits
-
-
Fix link stylings in LMS and CMS footers
Sarina Canelake committed -
Also cleaning up some lint.
Ben Patterson committed -
This test consistently fails when combining lms acceptance onto one shard. (TE-737)
Ben Patterson committed -
Will Daly committed
-
Calen Pennington committed
-
polesye committed
-
- 31 Jan, 2015 1 commit
-
-
Marco Morales committed
-
- 30 Jan, 2015 5 commits
-
-
Martyn James committed
-
Fix newlines in redeem code email. Update copy to make sense for edx.org as well as white label.
Will Daly committed -
Chris Rodriguez committed
-
Makes logistration available at /login and /register as well as /accounts/login/ and /accounts/register/. In addition: - Adds support for redirect URLs in third party auth for combined login/registration page - Adds support for external auth on the combined login/registration page - Removes old login and registration acceptance tests - Adds deprecation warnings to old login and register views - Moves third party auth util to student_account - Adds exception for microsites (theming)
Renzo Lucioni committed -
[OPEN-444]
Sarina Canelake committed
-
- 29 Jan, 2015 2 commits
-
-
stephensanchez committed
-
Conflicts: common/lib/xmodule/xmodule/css/sequence/display.scss
Chris Rodriguez committed
-