Commit Graph

39 Commits

Author SHA1 Message Date
Adam
af3519ce15 Merge pull request #7835 from edx/release
Release (DO NOT MERGE)
2015-04-30 16:24:47 -04:00
jsa
efde11d552 Use ecommerce api v2.
XCOM-213 XCOM-214
2015-04-27 16:57:17 -04:00
muzaffaryousaf
d0db373456 Fixing the micro-sites naming issues for profile page.
TNL-2072
2015-04-27 15:04:45 -04:00
Awais Jibran
8bd09d4057 Forgot password model not visible when user clicks 'Forgot Password' link on CMS.
TNL-1921
2015-04-22 18:06:36 +05:00
Usman Khalid
a14e6f0a7e Accessibility tweaks for account settings and profile pages.
TNL-1660
2015-04-21 19:42:50 +05:00
Andy Armstrong
8ff9fd84e4 Obey learner profile default visibility 2015-04-17 17:23:18 -04:00
muhammad-ammar
e50a641673 Accessibility changes for Account Settings and Learner Profile pages 2015-04-17 17:23:17 -04:00
muhammad-ammar
ca1f2f7768 Jasmine tests for upload/remove profile image on learner profile page.
TNL-1538
2015-04-17 17:23:17 -04:00
Usman Khalid
adf111e4d5 Adding functionlity to upload/remove profile image.
TNL-1538
2015-04-17 17:23:16 -04:00
muzaffaryousaf
9ac08ac59d Moving the country field to the required section of account setting page.
TNL-1856
2015-04-17 17:23:16 -04:00
Usman Khalid
bc05cd0ccd Resolving JS lint errors for account settings & learner profile page.
TNL-1855
2015-04-17 17:23:16 -04:00
Usman Khalid
2667f705ad Enable third party auth from account settings page.
TNL-1535
2015-04-17 17:23:15 -04:00
muzaffaryousaf
a378995f85 If user is not above age limit, show restricted learner profile.
TNL-1658
2015-04-17 17:23:15 -04:00
muzaffaryousaf
4f97cd7a04 Learner profile page.
TNL-1502
2015-04-17 17:23:14 -04:00
muhammad-ammar
9c2d18710c Jasmine tests for account settings page.
TNL-1499
2015-04-17 17:23:14 -04:00
Will Daly
735b400998 Login/Registration page can skip track selection.
Add querystring param "course_mode" to the login/registration
page so the user can skip track selection.

This supports upcoming changes to the course details page
that allow the user to choose the track when clicking
"enroll", which will replace the functionality of the track
selection page.
2015-03-25 09:15:31 -04:00
Chris Rodriguez
5ae7cc7ee1 UX-1642 Making visual tweaks and enhancements to the logistration form 2015-03-18 12:14:31 -04:00
Clinton Blackburn
935323a879 Enrolling via E-Commerce API for combined login-registration page
The login-registration page now supports using the E-Commerce API when enrolling users in honor seats (of courses with SKUs).
2015-03-13 00:25:13 -04:00
Greg Price
0646b5f53d Refactor registration views to avoid shim
This also changes the registration API contract to use the course_id
parameter for analytics instead of an extra analytics parameter.
2015-02-20 11:31:55 -05:00
Will Daly
e609f982d7 Country Access: block enrollment
Block users from enrolling in a course if the user
is blocked by country access rules.

1) Enrollment via the login/registration page.
2) Enrollment from the marketing iframe (via student.views.change_enrollment)
3) Enrollment using 100% redeem codes.
4) Enrollment via upgrade.

This does NOT cover enrollment through third party authentication,
which is sufficiently complex to deserve its own commit.
2015-02-10 13:07:51 -05:00
Will Daly
0a9f9130b0 Inline the user api form description calls 2015-01-19 16:01:11 -05:00
Renzo Lucioni
8ef0e77e46 Prevent Jasmine tests from redirecting in dev mode
Also prevent Jasmine from attempting to load deleted templates
2015-01-11 16:08:29 -05:00
Brian Talbot
f128629f48 fixing styling and class syntax (to new FA-based classes) for missing UI elements 2015-01-09 12:01:26 -05:00
AlasdairSwan
a434207076 ECOM-783 updated logistration in light of redesign 2015-01-05 11:09:37 -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
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
stephensanchez
2486901602 Adding disable logic for buttons.
Update tests, clean up approach.

Updating jasmine tests.
2014-11-14 18:35:55 +00:00
Will Daly
95a435abc5 Include course ID in analytics events for logistration 2014-11-10 10:23:34 -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
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
ca0d048b4f Fix failing JS tests 2014-10-27 15:17:07 -04:00
Renzo Lucioni
f157ee1461 Add tests of access and password reset views 2014-10-23 14:39:22 -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
Will Daly
fabd8a97ad Fix validation for checkboxes in forms.
Remove hard-coded TOS checkbox in registration template.
Disable new dashboard in settings; expose password reset end-point in student account app.
Added empty JS tests for new JavaScript
2014-10-21 07:29:46 -04:00
Renzo Lucioni
ff587c5cbb Add password reset request handling to the account page
The next step in the password reset process (confirmation) continues to be handled by student.views.password_reset_confirm_wrapper, a custom wrapper around Django's password reset confirmation view.
2014-10-18 00:54:38 -04:00
Renzo Lucioni
00d976b85d Use Backbone for student account and profile JS.
Validate student account and profile form fields. Use RequireJS for Jasmine tests of account and profile JS.
2014-10-08 15:50:13 -04:00