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

1967 Commits

Author SHA1 Message Date
Will Daly
c8751b5b4a Add CSRF cookie to combined login/registration form 
Add CSRF check for login/registration views.
 2014-11-12 16:15:20 -05:00
Renzo Lucioni
2fc2207bd2 Merge pull request #5905 from edx/renzo/pep8-pylint-cleanup 
Clean up pep8 and pylint violations
 2014-11-12 14:34:03 -05:00
Renzo Lucioni
8d02efb021 Clean up pep8 and pylint violations 
Also fixes failing Python unit tests
 2014-11-12 12:55:56 -05:00
Will Daly
1537086a9b Merge pull request #5930 from edx/will/logistration-handle-redirects 
Logistration: Clean up redirect logic
 2014-11-12 11:23:48 -05:00
Will Daly
ce158cf54e Merge pull request #5929 from edx/will/logistration-fix-cancel-third-party-auth 
Logistration: Redirect to a valid URL when cancelling third party auth
 2014-11-12 10:49:20 -05:00
Will Daly
02485be3e3 Clean up redirect logic 2014-11-12 10:27:25 -05:00
Renzo Lucioni
34dd4e59a1 Merge pull request #5914 from edx/renzo/final-text-review 
Final text review
 2014-11-12 09:55:48 -05:00
Will Daly
d50137bb64 Redirect to a valid URL when cancelling third party auth 2014-11-12 09:33:06 -05:00
Renzo Lucioni
6defcaa0af Final text review 2014-11-10 16:33:37 -05:00
Will Daly
5085b71677 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py
 2014-11-10 15:05:37 -05:00
Will Daly
c150ea76aa Merge pull request #5890 from edx/will/logistration-auto-enroll-register 
Logistration: Auto-enroll fails after registering a new account
 2014-11-10 12:23:28 -05:00
AlasdairSwan
b9998b6d5b Merge pull request #5899 from edx/alasdair/logistration-select-validation 
ECOM-626 Added required check for select dropdowns and validation
 2014-11-10 11:54:20 -05:00
AlasdairSwan
cb5c03f0d1 ECOM-626 Added required check for select dropdowns and validation 2014-11-10 11:06:52 -05:00
Will Daly
95a435abc5 Include course ID in analytics events for logistration 2014-11-10 10:23:34 -05:00
Will Daly
b8f5be2cdd Allow inactive users to modify their own enrollments 2014-11-10 08:10:47 -05:00
Waheed Ahmed
3a71901f93 Fixed youtube stub server and removed unused variable. 
TNL-778
 2014-11-10 11:43:58 +05:00
Will Daly
578c04f62f Put logistration page behind a feature flag 2014-11-07 13:05:17 -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
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
chrisndodge
01c029aa9f Merge pull request #5805 from edx/cdodge/make-customizeable-region-in-receipt-page 
allow for a customized region on the receipt page that is microsite bran...
 2014-11-06 21:13: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
edba397a20 Return more helpful error messages when a resource conflict occurs 2014-11-05 22:36:27 -05:00
Greg Price
d2183c58c8 Add endpoint to log in with OAuth access token 2014-11-05 14:09:41 -05:00
Muhammad Ammar
e8e7e78e09 Merge pull request #5655 from edx/ammar/unit-improvements 
Unit Test Improvements
 2014-11-05 19:55:39 +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
Sarina Canelake
bc20ccb332 Merge pull request #5828 from edx/sarina/moar-pep8 
Remove more pep8 violations
 2014-11-04 08:58:17 -05:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
Gabe Mulley
821c97fbb4 Implement shim for mobile video events. 
This PR addresses the following issues:

1) All requests return a 200 OK unless there is an authorization failure. This is deliberate in case the secret key is compromised.
2) Push all of the nasty logic necessary to generate compatible video events into the LMS instead of trying to do that mapping on the mobile devices.
3) Stop using the deprecated "action" field in the segment.io event. According to their support team this field should not be used anymore and is just around for backwards compatibility reasons.

Fixes: AN-3818
 2014-11-03 14:12:07 -05:00
Renzo Lucioni
a60213c814 Fix tests of user API views 2014-11-03 10:14:31 -05:00
Jesse Zoldak
71f237d361 Revert "Fix lettuce css_fill method for devstack" 
This reverts commit 471abb8c28.
 2014-10-31 11:51:28 -04:00
Jesse Zoldak
471abb8c28 Fix lettuce css_fill method for devstack 2014-10-31 11:48:35 -04:00
muhammad-ammar
fcaa783e43 Unit Test Improvements 
TE-489
 2014-10-31 11:55:13 +00:00
Chris Dodge
6fcfb2a6a3 allow for a customized region on the receipt page that is microsite brand specific 2014-10-30 22:17:02 -04:00
Diana Huang
fc468bf696 Set up basic enrollment infrastructure. 2014-10-30 17:15:26 -04:00
Renzo Lucioni
4157e5c0f6 i18n logistration 2014-10-30 14:09:15 -04:00
Sarina Canelake
1b6d1b3730 Fix i18n and quality errors in course_groups/views.py 2014-10-30 11:10:57 -04:00
Martyn James
f61b968e01 Merge branch 'release' 2014-10-29 15:36:26 -04:00
Renzo Lucioni
bcef7611d4 Clean up logistration copy 2014-10-29 14:42:57 -04:00
Will Daly
c553a47c26 Update third party auth on the logistration form 2014-10-28 17:00:48 -04:00
John Eskew
c9071353fd Merge pull request #5742 from edx/jeskew/asset_manager_read_wrapper 
Wrap all asset read operations.
 2014-10-28 15:57:28 -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
John Eskew
786a32e7cf Wrap all asset read operations. 
First step in moving assets out of the contentstore (optionally).
https://openedx.atlassian.net/browse/PLAT-77
 2014-10-28 14:20:36 -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
Will Daly
0735141afc Merge pull request #5730 from edx/will/update-donation-tests 
Add a test for donations with a white-label course mode
 2014-10-27 14:13:44 -04:00
Will Daly
0cac6ea21b Fix pylint violations 2014-10-27 11:04:22 -04:00
Will Daly
7f54af3be0 Merge remote-tracking branch 'origin/release' 2014-10-27 10:59:31 -04:00
Will Daly
2c062ca08b Add a test for donations with a white-label course mode 2014-10-26 15:58:26 -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
Renzo Lucioni
05cb2a071b Prohibit automatic enrollment in prof ed courses when user authenticates via third-party auth 2014-10-24 15:59:42 -04:00