Commit Graph

9928 Commits

Author SHA1 Message Date
Stephen Sanchez
db9bb20c25 Merge pull request #6138 from edx/sanchez/fix_register_email_opt_in
Allowing email optin to work on register.
2014-12-04 14:08:57 -05:00
chrisndodge
f7f9bec6ea Merge pull request #5774 from edx/cdodge/shopping-cart-touchups
Cdodge/shopping cart touchups
2014-12-04 14:02:19 -05:00
Will Daly
3c5da9d3ea Merge pull request #6077 from edx/will/enable-logistration
Login/Registration A/B test cleanup
2014-12-04 11:47:20 -05:00
stephensanchez
7c78a0999a Code review comments 2014-12-04 16:16:32 +00:00
Will Daly
988753395f Add support for external auth on the combined login/registration page
Add support for redirect URLs in third party auth for combined login/registration page

Remove old login/registration acceptance tests

Add deprecation warnings to old login and register views

Move third party auth util to student_account

Add exception for microsites
2014-12-04 09:34:51 -05:00
Muhammad Shoaib
cd30164b5f Improvements and bug fixes for shopping cart: WL-117, WL-114, WL-116, WL-115, WK-122 2014-12-04 01:11:49 -05:00
stephensanchez
79ca56c3db Allowing email optin to work on register. 2014-12-03 22:47:40 +00:00
stephensanchez
f993a48490 Only allow users who turned 13 before this year began to opt in. 2014-12-03 20:36:28 +00:00
Will Daly
f0e6cdd3d7 Merge pull request #6110 from edx/will/email-opt-in-analytics
Add management command to create the email opt-in list.
2014-12-03 09:20:47 -05:00
Will Daly
f40447b3c8 If feature flag is enabled, replace the old login/registration pages with the new combined login/registration page. 2014-12-03 08:00:33 -05:00
Will Daly
61ecae9871 Add management command to create the email opt-in list. 2014-12-03 07:54:38 -05:00
Will Daly
84301e7698 Merge pull request #6070 from edx/will/verified-messaging-per-course
Student verification status
2014-12-02 16:08:25 -05:00
Will Daly
464dfcfabc Show student verification status on the dashboard. 2014-12-02 09:42:24 -05:00
Jesse Zoldak
17379f4079 Merge pull request #6078 from edx/zoldak/modulestore-test-refactor
Clean up all modulestore testcases
2014-12-02 08:53:41 -05:00
Shrhawk
0f3bce02a0 Merge pull request #5888 from Shrhawk/shr/bug/TNL-590-encode-error
Handle Unicode for Incoming Keys
2014-12-02 17:53:47 +05:00
Jesse Zoldak
121b31309d Small fixes to modulestore test refactoring 2014-12-02 07:09:37 -05:00
Jesse Zoldak
bf3b87bc64 Clean up all modulestore testcases
Move modulestore config for tests to an importable location
Disable pylnt warning for lms imports in common tests
Refactor all testcases that loaded all xml courses
TE-610
TE-489
2014-12-02 07:09:36 -05:00
Jesse Zoldak
8c946f8b37 Merge pull request #6104 from edx/zoldak/heartbeat-mock-tests
Mock the modulestore for the heartbeat tests
2014-12-02 06:51:31 -05:00
Jesse Zoldak
6f1bccd565 Mock the modulestore for the heartbeat tests 2014-12-01 20:18:08 -05:00
Renzo Lucioni
28186e233c Merge pull request #6062 from edx/renzo/email-opt-in
Updating the marketing iframe, courseware views, and student views for email opt-in
2014-12-01 17:22:49 -05:00
Renzo Lucioni
8961ec4f35 Update the student views to accept the email_opt_in parameter
Includes tests checking that the student views integrate with the profile API as expected.
2014-12-01 15:57:40 -05:00
Stephen Sanchez
de1c054187 Merge pull request #6079 from edx/sanchez/logistration-opt-in
Hooking the logistration page into the new HTTP endpoint for email opt in
2014-12-01 13:57:36 -05:00
stephensanchez
32c9230cd1 Hooking the logistration page into the new HTTP endpoint for email opt in.
Update the PR based on Code Review comments, and additional tests.

Using underscore js
2014-12-01 17:25:57 +00:00
Sarina Canelake
aa04bef9c8 s/pylint: disable=W0223/pylint: disable=abstract-method/ 2014-12-01 11:22:13 -05:00
Sarina Canelake
2cbdb50946 s/pylint: disable=W0142/pylint: disable=star-args/ 2014-12-01 11:22:13 -05:00
Sarina Canelake
1dd7cf6946 s/pylint: disable=W0603/pylint: disable=global-statement/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
3c364193bb s/pylint: disable=W0104/pylint: disable=pointless-statement/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
520935209d s/pylint: disable=W0402/pylint: disable=deprecated-module/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
13946fb844 s/pylint: disable=W0511/pylint: disable=fixme/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
f663a7fe8d s/pylint: disable=W0612/pylint: disable=unused-variable/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
7aab4151bb s/pylint: disable=W0201/pylint: disable=attribute-defined-outside-init/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
0c7b60b82b Remove 'pylint: disable=W0232' because we ignore this warning in pylintrc 2014-12-01 11:22:12 -05:00
Sarina Canelake
7229ef92ee s/pylint: disable=W0212/pylint: disable=protected-access/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
ff18b7d01a s/pylint: disable=W0611/pylint: disable=unused-import/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
d406261e4b s/pylint: disable=W0614/pylint: disable=unused-wildcard-import/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
5f723e8d3c s/pylint: disable=W0703/pylint: disable=broad-except/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
f223ac8404 s/pylint: disable=W0401/pylint: disable=wildcard-import/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
c54a71feb5 s/pylint:disable/pylint: disable/ (formatting fix) 2014-12-01 11:22:11 -05:00
Sarina Canelake
c0556a7ef8 s/pylint: disable=W0613/pylint: disable=unused-argument/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
e15d4aea71 s/pylint: disable=F0401/pylint: disable=import-error/ 2014-12-01 11:22:10 -05:00
Sarina Canelake
d14c39a13e Fix exposed pylint violations 2014-12-01 11:22:10 -05:00
Sarina Canelake
e8b336efef s/pylint: disable=E1121/pylint: disable=too-many-function-args/ 2014-12-01 11:22:10 -05:00
Sarina Canelake
c904bd70cd s/pylint: disable=E0604/pylint: disable=invalid-all-object/ 2014-12-01 11:22:10 -05:00
Sarina Canelake
1e0f3ddb7d s/pylint: disable=E1111,E1124/pylint: disable=assignment-from-no-return,redundant-keyword-arg/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
b4d24f36c8 s/pylint: disable=E1103/pylint: disable=maybe-no-member/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
b8c16d5ed7 s/pylint: disable=E1120/pylint: disable=no-value-for-parameter/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
19f1dacab2 s/pylint: disable=E1101/pylint: disable=no-member/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
134effa840 Remove outdated pylint disable 2014-12-01 11:22:09 -05:00
Sarina Canelake
b127d2844b s/pylint: disable=C0103/pylint: disable=invalid-name/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
20e2ee9a57 s/pylint: disable=E0611/pylint: disable=no-name-in-module/ 2014-12-01 11:22:09 -05:00