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

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
6cdaad58de Merge pull request #6730 from OmarIthawi/edraak/unicode-fixes-log-username 
(WIP) Unicode fixes for log messages with username and other unicode input
 2015-02-04 11:31:57 -05:00
Christina Roberts
f579482e7f Merge pull request #6883 from edx/christina/delete-unused-api 
Delete unused student_profile API.
 2015-02-04 11:29:24 -05:00
Davorin Šego
c89c2de9c7 Merge pull request #6891 from edx/dsego/update_authors 
Add dcikatic, dsego and mjevtic to the AUTHORS file
 2015-02-04 16:55:37 +01:00
Davorin Sego
d0b6fea9c8 Add dcikatic, dsego and mjevtic to the AUTHORS file 2015-02-04 16:51:50 +01:00
Davorin Šego
b81d2ed143 Merge pull request #6887 from edx/dsego/search_a11y 
Search form accessibility
 2015-02-04 16:39:23 +01:00
David Baumgold
1a20891cbd Internationalize aria-label attributes 2015-02-04 10:31:40 -05:00
Calen Pennington
247fe1b288 Use UserFactory profile link better 2015-02-04 09:09:15 -05:00
Calen Pennington
74af3ffa05 Remove unused import 2015-02-04 09:09:15 -05:00
Calen Pennington
7b3d91f5d8 Use CourseKey.from_string rather than from_deprecated_string 2015-02-04 09:09:15 -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
a92ca9d79a Add pylint plugin to check whether setUp is called in TestCase setUp methods. 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
Muzaffar yousaf
b1dfac56f0 Merge pull request #6877 from edx/muzaffar/refactor-test-tnl836 
Refactoring the mocked user service object to return xblock user.
 2015-02-04 18:42:45 +05:00
Will Daly
820cc4aaee Merge pull request #6784 from edx/will/invoice-refactor-squashed 
Invoice data model refactor
 2015-02-04 07:48:57 -05:00
Davorin Sego
3298971459 Search form accessibility 2015-02-04 10:49:44 +01:00
Sarina Canelake
01064fcc79 Fix logging calls to use unicode, and lazy logging 2015-02-04 10:53:33 +02:00
Sarina Canelake
0f45724c9a Convert shopping cart to use unicode lazy logging 
Conflicts:
	lms/djangoapps/shoppingcart/views.py
 2015-02-04 10:53:01 +02:00
Omar Al-Ithawi
4e733c6e1f Unicode fixes for log messages and other things 2015-02-04 09:55:44 +02:00
muzaffaryousaf
e5a440ef7a Refactoring the mocked user service. 
TNL-836
 2015-02-04 12:32:38 +05:00
Chris
6266dcf1e7 Merge pull request #6820 from edx/clrux/forums-assign-regions 
Assign regions/landmarks for easier navigation
 2015-02-03 16:03:18 -05:00
Diana Huang
3b6af2df60 Merge pull request #6120 from edx/dkh/add-description-field 
Backfill course_modes migration
 2015-02-03 15:34:11 -05:00
Brian Talbot
89a05d8880 Upgrading Font Awesome vendor files from 4.2.0 to 4.3.0 2015-02-03 15:21:20 -05:00
Will Daly
aa2406d3c8 Merge pull request #6884 from edx/will/ecom-1013-part-2 
Show requirements message when there is no verification deadline.
 2015-02-03 14:45:38 -05:00
Will Daly
aa404cacaf Show requirements message when there is no verification deadline. 2015-02-03 14:40:18 -05:00
Calen Pennington
dcbfb1d78f Backfill migration of course_modes to add the description field 2015-02-03 14:13:41 -05:00
cahrens
48474eba83 Delete unused student_profile API. 2015-02-03 13:51:11 -05:00
cahrens
c84195867b Delete unused student_profile API. 2015-02-03 13:45:22 -05:00
Ben Patterson
b6256def99 Merge pull request #6814 from edx/benp/lms-one-shard 
LMS Acceptance to one shard.
 2015-02-03 13:41:09 -05:00
Sarina Canelake
41475d462c Merge pull request #6876 from Stanford-Online/giulio/course-price-upstream 
Add cosmetic price field to studio & logic
 2015-02-03 13:34:12 -05:00
Awais Qureshi
22af2b75af ECOM-890: Update invoice data model. 
ECOM-891: Allow tracking of invoice transactions.

Authors: Awais Qureshi and Aamir Khan
 2015-02-03 13:27:40 -05:00
Will Daly
4c2a05419a Merge pull request #6878 from edx/will/ecom-1031 
ECOM-1031: Show requirements in upgrade step of the decoupled verify/payment flow
 2015-02-03 12:52:47 -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
Will Daly
6fa7815f89 Merge pull request #6872 from edx/will/country-access-message-theme 
Country access messaging theme fixup
 2015-02-03 11:44:05 -05:00
Will Daly
c414b60bbb ECOM-1031: Show requirements in upgrade step of the decoupled verify/payment flow 2015-02-03 11:20:33 -05:00
Akiva Leffert
d34f8a7289 Merge pull request #6873 from edx/waheed/tnl1304-fix-multiple-textbook-links 
Fixed multiple textbooks links to only last uploaded textbook.
 2015-02-03 11:11:38 -05:00
Marco Morales
e061024557 Merge pull request #6849 from edx/marco/discussions-endorse/font-awesome-fix 
Fixes broken answer and endorse icons on discussion forums
 2015-02-03 10:44:50 -05:00
Chris Rodriguez
66f909cd50 Assigning regions to forum areas and adding ARIA to new post form 2015-02-03 10:34:37 -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
Ben Patterson
ebc86895ea Merge pull request #6874 from edx/revert-6182-giulio/course-price-upstream 
Revert "Add Cosmetic Display Price field to studio & logic to show it"
 2015-02-03 10:32:41 -05: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
Will Daly
ce9c258f8b Update country access message end-points to be backwards compatible with embargo theme templates 
Move default country access messages out of static_templates, so they are not served by other Django views.
 2015-02-03 08:59:41 -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
Sarina Canelake
6ce7f96f16 Merge pull request #6869 from edx/sarina/fix-footer-css 
LMS: correcting poorly scoped font-family rule for footer links inside o...
 2015-02-02 19:22:50 -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
Ben Patterson
6708ed8fa6 This test no longer follows modern workflows. Disabling. TE-736. 
Also cleaning up some lint.
 2015-02-02 16:05:55 -05:00
Ben Patterson
c83ea18d91 Fix test failing under one shard. 
This test consistently fails when combining
lms acceptance onto one shard. (TE-737)
 2015-02-02 16:05:55 -05:00