Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,629 Commits 1 Branch 0 Tags
dca9a554cf0ec75f58f281ad1db4e8f2028d2ace
Commit Graph

26629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
dca9a554cf Remove extra whitespace from textarea fields in registration form 2014-11-10 08:18:43 -05:00
Will Daly
a13f4f2fe6 Merge pull request #5766 from edx/will/logistration-feature-flag 
Put logistration page behind a feature flag
 2014-11-07 14:16:03 -05:00
AlasdairSwan
b77fc22fd1 Merge pull request #5887 from edx/alasdair/logistration-error-scroll 
Updated so is submission prevented by JS due to errors it scrolls to the...
 2014-11-07 13:46:14 -05:00
AlasdairSwan
a1f8211e5f Updated so is submission prevented by JS due to errors it scrolls to the error messages 2014-11-07 13:42:28 -05:00
Will Daly
578c04f62f Put logistration page behind a feature flag 2014-11-07 13:05:17 -05:00
Will Daly
4c51f8731f Merge pull request #5883 from edx/will/logistration-enrollment-cleanup 
Logistration: enrollment cleanup and a few fixes
 2014-11-07 13:03:06 -05:00
Will Daly
e629ce2ba6 Move redirection/enrollment to AccessView and trigger it using an event. 
Ensure window.isExternal is loaded

Don't set a default for terms of service

For paid courses, add the course to the cart and redirect to the shopping cart view.

Don't send form method and url as form data.

Stub window.analytics in the access view test.
 2014-11-07 12:59:08 -05:00
Renzo Lucioni
1a5cc86783 Merge pull request #5877 from edx/renzo/test-validation-utility 
Jasmine tests of validation utility
 2014-11-07 10:45:23 -05:00
Renzo Lucioni
bedd6cc2f5 Jasmine tests of validation utility 
Includes a modification of validation logic which performs min and max length checks on optional fields in addition to required fields.
 2014-11-07 10:44:25 -05:00
AlasdairSwan
e7e2574754 Merge pull request #5872 from edx/alasdair/logistration-form-errors-and-submit-methods 
Moved to setting ajaxType with passed in method for models and now handl...
 2014-11-07 08:48:20 -05:00
Renzo Lucioni
0459094968 Fix logistration Jasmine tests 
Includes several bug fixes caught during test writing, general clean-up, and adds js-url, a lightweight URL parser
Moved to setting ajaxType with passed in method for models and now handling form load fail errors
Added tests.
 2014-11-07 08:47:16 -05:00
Renzo Lucioni
a86c80bb3c Merge pull request #5857 from edx/renzo/add-js-tests 
Fix logistration Jasmine tests
 2014-11-06 14:22:43 -05:00
Renzo Lucioni
f9ecd8849a Fix logistration Jasmine tests 
Includes several bug fixes caught during test writing, general clean-up, and adds js-url, a lightweight URL parser
 2014-11-06 12:07:49 -05:00
Renzo Lucioni
d512fe8673 Merge pull request #5859 from edx/renzo/track-form-expansions 
Track logistration form toggles and password reset form views
 2014-11-06 10:05:52 -05:00
Renzo Lucioni
5edb7b9c87 Track logistration form toggles and password reset form views 2014-11-06 10:00:42 -05:00
Renzo Lucioni
5d1143ad06 Merge pull request #5858 from edx/renzo/resource-conflict-error-messages 
Return more helpful error messages when a resource conflict occurs
 2014-11-06 09:52:32 -05:00
Renzo Lucioni
edba397a20 Return more helpful error messages when a resource conflict occurs 2014-11-05 22:36:27 -05:00
AlasdairSwan
8a0507c977 Merge pull request #5854 from edx/alasdair/logistration-accessibility 
Updated templates in light of accessibility review
 2014-11-05 16:05:39 -05:00
AlasdairSwan
25b53c1d02 Merge pull request #5852 from edx/alasdair/logistration-utils-bug 
Fixed bug with validation templates expecting number but being passed st...
 2014-11-05 16:02:21 -05:00
AlasdairSwan
62b5e27cf9 Updated templates in light of accessibility review 2014-11-05 15:53:55 -05:00
AlasdairSwan
d0b1a8ec06 Fixed bug with validation templates expecting number but being passed string. 2014-11-05 15:40:38 -05:00
AlasdairSwan
5dc5f5f9b2 Merge pull request #5849 from edx/alasdair/logistration-form-order-update 
ECOM-587 and ECOM-585 Switched tab order based on url and on selection o...
 2014-11-05 11:49:04 -05:00
AlasdairSwan
8a62991ff9 ECOM-585, ECOM-587 and ECOM-588 Changed order of forms based on url, fixed tabbing issue with forgot password link and moved third party quth error message so now does not load buttons if they do not have a url 2014-11-05 11:47:26 -05:00
AlasdairSwan
864040eeb9 Merge pull request #5839 from edx/alasdair/logistraion-css-fix 
ECOM-583 Fixes the CSS bugs
 2014-11-04 15:36:39 -05:00
AlasdairSwan
588e1db629 ECOM-583 Fixes the CSS bugs 2014-11-04 14:56:34 -05:00
Renzo Lucioni
1de92697f7 Merge pull request #5771 from edx/renzo/flip-access-view 
Flip order of register and login options in the access view
 2014-11-04 14:01:16 -05:00
Renzo Lucioni
fca44138dd Flip order of register and login options in the access view 2014-11-04 13:59:44 -05:00
Diana Huang
a971e71792 Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/course_modes/views.py
 2014-11-04 10:50:09 -05:00
Renzo Lucioni
664c901e16 Merge pull request #5830 from edx/renzo/test-user-api-password-reset 
Fix tests of user API views
 2014-11-03 10:27:41 -05:00
Renzo Lucioni
a60213c814 Fix tests of user API views 2014-11-03 10:14:31 -05:00
Diana Huang
8d7d9d212f Merge pull request #5762 from edx/diana/enrollment-integration 
WIP: Combined Login/Registration: Set up basic enrollment infrastructure.
 2014-10-30 17:18:07 -04:00
Diana Huang
47979e5bcf Add tests for the enrollment_interface 2014-10-30 17:15:26 -04:00
Diana Huang
fc468bf696 Set up basic enrollment infrastructure. 2014-10-30 17:15:26 -04:00
Renzo Lucioni
471f513566 Merge pull request #5770 from edx/renzo/logistration-i18n 
i18n logistration
 2014-10-30 14:20:08 -04:00
Renzo Lucioni
4157e5c0f6 i18n logistration 2014-10-30 14:09:15 -04:00
AlasdairSwan
ff753f2bcb Merge pull request #5784 from edx/alasdair/rwd-header-and-footer 
Alasdair/rwd header and footer
 2014-10-30 09:21:21 -04:00
AlasdairSwan
0c22db688f ECOM-406 removed commented out code, moved colours to variables and fixed hover state for mobile menu 2014-10-30 09:20:48 -04:00
Renzo Lucioni
63ea30da9f Merge pull request #5785 from edx/renzo/copy-changes 
Clean up logistration copy
 2014-10-29 15:11:47 -04:00
Renzo Lucioni
bcef7611d4 Clean up logistration copy 2014-10-29 14:42:57 -04:00
AlasdairSwan
e04a3ab32b ECOM-406 Added JS fil that will update DOM to make the header and footer responsive 
Made the header and footer responsive
 2014-10-29 14:00:54 -04:00
Will Daly
c553a47c26 Update third party auth on the logistration form 2014-10-28 17:00:48 -04:00
Diana Huang
13986d8475 Update tests to match new text. 2014-10-28 16:28:58 -04:00
Will Daly
48bc4776be Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/third_party_auth/__init__.py
	common/djangoapps/third_party_auth/pipeline.py
 2014-10-28 15:16:27 -04:00
Will Daly
f9b5a9173f Redirect users to the track selection page or ?next page when using third party auth 
Set marketing site logged in cookie from third party auth.
 2014-10-28 10:28:30 -04:00
AlasdairSwan
c47eb12ad3 Merge pull request #5757 from edx/alasdair/logistration-rwd 
Alasdair/logistration rwd
 2014-10-28 10:24:39 -04:00
AlasdairSwan
728df71acf ECOM-531 Updated style after review with Andy Waldrop 2014-10-28 10:20:44 -04:00
AlasdairSwan
a9a4057dab Merge pull request #5718 from edx/alasdair/logistration-t-and-c 
ECOM-466 Added support for custom error messages. Styled select widths
 2014-10-27 15:22:24 -04:00
AlasdairSwan
fd14406aed ECOM-369 merged and resolved issues with third party auth error messaging 2014-10-27 15:19:36 -04:00
AlasdairSwan
1b1eb78123 ECOM-369 Styled third party auth buttons and cleaned up third party auth messaging 2014-10-27 15:19:07 -04:00
AlasdairSwan
d2accb6d34 ECOM-369 Added handling of model save errors. Updated FormView to add preRender function to limit amount of duplicate code. Updated PasswordResetModel to return error object when errors occur. 2014-10-27 15:19:07 -04:00