Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,583 Commits 1 Branch 0 Tags
08e90d2e993a96fd191af940bb9b4531a76cbf59
Commit Graph

265 Commits

Author SHA1 Message Date
Will Daly
d3459be05a Add Jasmine tests for the payment/verification flow. 2014-12-22 13:25:49 -05:00
Renzo Lucioni
aeeb45cf57 Update virtual pageview event categories, general polish 2014-12-19 17:03:14 -05:00
Renzo Lucioni
3d717a895a Track upsell copy interaction, upgrade button and verify now button clicks on the dashboard 2014-12-19 17:03:14 -05:00
Will Daly
368dbf2ed8 Merge pull request #6293 from edx/will/set-donation-amount 
Preserve the contribution amount specified on the track selection page.
 2014-12-19 08:44:07 -05:00
Stephen Sanchez
0e58e7cb23 Merge pull request #6216 from edx/sanchez/cleanup-restful-layer 
Enrollment API Cleanup
 2014-12-18 11:00:23 -05:00
stephensanchez
22a18e350d Updating the design of the DRF views for enrollments. 
Consolidate PUT and POST on the RESTful Layer.

Change URLs for API

Test cleanup.

Adding a course details URL to the enrollment API.

Change student to user

Change to v1, remove feature flag from API URLs

Updating student to user in tests

Re-ordering redirect urls to be evaluated last.

Adding pagination and testing.

Adding Django REST settings for pagination.

Revert "Re-ordering redirect urls to be evaluated last."

This reverts commit 4c9502daa383e49b46f8abec5456c271e5e24ccb.

Re-ordering redirect urls to be evaluated last.

Conflicts:
	common/djangoapps/enrollment/urls.py

Revert "Adding Django REST settings for pagination."

This reverts commit 9f8a54c41f34caa24818c88f1e75ac59f6ce5259.

Conflicts:
	common/djangoapps/enrollment/urls.py

Revert "Adding pagination and testing."

This reverts commit 0b2d46262abb78f5ad170700205e7fd28b6af942.

Additional testing, logging, and error messages.
 2014-12-18 15:39:01 +00:00
Renzo Lucioni
f2e83bf57f Split payment/verification business intelligence analytics 
Track verify now and verify later choices, image captures, image retake, and name changes, as well as virtual pageviews for every step in the new flow(s).
 2014-12-17 17:08:10 -05:00
Will Daly
5109a862e0 Preserve the contribution amount specified on the track selection page. 2014-12-17 15:35:31 -05:00
Will Daly
df46e843c1 Merge pull request #6271 from edx/will/show-receipt-take-two 
Add payment information to payment confirmation page
 2014-12-17 10:01:50 -05:00
Will Daly
2ea2b8f674 Add JSON end-point for shoppingcart receipt information 
Add enrollment confirmation page

Fix progress update

Add order info to the payment confirmation page.
 2014-12-16 20:40:13 -05:00
stephensanchez
96e22097b2 Add the activate account step to the verified workflow. 
Changing approach such that email activation is not a step.

Removing stale line of code.

Update activate account step according to new UI changes.

Adding new test for activation.
 2014-12-16 20:24:50 +00:00
Will Daly
b4a8302e66 Merge pull request #6268 from edx/will/simplify-template-loading 
Inline underscore templates; add pre render step
 2014-12-16 11:42:06 -05:00
Renzo Lucioni
9faddd9b64 Merge pull request #6267 from edx/renzo/remove-webcam-approve-button 
Remove webcam capture approval button (checkmark)
 2014-12-16 11:15:49 -05:00
Renzo Lucioni
94b22bcde9 Remove webcam capture approval button (checkmark) 2014-12-16 10:01:55 -05:00
Will Daly
80f5d4216a Inline underscore templates; add pre render step 2014-12-16 08:38:28 -05:00
Will Daly
d3c3f73428 Combine payment and intro step 2014-12-15 13:23:07 -05:00
Will Daly
93cc03a570 Separate verification / payment flow. 2014-12-15 13:11:33 -05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides 
[PLAT-217]
 2014-12-13 08:26:28 -05:00
Daniel Friedman
3d91f43030 Support cohorting students via a CSV File. 
TNL-735
 2014-12-10 09:23:04 -05:00
Muhammad Shoaib
829f7dba5f Remove items from the shopping cart if they are for a course whose course enrollment window has closed 
changed the url name to verify_cart and change the color of the message in the shopping cart
 2014-12-09 12:20:37 +05:00
stephensanchez
32c9230cd1 Hooking the logistration page into the new HTTP endpoint for email opt in. 
Update the PR based on Code Review comments, and additional tests.

Using underscore js
 2014-12-01 17:25:57 +00:00
Adam Palay
624360d1d6 serve mathjax from mathjax's cdn (TNL-823) 2014-11-20 09:36:16 -05:00
Will Daly
4a814c24ba Merge pull request #5948 from edx/will/combine-reg-login-form 
Combined Login/Registration Form
 2014-11-17 16:00:20 -05:00
AlasdairSwan
dff0acf54d ECOM-650 updated to add auto scrolling for password reset view 2014-11-17 09:31:22 -05:00
stephensanchez
2486901602 Adding disable logic for buttons. 
Update tests, clean up approach.

Updating jasmine tests.
 2014-11-14 18:35:55 +00:00
Adam Palay
bc8d0a9976 disable "go to payment button" on click (ECOM-643) 2014-11-14 12:22:30 -05:00
AlasdairSwan
06cbe161a7 After accessibility review removed required field aria-describedby 2014-11-13 13:12:36 -05:00
AlasdairSwan
3eb287151c ECOM-369 accessibility updates 2014-11-12 14:17:41 -05:00
Will Daly
02485be3e3 Clean up redirect logic 2014-11-12 10:27:25 -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
95a435abc5 Include course ID in analytics events for logistration 2014-11-10 10:23:34 -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
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
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
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
5edb7b9c87 Track logistration form toggles and password reset form views 2014-11-06 10:00:42 -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
Sarina Canelake
aeb3a7f575 fixup! Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4) 2014-11-03 16:49:18 -05:00
Sarina Canelake
ed76907c0d Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4) 
Delete lms/static/admin resources as they are no longer needed
for the admin page as of Django 1.4

Moved two files that were referenced elsewhere:
lms/static/admin/js/jquery.min.js -> lms/static/js/admin/jquery.min.js
lms/static/admin/js/urlify.js -> lms/static/js/admin/urlify.js
 2014-11-01 00:01:17 -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
4157e5c0f6 i18n logistration 2014-10-30 14:09:15 -04:00
Chris Dodge
fea9432b50 Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course 2014-10-30 13:11:02 -04:00
Renzo Lucioni
bcef7611d4 Clean up logistration copy 2014-10-29 14:42:57 -04:00
AlasdairSwan
728df71acf ECOM-531 Updated style after review with Andy Waldrop 2014-10-28 10:20:44 -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