Commit Graph

28505 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
Will Daly
6ba6afced8 Merge pull request #6943 from edx/will/country-access-api-changes
Finish Country Access (Part 1 of 3)
2015-02-10 12:57:48 -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
Martyn James
a46b4daf7f Merge pull request #6937 from edx/mjames/SOL-353
Reorganise reindexing operation
2015-02-10 10:58:49 -05:00
Ben Patterson
2ddc90cbc5 Merge pull request #6886 from edx/benp/change-enrollment-event-tests
An upgrade to verified should emit a mode_changed event.
2015-02-10 10:54:30 -05:00
Will Daly
98ee3a5377 Implement IP filtering in embargo middleware.
Add history table for course access rule changes.

Provide test utility for simulating restricted access.

Provide `redirect_if_blocked` method for integration with other
parts of the system (will be used for blocking enrollment).

Add info-level logging explaining when and why users are blocked.
2015-02-10 10:47:51 -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
Ben Patterson
0f92b092fb Merge pull request #6940 from open-craft/flaky-lib-users-tests
Disabled flaky JS tests pending refactor to Backbone
2015-02-10 07:55:22 -05:00
ahsan-ul-haq
c7c3e44076 Merge pull request #6932 from edx/ahsan/tnl-1073-Placeholder-text-iframe-inaccessible-content
Placeholder text for <iframe> encourages inaccessible content
2015-02-10 16:35:35 +05:00
Martyn James
181d0e46c5 Reorganise reindexing operation 2015-02-09 22:13:25 -05:00
Braden MacDonald
2982ecd40d Disabled flaky JS tests pending refactor to Backbone 2015-02-09 15:00:17 -08:00
Will Daly
2c60a1d546 Merge pull request #6934 from edx/will/fix-embargo-migration
Fix embargo migration to the new data models.
2015-02-09 16:16:30 -05:00
Will Daly
7e746f7df0 Fix embargo migration to the new data models.
The previous version of this migration incorrectly handled
disabled configuration.  When configuration is disabled,
the embargoed country field was the empty string; calling
str.split(",") produced a list with a single empty list entry,
which is not a valid country code.
2015-02-09 14:08:35 -05:00
Waqas Khalid
78deaed245 Merge pull request #6445 from MatMoore/forum_vote_race_condition
Vote buttons should be disabled while in use
2015-02-09 23:51:59 +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
Waheed Ahmed
268280dfb5 Merge pull request #6908 from edx/waheed/tnl1352-fix-login-if-user-none-with-advanced-security-on
Fixed ajax login when advanced security check is on for NoneType user.
2015-02-09 22:28:54 +05:00
Adam
2057f7db38 Merge pull request #6929 from edx/release
Release
2015-02-09 11:14:41 -05:00
Waheed Ahmed
cb88c1dd66 Fixed ajax login when advanced security check is on for NoneType user.
TNL-1352
2015-02-09 21:14:06 +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
Ahsan Ulhaq
cded2eb546 Changes in iframe placeholder text 2015-02-09 20:46:08 +05:00
Ahsan Ulhaq
4198b0a33f Placeholder text for <iframe> encourages inaccessible content
Iframe unit in the studio have accesibility issue as there was no title for
Iframe provided as well as placeholder does not specify what changes to made
to add new iframe

TNL-1073
2015-02-09 20:41:32 +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
d88b0c488e store.has_course fails on old mongo with unicode chars.
xml_importer now calls store.has_course even if create_course_if_not_present is False.
2015-02-09 10:00:33 -05:00
cahrens
78a8fd807a If existing course is found on import, make sure dest_course_id is correct.
TNL-1362
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
a89304b991 Cleanup to make tests agnostic to the modulestore being used. 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
f5d3d6050d Test of draft content depends on old mongo. 2015-02-09 10:00:12 -05:00
Adam
e2f67b5cfb Merge pull request #6892 from edx/hotfix/2015-02-04
Don't instantiate bogus modulestores just to get template rendering in o...
2015-02-09 09:47:10 -05:00
Awais Qureshi
a17a5374b2 Merge pull request #6915 from edx/aamir-khan/ECOM-996-country-access-settings
Aamir khan/ecom 996 country access settings
2015-02-09 19:33:52 +05:00
cahrens
840b42a9f1 Specify old mongo modulestore.
Testing migration from old mongo to split.
2015-02-09 09:26:06 -05:00
cahrens
b5e798062b Specify old mongo modulestore.
Tests verify operation counts for old mongo. Should be extended to split in the future.
2015-02-09 09:26:06 -05:00
cahrens
818a950815 Change to work with split modulestore.
Cannot create an xblock in a course that doesn't exist.
2015-02-09 09:26:05 -05:00
cahrens
e9f2f626ca Change to work with split modulestore.
make_asset_key does not start with "/" for split locators.
2015-02-09 09:26:05 -05:00
cahrens
7a3a48b15b Update to work with split_modulestore.
"run" should not be passed in kwargs to create.
2015-02-09 09:26:05 -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
6272817c07 Tests fail with split modulestore.
Have not been able to work out why.
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
29e235213c Update for default store being split.
Note that now 2 courses can be imported where the only difference between them is run.
2015-02-09 09:26:04 -05:00
cahrens
e66e2eda20 Use old mongo store to create courses.
export_courses_to_output_path uses old mongo locator to create directory structure.
2015-02-09 09:26:04 -05:00
cahrens
4e6c532717 Force usage of the old mongo modulestore.
The way that assets are accessed (the usage of _id) seems specific to old mongo and fails with split.
2015-02-09 09:26:04 -05:00
cahrens
9e6249ddd6 Enable split for new courses. 2015-02-09 09:26:04 -05:00
Calen Pennington
61f86369ad Merge pull request #6843 from cpennington/test-for-plat-417
Add tests of PLAT-417
2015-02-09 09:15:12 -05:00
Will Daly
92c2fdbca1 Add new models to embargo to support country access
Add Django admin UI for configuring country access

Migrate existing embargo rules into the new tables.

ECOM-996: updated the middleware to use new models and access rules

ECOM-996: added the flag to support old and new formats

ECOM-996: added the api layer for country access settings

ECOM-996: added the api layer for country access settings

ECOM-996 implementing the white and blacklist checks.

ECOM-996 minor re-factoring in api.

ECOM-996 minor re-factoring in api.

ECOM-1025 refactoring the code according to PR feedback.

ECOM-1025 refactoring the code according to PR feedback.

ECOM-1025 deleting cache in model save and delete methods

ECOM-1025 adding basic api test cases file.

ECOM-1025 refactoring the code according to PR feedback.

ECOM-1025 refactoring the code according to PR feedback.

ECOM-1025 refactoring the code according to PR feedback. adding the test cases.

ECOM-1025 removing extra line

ECOM-1025 removing un-used function.

ECOM-1025 removing un-used function.

ECOM-1025 re-factor the code.

ECOM-1025 re-name the test file to test_middleware_access_rules.py. we already had old test_middleware.py

ECOM-1025 adding test cases for newly added models.

ECOM-1025 adding test cases and resolve conflicts.

ECOM-1025 fixing the quality and pep-8 issues.

ECOM-1025 re-factoring the code according to the PR feedback.

ECOM-1025 re-name the variable name.

ECOM-1025 removing the _check_ip_lists and its test cases. also added few missing scenarios test cases.

ECOM-1025 removing un-used line.
2015-02-09 18:28:10 +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