Commit Graph

53 Commits

Author SHA1 Message Date
Will Daly
a5001bab2a Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form
Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss
2014-11-13 11:16:16 -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
02485be3e3 Clean up redirect logic 2014-11-12 10:27:25 -05:00
Renzo Lucioni
6defcaa0af Final text review 2014-11-10 16:33:37 -05: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
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
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
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
Renzo Lucioni
a60213c814 Fix tests of user API views 2014-11-03 10:14:31 -05: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
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
Will Daly
fb5a8098de Disable auth for login and registration end-points 2014-10-23 10:20:37 -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
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
Will Daly
d774bcf36e Support separate terms of service and honor code checkboxes. 2014-10-20 11:26:17 -04:00
Will Daly
97f3f09009 Add honor code to registration dialog. 2014-10-20 11:14:39 -04:00
Will Daly
458186f7d1 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form
Conflicts:
	lms/djangoapps/student_account/test/test_views.py
	lms/djangoapps/student_account/urls.py
	lms/djangoapps/student_account/views.py
2014-10-20 10:57:05 -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
Will Daly
efec188b69 Fix unit tests 2014-10-17 15:01:21 -04:00
Will Daly
be0033eefe Use password field type for the login form password 2014-10-17 13:41:10 -04:00
Will Daly
e65fe4ed03 Add remember me checkbox to the login page 2014-10-17 13:17:13 -04:00
Will Daly
52051df4d4 Fix some bugs in the student view shim, add tests 2014-10-16 14:03:41 -04:00
Will Daly
c0582cc437 Fix broken profile API test 2014-10-16 10:24:00 -04:00
Will Daly
8761eaf3dd Added check for duplicate email and username 2014-10-16 10:20:21 -04:00
Will Daly
e89afa93c0 WIP: add login and registration end-points to the user API. 2014-10-16 08:48:38 -04:00
Will Daly
8061336102 Move user_service into user_api/api 2014-10-14 07:38:10 -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
Renzo Lucioni
254a0ce6c8 Allow changing of language preference from profile page 2014-09-30 21:11:02 -04:00
Will Daly
7f8c6bb058 Add Django apps for student account and profile.
Add Python APIs for account/profile information to user_api
Updating profile page to have social linking

Authors: Renzo Lucioni, Alasdair Swan, Stephen Sanchez, Will Daly
2014-09-25 08:36:22 -04:00
Usman Khalid
46b1c850f8 Catch InvalidKeyError in UserTagsEventContextMiddleware.
LMS-11189
2014-08-07 15:41:07 +05:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library
[LMS-2757]
2014-05-29 17:03:35 -04:00
stv
e4df2c2ceb Add 'forum_roles' endpoint to user_api
Expose a new endpoint to query a list of users based on a
role name (Moderator, Student, etc.) and a course_id.

This will initially be used by the notifier to send daily digest
messages to forum moderators.
2014-05-23 13:07:04 -07:00
Calen Pennington
e2bfcf2a36 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates common/djangoapps.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-07 12:54:49 -04:00
Greg Price
654239dc2c Merge pull request #2890 from edx/gprice/user-api-with-prefs
Augment user API to allow easier access to user preferences
2014-03-11 13:37:50 -04:00
Greg Price
bbd6f788ad Add endpoint to get user list for a preference
The endpoint includes the key of the desired preference in the URL and
returns the list of users for whom the preference is set (regardless of
the value).
2014-03-11 12:03:33 -04:00
Greg Price
8f01756c6c Include preferences in users returned by user API 2014-03-11 11:17:13 -04:00
Diana Huang
bce7d9e43d Add tests and clean up A/B testing
Also fixes STUD-1351
2014-03-05 13:46:03 -05:00
Calen Pennington
d101933617 Add course tags to all events where a course-id can be extracted from the url
[LMS-2105]
2014-03-05 13:45:08 -05:00
Victor Shnayder
281ad63d2b split testing support in the LMS.
Adds a split_test_module XModule, that can choose one of its children
to display, based on a get_condition_for_user API added to the runtime.

To test, add something like this to an xml course, or make equivalent
 tweaks in mongo.

 <vertical url_name="split_test_vert">
    <split_test url_name="split1" experiment_id="0" condition_id_to_child='{"0": "i4x://MITx/6.00x/html/split_test_cond0", "1": "i4x://MITx/6.00x/html/split_test_cond1"}'>
       <html url_name="split_test_cond0">condition 0</html>
       <html url_name="split_test_cond1">condition 1</html>
    </split_test>
  </vertical>

Also needs an experiment configured in the course policy json: e.g.

        "user_partitions": [{"id": 0,
                                      "name": "Experiment 0",
                                      "description": "Unicorns?",
                                      "version": 1,
                                      "groups": [{"id": 0,
                                                        "name": "group 0",
                                                        "version": 1},
                                                        {"id": 1,
                                                        "name": "group 1",
                                                        "version": 1}]}]

(This particular snippet will work inside a course with org MITx
 and course name 6.00x)

Co-Author: Sarina Canelake <sarina@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Diana Huang <diana@edx.org>
Co-Author: Calen Pennington <cale@edx.org>

[LMS-2095]
2014-03-05 13:45:08 -05:00
Julia Hansbrough
05537540d1 Fix acceptance tests
Fixed bok-choy acceptance tests
2014-02-14 22:35:14 +00:00
thedeadparrot
b61649f9eb Refactor out new lang_pref djangoapp 2014-02-14 22:35:14 +00:00
thedeadparrot
7e38c3ad6b Use a given default for getting a preference 2014-02-14 22:35:12 +00:00