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

10168 Commits

Author SHA1 Message Date
cahrens
5b0d150fe9 Update to work with split_modulestore. 
Cannot hold on to xblock references.
 2015-02-09 09:26:05 -05:00
cahrens
5fb30f333a Clean up test to work with split modulestore. 
Get updated xblocks from modulestore before checking properties.
 2015-02-09 09:26:04 -05:00
cahrens
9e6249ddd6 Enable split for new courses. 2015-02-09 09:26:04 -05:00
Will Daly
b59aa85166 Remove submission of verification attempt in shopping cart, since it's no longer needed with the new payment/verification flow. 2015-02-07 10:34:45 -05:00
Waheed Ahmed
1e824a2d46 Fixed close button for help feedback menu. 
TNL-1336
 2015-02-07 01:38:09 +05:00
Muhammad Ammar
b83ed09f22 Merge pull request #6870 from edx/ammar/tnl-1244 
Change column name in grade report
 2015-02-06 21:21:32 +05:00
Anton Stupak
81d51f9671 Merge pull request #6897 from edx/anton/edxnotes-fix-deps 
TNL-1353: Fix annotator dependency.
 2015-02-06 13:31:40 +02:00
muhammad-ammar
b93dcea315 Change column name in grade report 
TNL-1244
 2015-02-06 09:16:32 +05:00
Jesse Zoldak
1920a60c97 Fix pep8 violation 2015-02-05 12:16:28 -05:00
Jesse Zoldak
7eb5f627d6 Use new modulestore override paradigm in the new testcase 2015-02-05 10:09:05 -05:00
polesye
c88aad557a TNL-1353: Fix annotator dependency. 2015-02-05 15:51:30 +02:00
polesye
d02d3b7926 TNL-1299: Update default video. 2015-02-05 10:55:36 +02:00
Will Daly
aba0fcd84d Merge pull request #6894 from edx/will/better-logging-for-cert-cmds 
Info-level logging for certificate management commands
 2015-02-04 21:47:01 -05:00
Will Daly
a8df217a32 Add info-level logging for the management commands used to generate certificates. 2015-02-04 19:41:27 -05: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
Sarina Canelake
562842d235 Merge pull request #6895 from edx/sarina/privacy-date 
Update privacy policy date to the most recent
 2015-02-04 15:11:54 -05:00
Sarina Canelake
d68ddb6db6 Update privacy policy date to the most recent 2015-02-04 13:51:32 -05:00
Akiva Leffert
50730da1b6 Merge branch 'release' 2015-02-04 13:14:29 -05:00
David Baumgold
d644da9ecd Merge pull request #6890 from edx/i18n-aria-labels 
Internationalize aria-label attributes
 2015-02-04 12:11:37 -05:00
ahsan-ul-haq
3b6e76ce82 Merge pull request #6808 from edx/ahsan/tnl-1076-change-name-modal-accessibilty 
Change name and email modal couple of accessibilty issues
 2015-02-04 21:37:07 +05:00
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
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
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
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
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
Will Daly
aa404cacaf Show requirements message when there is no verification deadline. 2015-02-03 14:40:18 -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
b71c20c031 Revert "Add Cosmetic Display Price field to studio & logic to show it" 2015-02-03 09:41:54 -05:00