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

57 Commits

Author SHA1 Message Date
zubair-arbi
d0126959fc change education level option label to read "Associate" degree 
ECOM-579
 2015-03-31 13:31:16 +05:00
Christina Roberts
3f07660d27 Merge pull request #7454 from edx/andya/user-api-transaction-handling 
Clean up transactional behavior in User API
 2015-03-25 15:08:21 -04:00
Andy Armstrong
a9dce7c331 Clean up transactional behavior in User API 2015-03-25 13:44:03 -04:00
Sarina Canelake
e77211b713 Run pep8 on all files, and fix uncovered errors 2015-03-23 15:50:29 -04:00
Nimisha Asthagiri
289469dd3a Merge pull request #7353 from edx/mobile/third-party-oauth-reg 
Mobile registration with Google/FB
 2015-03-20 17:04:37 -04:00
Nimisha Asthagiri
dfcef9ddcb MA-95: Update Registration endpoint to support 3rd party credentials 
Automatically link edX account with social account in login mobile API path
 2015-03-20 15:43:40 -04:00
Chris
551c382238 Merge pull request #7328 from edx/clrux/ux-1642-logistration-updates 
UX-1642 Making visual tweaks and enhancements to the logistration form
 2015-03-18 15:35:02 -04:00
Will Daly
f0b4492065 Merge pull request #7381 from edx/will/ecom-601 
Copy changes to the activation email
 2015-03-18 14:30:32 -04:00
Chris Rodriguez
026501aec9 Fix 2015-03-18 14:21:21 -04:00
Will Daly
c37dc913a0 Copy changes to the activation email 2015-03-18 13:45:15 -04:00
Chris Rodriguez
5ae7cc7ee1 UX-1642 Making visual tweaks and enhancements to the logistration form 2015-03-18 12:14:31 -04:00
Andy Armstrong
6976a33a85 Add the preferences endpoint to the User API 
TNL-1493

See https://openedx.atlassian.net/wiki/display/TNL/User+API for details
 2015-03-16 23:34:35 -04:00
cahrens
207e500a23 Don't allow empty string or None for email. 2015-03-13 14:59:02 -04:00
cahrens
e30ea5c08b Switch to api directory and improve error handling. 2015-03-09 12:51:43 -04:00
cahrens
c8a20df210 Combine account and profile into same API. 2015-03-05 16:13:49 -05:00
cahrens
450d9e37db Limit PATCH to own user information. 2015-03-05 13:30:45 -05:00
Christina Roberts
0eed96c2f3 Merge pull request #7215 from edx/christina/full_name_bug 
Correctly point to MAX_LENGTH instead of MIN_LENGTH.
 2015-03-04 09:27:13 -05:00
Andy Armstrong
6f118a3d8f Default profile visibility to off for now 2015-03-03 17:52:24 -05:00
cahrens
84d91a7901 Correctly point to MAX_LENGTH instead of MIN_LENGTH. 
Bug introduced in recent commit.
 2015-03-03 16:16:20 -05:00
Andy Armstrong
dfe0057b79 Implement profile API 
TNL-1491

See the API design here:

https://openedx.atlassian.net/wiki/display/TNL/User+API
 2015-03-02 16:28:52 -05:00
Ben Patterson
fc0b728939 Fix pep8 violation. 2015-02-27 17:35:44 -05:00
Andy Armstrong
d42adcf46b Merge pull request #7123 from edx/christina/account-api 
Add name and email change requests to accounts API.
 2015-02-27 17:21:17 -05:00
cahrens
3ed31c2b1b Add name change and email change support to accounts API. 
Name change is immediate, email change is multi-step.
 2015-02-27 16:35:05 -05:00
Sarina Canelake
a11f287769 Merge pull request #6998 from stvstnfrd/quality/pep8 
Extend PEP8 coverage
 2015-02-27 15:53:45 -05:00
cahrens
61a108d377 Delete unused code for changing email. 2015-02-27 13:20:57 -05:00
stv
49925873f5 Fix PEP8: W292 no newline at end of file 2015-02-27 10:04:53 -08:00
stv
cdf7876a0e Fix PEP8: W293 blank line contains whitespace 2015-02-27 10:04:52 -08:00
stv
5785fda7b1 Fix PEP8: W391 blank line at end of file 2015-02-27 10:04:52 -08:00
stv
c4a63a5eff Fix PEP8: E302 expected 2 blank lines 2015-02-27 10:04:52 -08:00
Christina Roberts
9d956e03e7 Merge pull request #7053 from edx/christina/account-api 
User account API
 2015-02-25 17:11:55 -05:00
cahrens
ae0333cb61 Convert empty string to None for "select" fields, other cleanup. 2015-02-25 15:59:02 -05:00
cahrens
450c0e34f5 Enforce content_type of 'application/merge-patch+json' for merge patch. 2015-02-24 11:32:28 -05:00
cahrens
09c607c67c Get profile object from user, clarify null or "". 2015-02-23 15:18:15 -05:00
cahrens
8d030974ec Typo (squash) 2015-02-23 14:41:53 -05:00
cahrens
ef8b4394cf Rest of PATCH implementation. 2015-02-23 14:33:14 -05:00
cahrens
35e80a3a60 Throw 400 in patch if read-only fields specified. 2015-02-20 16:44:10 -05:00
cahrens
023e6ec8cd GET method for user account API. 2015-02-20 14:52:46 -05:00
Greg Price
9ef0494092 Return field detail with registration API errors 
Also, make registration API CSRF exempt
 2015-02-20 11:31:55 -05: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
Clinton Blackburn
2854bb9524 Added Course Structure API 2015-02-17 13:23:34 -05:00
Daniel Friedman
edd833ebc4 Fix grades download in courses with cohorted content 
TNL-1351
 2015-02-10 09:33:27 -05:00
Calen Pennington
b353ed2ea2 Better support specifying of modulestore configuration in test cases 
The existing pattern of using `override_settings(MODULESTORE=...)` prevented
us from having more than one layer of subclassing in modulestore tests.

In a structure like:

    @override_settings(MODULESTORE=store_a)
    class BaseTestCase(ModuleStoreTestCase):
        def setUp(self):
            # use store

    @override_settings(MODULESTORE=store_b)
    class ChildTestCase(BaseTestCase):
        def setUp(self):
            # use store

In this case, the store actions performed in `BaseTestCase` on behalf of
`ChildTestCase` would still use `store_a`, even though the `ChildTestCase`
had specified to use `store_b`. This is because the `override_settings`
decorator would be the innermost wrapper around the `BaseTestCase.setUp` method,
no matter what `ChildTestCase` does.

To remedy this, we move the call to `override_settings` into the
`ModuleStoreTestCase.setUp` method, and use a cleanup to remove the override.
Subclasses can just defined the `MODULESTORE` class attribute to specify which
modulestore to use _for the entire `setUp` chain_.

[PLAT-419]
 2015-02-04 09:09:14 -05:00
Calen Pennington
03a05fd9d4 Always call super(..).setUp() from setUp 2015-02-04 09:09:14 -05:00
Awais
f3bf66c1c0 ECOM-763 handling InvalidKeyError exception. 2015-01-30 11:41:30 +05:00
Will Daly
8228337063 Allow inactive users to request a password reset 
Internationalize error messages for password reset on the new login page.
 2015-01-16 08:24:27 -05:00
Andy Armstrong
561c57dbe9 Extend preview to support cohorted courseware 
TNL-651
 2015-01-15 10:33:44 -05:00
jsa
6fb3daa772 support group_access. JIRA: TNL-649 2015-01-15 10:33:44 -05:00
Carlos Andrés Rocha
327cc04f40 Fix email_opt_in_list export command to parse options correctly. 2015-01-13 18:57:30 -05:00
muhammad-ammar
5ba492ecf3 Get students experiments, groups, and cohorts 
TNL-498
 2015-01-08 14:29:53 +05:00
AlasdairSwan
a434207076 ECOM-783 updated logistration in light of redesign 2015-01-05 11:09:37 -05:00