Commit Graph

948 Commits

Author SHA1 Message Date
Will Daly
70ec4c5f66 Merge pull request #6948 from edx/will/country-access-part-2
Finish Country Access (Part 2 of 3)
2015-02-11 13:15:38 -05:00
Awais Qureshi
f3c3202341 Merge pull request #6931 from edx/awais786/ECOM-1028-add-profile-linkedin
ECOM-1028 adding linked-in button , config model and migration for linke...
2015-02-11 20:45:30 +05:00
Awais
57ef60de0a ECOM-1028 adding linked-in button , config model and migration for linked url.
ECOM-1028 update the migration and move the code into class method.
2015-02-11 19:09:30 +05:00
Adam
296167e531 Merge pull request #6950 from edx/release
Release
2015-02-10 16:06:24 -05:00
Will Daly
e609f982d7 Country Access: block enrollment
Block users from enrolling in a course if the user
is blocked by country access rules.

1) Enrollment via the login/registration page.
2) Enrollment from the marketing iframe (via student.views.change_enrollment)
3) Enrollment using 100% redeem codes.
4) Enrollment via upgrade.

This does NOT cover enrollment through third party authentication,
which is sufficiently complex to deserve its own commit.
2015-02-10 13:07:51 -05:00
Greg Price
12f89b3c2d Make registration endpoint CSRF exempt 2015-02-10 09:47:49 -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
cahrens
040f96223c Update for split modulestore as default. 2015-02-09 10:00:14 -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
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
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
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
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
Renzo Lucioni
a8bed5ce98 Make logistration generally available if feature flag is active
Makes logistration available at /login and /register as well as /accounts/login/ and /accounts/register/. In addition:

- Adds support for redirect URLs in third party auth for combined login/registration page
- Adds support for external auth on the combined login/registration page
- Removes old login and registration acceptance tests
- Adds deprecation warnings to old login and register views
- Moves third party auth util to student_account
- Adds exception for microsites (theming)
2015-01-30 13:28:30 -05:00
Renzo Lucioni
80589eab36 Remove old payment and verification flow
Removes old payment and verification endpoints, views, templates, and tests, making the new split flow the default. The SEPARATE_VERIFICATION_FROM_PAYMENT feature flag is also removed.
2015-01-29 10:56:25 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
stephensanchez
aed89e422a Improve Django Admin Panel for Course Access Roles. Related to ECOM-857. Allows internal staff to easily use the Django Admin view to create new finance and sales admins. 2015-01-13 21:57:28 +00:00
Braden MacDonald
6be35e0fc1 Merge pull request #6459 from edx/content-libraries
Content libraries MVP
2015-01-13 11:20:20 -08:00
stephensanchez
b188430679 Enable redeem codes.
Update the redeem code schema

Updating the redeem code schema.

Adding migration file.

Adding course mode support when redeeming a code.

Conflicts:
	lms/djangoapps/shoppingcart/views.py

Add sales admin privileges for redeem code generation.

Making sure redeem code URLs work for verified courses.

pep8 violations

Code Review and Test Cleanup changes

Added tests, fixed tests.

Updating the boolean checks in ecommerce template
2015-01-13 15:21:24 +00:00
E. Kolpakov
195d5b57bc pylint fixes 2015-01-12 09:58:51 -08:00
Aamir
ab06f37cfb Merge pull request #6521 from edx/aamir-khan/ECOM-528-donation-verified-courses
Aamir khan/ecom 528 donation verified courses
2015-01-12 20:46:11 +05:00
arbisoft
62ea486570 ECOM-528 updated the test cases 2015-01-12 15:55:06 +05:00
Jonathan Piacenti
eabd6c8d27 Quality check and test fixes. 2015-01-12 13:41:03 +03:00
Braden MacDonald
d38e69c69a Acceptance & Jasmine tests for library permissions editor 2015-01-12 13:37:59 +03:00
Braden MacDonald
c477bab6f4 Update the REST API course_team_handler to support library roles, fix bugs 2015-01-12 13:37:58 +03:00
Braden MacDonald
fefc70c405 Three levels of user permissions for content libraries:
Admin ("Instructor") - Can edit and assign permissions to other users
Normal ("Staff") - Can edit
User - Can view the library and use content from it but cannot edit it or its blocks.
2015-01-12 13:37:58 +03:00
arbisoft
50961fe5ad ECOM-528 code refactoring 2015-01-10 05:08:24 +05:00
Renzo Lucioni
10cb7f10fa Fix cosmetic issues with the split payment and verification flow
Use honor code ribbon if verification status is not missing, submitted, or approved; title column on payment confirmation page holding dollar amounts more appropriately
2015-01-09 13:13:00 -05:00
arbisoft
4dfabe9eb0 ECOM-528 removed the commented code in test cases 2015-01-09 20:10:19 +05:00
arbisoft
36626a2b8b ECOM-528 added test cases 2015-01-09 17:55:22 +05:00
arbisoft
fd76f3754c ECOM-528 added test cases 2015-01-09 16:29:35 +05:00
arbisoft
7eb8195c23 ECOM-528 added donation support for verified courses 2015-01-09 12:31:33 +05:00
arbisoft
7bdbf8f17c ECOM-528 added donation support for verified courses 2015-01-09 00:02:04 +05:00
arbisoft
99659ce3d4 ECOM-528 added donation support for verified courses 2015-01-08 14:52:31 +05:00
Julien Romagnoli
a80c09a9f2 Fix edX name hardcoded in password reset email 2015-01-05 11:27:56 -05:00
chrisndodge
91a4796216 Merge pull request #6196 from edx/muhhshoaib/WL-168
WL-168 When redeeming a Registration Code in the shopping cart, the user should be redirect to the Registration Code Redemption page
2015-01-01 10:00:06 -05:00
Will Daly
c183831b43 Merge pull request #6423 from edx/will/ecom-864
Hide verification messaging if the user has an active verification
2014-12-31 11:03:34 -08:00
Will Daly
01814c3983 Hide verification messaging if the user has an active verification 2014-12-31 13:01:56 -05:00
Muhammad Shoaib
5a437b396e WL-168 When redeeming a Registration Code in the shopping cart, the user should be redirect to the Registration Code Redemption page
improvements suggested by william
2014-12-31 17:45:31 +05:00
Will Daly
a90f7ab1bf Enter the new verification / payment flow using a GET param
Allow disabling of experiment
2014-12-30 13:36:25 -08:00
David Baumgold
4ec0295bab Improve i18n on the LMS dashboard course listing page
Adding translator comments to the dashboard.

Updating alt text to verification pending ribbon.

fix tests
2014-12-30 14:24:15 +00:00
Renzo Lucioni
c42c2573b0 Merge pull request #6259 from edx/renzo/split-verification-payment-hookup
Hook up new payment and verification flow
2014-12-19 13:29:13 -05:00
Afzal Wali
872dbb874b WL-172 Show a Order History list on the Student Dashboard for any PaidCourseRegistration or RegCodeItem that the user might have purchased 2014-12-17 16:19:06 -05:00
Renzo Lucioni
a268c91236 Hook up new payment/verification flow to dashboard, track selection page, and upgrade 2014-12-16 23:32:17 -05:00
David Baumgold
3bcf18dd59 Merge pull request #6153 from edx/db/update-pep8
Update pep8 to 1.5.7
2014-12-12 15:00:13 -05:00
David Baumgold
08a8afa619 For methods on PasswordHistory, only calculate if necessary
Check settings.FEATURES["ADVANCED_SECURITY"] first
2014-12-12 11:53:02 -05:00
Afzal Wali
51e53587dc WL-105 Show course cards sorted by start dates, oldest first. 2014-12-11 20:05:04 -05:00
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05:00