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

10188 Commits

Author SHA1 Message Date
Will Daly
5e732ea25c Country Access: Block enrollment from third party auth 
Users who are blocked from enrolling in a course
due to an embargo are redirected to the blocked
message page after authentication completes.
 2015-02-11 13:18:15 -05:00
Martyn James
c668be3133 Merge pull request #6855 from edx/dsego/SOL-260 
Courseware search: Change name of results page from "Searching [course n...
 2015-02-10 11:02:27 -05:00
Ben Patterson
630801c72c An upgrade to verified should emit a mode_changed event. 
This change will also move us to bok-choy instead of lettuce for
these scenarios, and re-enable them. See TE-736.

Includes some refactoring of repeated event-checking code as well.
 2015-02-10 09:39:22 -05:00
Will Daly
847f56d160 Merge pull request #6927 from edx/will/invoice-transaction-history 
Add InvoiceHistory model to record changes to invoices
 2015-02-09 13:16:49 -05:00
Adam
2057f7db38 Merge pull request #6929 from edx/release 
Release
 2015-02-09 11:14:41 -05:00
Will Daly
8fba97ead5 Add InvoiceHistory model to record changes to invoices, invoice items, and invoice transactions. 2015-02-09 11:02:10 -05:00
Christina Roberts
4a5679b1df Merge pull request #6762 from edx/christina/split-default 
Enable split for new courses.
 2015-02-09 10:58:40 -05:00
Will Daly
b22b0a35be Merge pull request #6924 from edx/will/ECOM-1045 
ECOM-1045: Add messaging for when students miss the verification deadline
 2015-02-09 10:02:19 -05:00
cahrens
d86c7bec3c Update for renamed test split modulestore. 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
c56c88be4a create_xmodule was renamed to create_xblock, and mixed modulestore has create_xblock method. 
Split modulestore throws duplicate errors if course locator is not unique.
 2015-02-09 10:00:32 -05:00
cahrens
7a64e6f69f Support running test with split modulestore as the default. 
With split, "name" returns "course" instead of the run name.
 2015-02-09 10:00:32 -05:00
cahrens
974eb8a28d Enforce old mongo for test cases doing locator comparisons. 2015-02-09 10:00:31 -05:00
cahrens
040f96223c Update for split modulestore as default. 2015-02-09 10:00:14 -05:00
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
0da4b13f25 Add messaging for when students miss the verification deadline 
Show ordinary receipt unless the student is in the payment flow.
 2015-02-08 14:35:11 -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
Will Daly
095b96b041 Fix unicode error when sending confirmation email in shopping cart 
Wrap send email operation in try/except to avoid rolling back the transaction once a user has paid.
 2015-02-06 15:20:59 -05:00
Calen Pennington
4851062987 Don't instantiate bogus modulestores just to get template rendering in old ORA 2015-02-06 15:20:59 -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
Martyn James
e760d2d2d2 Update styles 2015-02-06 11:11:37 -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
Martyn James
63e9bd55ba Added confirmation that 'Search Results' appears 2015-02-05 13:24:03 -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