Commit Graph

10416 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
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
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
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
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
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
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
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
040f96223c Update for split modulestore as default. 2015-02-09 10:00:14 -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
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
6272817c07 Tests fail with split modulestore.
Have not been able to work out why.
2015-02-09 09:26:05 -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
Mat Moore
d857695d62 Vote buttons should be disabled while in use
Clicking quickly on up/down votes in forums generates a race condition
where the votes can continue going up or down (and I can get e.g. large
negative numbers). This is client-side; the server-side is not affected.

This is caused by safeAjax calling code (including updateWithUndo) not
handling the possible undefined return value. This is returned in the case
where the element that triggers the event is already disabled.

Corrected typo in DiscussionThreadView cleanup: @responseRequest -> @responsesRequest

Resolves TNL-1061
2015-02-07 09:52:39 +00:00
Jesse Zoldak
3f1604ac28 Merge pull request #6736 from edx/zoldak/content-library
Fix flaky content library test
2015-02-06 15:54:54 -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
John Eskew
46f64305f7 Merge pull request #6767 from edx/jeskew/split_course_export_slowdown_take_II
Fix performance problem with Split course import/export.
2015-02-06 15:18:26 -05:00
Jesse Zoldak
07e0eee2bd Fix flaky content library test 2015-02-06 14:59:31 -05:00
zubair-arbi
b01f7adce1 Merge pull request #6907 from edx/zub/bugfix/tnl-1335-html5-contextual-menu
fix contextual menu (make it clickable) for HTML5 videos
2015-02-06 21:38:09 +05:00
John Eskew
9388ba5968 Change new BlockData object from a dict to an object with specific
attributes that are serialized/de-serialized to/from MongoDB.

Change access of attributes from dict keys.

Add EditInfo object to encapsulate editing info for block data.
2015-02-06 11:28:54 -05:00
Calen Pennington
79fe947a92 Add test of PLAT-417 2015-02-06 09:59:49 -05:00
zubair-arbi
a750476c73 fix contextual menu (make it clickable) for HTML5 videos
TNL-1335
2015-02-06 16:18:09 +05:00
ahsan-ul-haq
c814323644 Merge pull request #6810 from edx/ahsan/tnl-1074-adaptive-hint-inaccessible
Problem with Adaptive Hint is inaccessible
2015-02-06 15:15:11 +05:00
Syed Hassan Raza
806a3d9af2 Quote the starts with expression id^
TNL-1240
2015-02-06 11:53:04 +05:00
Brian Talbot
5785df241d Merge pull request #6875 from edx/talbs/update-font-awesome-4.3
Upgrade: Font Awesome 4.3.0
2015-02-05 12:38:49 -05:00
polesye
d02d3b7926 TNL-1299: Update default video. 2015-02-05 10:55:36 +02: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
Akiva Leffert
50730da1b6 Merge branch 'release' 2015-02-04 13:14:29 -05:00
Ahsan Ulhaq
8f71cb6015 Adaptive hint inaccessible
Remove the <p> and label from textline

tnl-1074
2015-02-04 21:42:20 +05:00
Ahsan Ulhaq
9b9301a5d4 Problem with Adaptive Hint is inaccessible
There were no label added for problem with adaptive hint so for the question
added the label and insteat of using for attribute used the label as the
parent of input field

TNL-1074
2015-02-04 21:41:25 +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
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
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
Sarina Canelake
01064fcc79 Fix logging calls to use unicode, and lazy logging 2015-02-04 10:53:33 +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
Brian Talbot
89a05d8880 Upgrading Font Awesome vendor files from 4.2.0 to 4.3.0 2015-02-03 15:21:20 -05:00
Calen Pennington
dcbfb1d78f Backfill migration of course_modes to add the description field 2015-02-03 14:13:41 -05:00