Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,160 Commits 1 Branch 0 Tags
5dae91bdf875eb5da68803e2948e32244dbd035d
Commit Graph

5123 Commits

Author SHA1 Message Date
stv
0fdf8fb222 Fix PEP8: E201 whitespace after '{' 2014-11-10 17:07:40 -08:00
Greg Price
db8dd8de64 Fix OAuth token login endpoint to set session user 2014-11-10 18:06:25 -05:00
AlasdairSwan
790ac3f3ef Merge pull request #5915 from edx/alasdair/rwd-trackselection 
ECOM-574 Updated track selection page to be responsive
 2014-11-10 16:41:50 -05:00
Renzo Lucioni
6defcaa0af Final text review 2014-11-10 16:33:37 -05:00
Greg Price
96b5637bef Merge pull request #5911 from edx/gprice/login-oauth-csrf-exempt 
Make OAuth token login endpoint CSRF exempt
 2014-11-10 16:28:11 -05:00
AlasdairSwan
23081f076b ECOM-574 Updated track selection page to be responsive 2014-11-10 15:39:17 -05:00
Sarina Canelake
0bf0d11a20 Merge pull request #5906 from stvstnfrd/pep8/newline 
Fix newline-related PEP8 issues
 2014-11-10 15:29:06 -05:00
Greg Price
9270c7c77d Make OAuth token login endpoint CSRF exempt 2014-11-10 15:20:35 -05:00
Chris Dodge
58b4982d2d harden down access to the shoppingcart if the ENABLE_PAID_COURSE_REGISTRATION flag is not set (either via the main Django configuration settings) or through microsite overrides 2014-11-10 15:09:48 -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
stv
5677b143db Fix PEP8: W391 blank line at end of file 2014-11-10 11:00:18 -08:00
stv
fb9f324f2f Fix PEP8: E303 too many blank lines 2014-11-10 11:00:14 -08:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
stv
d5d6e3f0d8 Fix PEP8: W293 blank line contains whitespace 2014-11-10 10:59:53 -08:00
stv
d87cfa90bf Fix PEP8: W292 no newline at end of file 2014-11-10 10:59:44 -08: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
David Baumgold
18083e9879 Use @require_POST decorator for password reset view 2014-11-10 12:07:22 -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