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
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
Will Daly
be2b55590c
Use a 403 status to indicate that the user does not have a linked
...
account for third party auth.
2014-10-27 15:18:10 -04:00
AlasdairSwan
08e03ef380
ECOM-369 updated in light of review with Andy and code review
2014-10-27 15:17:07 -04:00
Renzo Lucioni
ca0d048b4f
Fix failing JS tests
2014-10-27 15:17:07 -04:00
AlasdairSwan
0b9ed0315b
ECOM-369 Styled third party auth buttons and cleaned up third party auth messaging
2014-10-27 15:17:07 -04:00
AlasdairSwan
3efeaf5a47
Moved pre-render to first in initialize to ensure runs before render
2014-10-27 15:16:33 -04:00
AlasdairSwan
2ea9685552
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:16:33 -04:00
AlasdairSwan
a86e9e68db
ECOM-466 Added support for custom error messages. Styled select widths
2014-10-27 15:15:10 -04:00
Will Daly
60f02feb71
Merge pull request #5716 from edx/will/logistration-custom-error-msgs
...
Add field from server to set custom error messages for logistration fields
2014-10-25 14:29:21 -04:00
Will Daly
3996b0a7e6
Merge pull request #5708 from edx/will/fix-401-basic-auth-issue
...
Logistration: Use a 403 status to indicate that the user does not have a linked account
2014-10-25 14:29:05 -04:00
Will Daly
ac2201a648
Add field from server to set custom error messages for logistration fields
2014-10-24 11:02:38 -04:00
AlasdairSwan
2284d5ee14
Merge pull request #5713 from edx/alasdair/logistration-validation
...
ECOM-466 cleaned up form submission validation
2014-10-24 09:52:08 -04:00
Will Daly
56d55608c1
Merge pull request #5714 from edx/will/logistration-email-field
...
Change field type for email from 'text' to 'email'
2014-10-24 09:28:55 -04:00
Will Daly
611e819d17
Change field type for email from 'text' to 'email'
2014-10-24 09:25:56 -04:00
Will Daly
cc07afb967
Use a 403 status to indicate that the user does not have a linked
...
account for third party auth.
2014-10-24 08:57:54 -04:00
AlasdairSwan
c3083069d1
ECOM-466 cleaned up form submission validation
2014-10-24 08:55:28 -04:00
AlasdairSwan
b14a129132
Merge pull request #5705 from edx/alasdair/logistration-error-styles
...
Alasdair/logistration error styles
2014-10-23 16:28:05 -04:00
AlasdairSwan
e332e79328
ECOM-369 Moved to Base FormView extended by other views.
2014-10-23 16:23:59 -04:00
Stephen Sanchez
d9e47a6bd3
Merge pull request #5695 from edx/sanchez/enrollment-tests-and-cleanup
...
enrollment tests and cleanup
2014-10-23 15:31:46 -04:00
AlasdairSwan
d889a362ae
ECOM-369 added meta to header to enable responsive. Set country dropdown to required for registration form
2014-10-23 15:22:27 -04:00
Renzo Lucioni
aba600cfae
Merge pull request #5704 from edx/renzo/add-js-tests
...
Add tests of access and password reset views
2014-10-23 14:41:24 -04:00
Renzo Lucioni
f157ee1461
Add tests of access and password reset views
2014-10-23 14:39:22 -04:00
stephensanchez
e7570c52e6
adding all the tests for data and api.
...
Updating tests for views
Last chunk of tests and pep8 cleanup
Code Review cleanup.
Additional CR comments
Changing serialization of suggested prices.
2014-10-23 16:57:29 +00:00
Will Daly
9aed03bea2
Merge pull request #5703 from edx/will/disable-auth-for-login-and-register
...
Disable auth for login and registration end-points
2014-10-23 11:52:41 -04:00
Will Daly
fb5a8098de
Disable auth for login and registration end-points
2014-10-23 10:20:37 -04:00
Will Daly
d8eafc4754
Merge pull request #5701 from edx/will/call-default-something-else
...
Use 'defaultValue' instead of 'default' in the form description.
2014-10-23 09:15:39 -04:00
Will Daly
0245c7e16e
Use 'defaultValue' instead of 'default' in the form description. Fix an error that would cause the login and password reset pages to not load correctly.
2014-10-23 08:56:40 -04:00
Will Daly
33f0e92d62
Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form
2014-10-22 17:13:30 -04:00
Will Daly
82385c4e36
Merge pull request #5679 from edx/will/logistration-third-party-auth
...
Integrate third party auth into the combined login/registration page.
2014-10-22 17:11:44 -04:00
Will Daly
9e9dec1de1
Integrate third party auth into the combined login/registration page.
...
Change third party auth login failure code to a 401, to detect authentication
success with no linked account.
If already authenticated, redirect immediately to the dashboard.
Use "Location" header correctly for 302 redirects from student views.
Add utility functions for simulating a running third-party auth pipeline.
Add a utility function for checking whether third party auth is enabled.
Respect default values sent by the server
2014-10-22 17:10:49 -04:00
Tim Babych
ffd64212ea
Merge pull request #5657 from edx/tim/mktg-iframe-trim
...
TNL-281: reduce amount of JS in marketing iframe
2014-10-22 23:03:15 +03:00
Adam
7e12e40164
Merge pull request #5532 from edx/adam/disable-pycontracts-on-startup
...
disable pycontracts except in development environments (PLAT-122)
2014-10-22 14:17:45 -04:00
Ben Patterson
ed59dfbc15
Merge pull request #5686 from edx/benp/tddium-timeout
...
Increase overall build timeout.
2014-10-22 14:06:37 -04:00
Tim Babych
fc6cb50256
TNL-281: reduce amount of JS in marketing iframe
2014-10-22 20:54:45 +03:00
Ben Patterson
8d574a2545
Increase overall build timeout.
2014-10-22 13:36:39 -04:00
Carlos Andrés Rocha
578f5b6299
Merge pull request #5673 from rocha/fix-course-structure-command
...
Fix dump course structure when element metadata uses opaque keys.
2014-10-22 10:22:55 -07:00
Christina Roberts
d4531201e5
Merge pull request #5654 from edx/christina/visible_graded_content
...
Tests for conditional content (split_test module).
2014-10-22 12:55:30 -04:00
Carlos Andrés Rocha
a1a7504f81
Fix dump course structure when element metadata uses opaque keys.
...
Make sure that during the serialization, all opaque keys and their
references and serialized using the `unicode` function.
AN-3821
2014-10-22 12:36:50 -04:00
Renzo Lucioni
afefe21c4f
Merge pull request #5682 from edx/renzo/add-js-tests
...
WIP: Add JS tests of access, login, register, and password reset views
2014-10-22 10:39:29 -04:00
cahrens
c09632ef69
Tests for conditional content (split_test module).
...
TNL-39
2014-10-22 10:38:50 -04:00
Renzo Lucioni
21e5805bd9
WIP: Add JS tests of access, login, register, and password reset views
2014-10-22 10:23:39 -04:00
Anton Stupak
ce4fb60ba0
Merge pull request #5598 from edx/anton/maintenance-fonts
...
Maintenance page: Serving Fonts through Platform Assets
2014-10-22 17:19:22 +03:00
AlasdairSwan
5671392a5d
Merge pull request #5681 from edx/alasdair/logistration-styling
...
Alasdair/logistration styling - merge approved by Will
2014-10-22 10:16:05 -04:00
