Commits · 04590949687bf8aa61b57f0483eb6c1e1ef80153 · edx / edx-platform

07 Nov, 2014 1 commit

Fix logistration Jasmine tests · 04590949

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.

committed Nov 07, 2014

04590949 Browse Files

06 Nov, 2014 6 commits
- Merge pull request #5857 from edx/renzo/add-js-tests · a86c80bb
```
Fix logistration Jasmine tests
```
  Renzo Lucioni committed Nov 06, 2014
  a86c80bb Browse Files
- Fix logistration Jasmine tests · f9ecd884
```
Includes several bug fixes caught during test writing, general clean-up, and adds js-url, a lightweight URL parser
```
  Renzo Lucioni committed Nov 06, 2014
  f9ecd884 Browse Files
- Merge pull request #5859 from edx/renzo/track-form-expansions · d512fe86
```
Track logistration form toggles and password reset form views
```
  Renzo Lucioni committed Nov 06, 2014
  d512fe86 Browse Files
- Track logistration form toggles and password reset form views · 5edb7b9c
  Renzo Lucioni committed Nov 06, 2014
  
  5edb7b9c Browse Files
- Merge pull request #5858 from edx/renzo/resource-conflict-error-messages · 5d1143ad
```
Return more helpful error messages when a resource conflict occurs
```
  Renzo Lucioni committed Nov 06, 2014
  5d1143ad Browse Files
- Return more helpful error messages when a resource conflict occurs · edba397a
  Renzo Lucioni committed Nov 05, 2014
  
  edba397a Browse Files
05 Nov, 2014 6 commits
- Merge pull request #5854 from edx/alasdair/logistration-accessibility · 8a0507c9
```
Updated templates in light of accessibility review
```
  AlasdairSwan committed Nov 05, 2014
  8a0507c9 Browse Files
- Merge pull request #5852 from edx/alasdair/logistration-utils-bug · 25b53c1d
```
Fixed bug with validation templates expecting number but being passed st...
```
  AlasdairSwan committed Nov 05, 2014
  25b53c1d Browse Files
- Updated templates in light of accessibility review · 62b5e27c
  AlasdairSwan committed Nov 05, 2014
  
  62b5e27c Browse Files
- Fixed bug with validation templates expecting number but being passed string. · d0b1a8ec
  AlasdairSwan committed Nov 05, 2014
  
  d0b1a8ec Browse Files
- Merge pull request #5849 from edx/alasdair/logistration-form-order-update · 5dc5f5f9
```
ECOM-587 and ECOM-585 Switched tab order based on url and on selection o...
```
  AlasdairSwan committed Nov 05, 2014
  5dc5f5f9 Browse Files
- ECOM-585, ECOM-587 and ECOM-588 Changed order of forms based on url, fixed… · 8a62991f
```
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
```
  AlasdairSwan committed Nov 05, 2014
  8a62991f Browse Files
04 Nov, 2014 5 commits
- Merge pull request #5839 from edx/alasdair/logistraion-css-fix · 864040ee
```
ECOM-583 Fixes the CSS bugs
```
  AlasdairSwan committed Nov 04, 2014
  864040ee Browse Files
- ECOM-583 Fixes the CSS bugs · 588e1db6
  AlasdairSwan committed Nov 04, 2014
  
  588e1db6 Browse Files
- Merge pull request #5771 from edx/renzo/flip-access-view · 1de92697
```
Flip order of register and login options in the access view
```
  Renzo Lucioni committed Nov 04, 2014
  1de92697 Browse Files
- Flip order of register and login options in the access view · fca44138
  Renzo Lucioni committed Nov 04, 2014
  
  fca44138 Browse Files
- Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form · a971e717
```
Conflicts:
	common/djangoapps/course_modes/views.py
```
  Diana Huang committed Nov 04, 2014
  a971e717 Browse Files
03 Nov, 2014 2 commits
- Merge pull request #5830 from edx/renzo/test-user-api-password-reset · 664c901e
```
Fix tests of user API views
```
  Renzo Lucioni committed Nov 03, 2014
  664c901e Browse Files
- Fix tests of user API views · a60213c8
  Renzo Lucioni committed Nov 03, 2014
  
  a60213c8 Browse Files
30 Oct, 2014 7 commits
- Merge pull request #5762 from edx/diana/enrollment-integration · 8d7d9d21
```
WIP: Combined Login/Registration: Set up basic enrollment infrastructure.
```
  Diana Huang committed Oct 30, 2014
  8d7d9d21 Browse Files
- Add tests for the enrollment_interface · 47979e5b
  Diana Huang committed Oct 30, 2014
  
  47979e5b Browse Files
- Set up basic enrollment infrastructure. · fc468bf6
  Diana Huang committed Oct 30, 2014
  
  fc468bf6 Browse Files
- Merge pull request #5770 from edx/renzo/logistration-i18n · 471f5135
```
i18n logistration
```
  Renzo Lucioni committed Oct 30, 2014
  471f5135 Browse Files
- i18n logistration · 4157e5c0
  Renzo Lucioni committed Oct 30, 2014
  
  4157e5c0 Browse Files
- Merge pull request #5784 from edx/alasdair/rwd-header-and-footer · ff753f2b
```
Alasdair/rwd header and footer
```
  AlasdairSwan committed Oct 30, 2014
  ff753f2b Browse Files
- ECOM-406 removed commented out code, moved colours to variables and fixed hover… · 0c22db68
```
ECOM-406 removed commented out code, moved colours to variables and fixed hover state for mobile menu
```
  AlasdairSwan committed Oct 30, 2014
  0c22db68 Browse Files
29 Oct, 2014 3 commits
- Merge pull request #5785 from edx/renzo/copy-changes · 63ea30da
```
Clean up logistration copy
```
  Renzo Lucioni committed Oct 29, 2014
  63ea30da Browse Files
- Clean up logistration copy · bcef7611
  Renzo Lucioni committed Oct 29, 2014
  
  bcef7611 Browse Files
- ECOM-406 Added JS fil that will update DOM to make the header and footer responsive · e04a3ab3
```
 Made the header and footer responsive
```
  AlasdairSwan committed Oct 29, 2014
  e04a3ab3 Browse Files
28 Oct, 2014 6 commits
- Update third party auth on the logistration form · c553a47c
  Will Daly committed Oct 28, 2014
  
  c553a47c Browse Files
- Update tests to match new text. · 13986d84
  Diana Huang committed Oct 28, 2014
  
  13986d84 Browse Files
- Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form · 48bc4776
```
Conflicts:
	common/djangoapps/third_party_auth/__init__.py
	common/djangoapps/third_party_auth/pipeline.py
```
  Will Daly committed Oct 28, 2014
  48bc4776 Browse Files
- Redirect users to the track selection page or ?next page when using third party auth · f9b5a917
```
Set marketing site logged in cookie from third party auth.
```
  Will Daly committed Oct 28, 2014
  f9b5a917 Browse Files
- Merge pull request #5757 from edx/alasdair/logistration-rwd · c47eb12a
```
Alasdair/logistration rwd
```
  AlasdairSwan committed Oct 28, 2014
  c47eb12a Browse Files
- ECOM-531 Updated style after review with Andy Waldrop · 728df71a
  AlasdairSwan committed Oct 28, 2014
  
  728df71a Browse Files
27 Oct, 2014 4 commits
- Merge pull request #5718 from edx/alasdair/logistration-t-and-c · a9a4057d
```
ECOM-466 Added support for custom error messages. Styled select widths
```
  AlasdairSwan committed Oct 27, 2014
  a9a4057d Browse Files
- ECOM-369 merged and resolved issues with third party auth error messaging · fd14406a
  AlasdairSwan committed Oct 27, 2014
  
  fd14406a Browse Files
- ECOM-369 Styled third party auth buttons and cleaned up third party auth messaging · 1b1eb781
  AlasdairSwan committed Oct 27, 2014
  
  1b1eb781 Browse Files
- ECOM-369 Added handling of model save errors. Updated FormView to add preRender… · d2accb6d
```
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.
```
  AlasdairSwan committed Oct 27, 2014
  d2accb6d Browse Files