Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

3988 Commits

Author SHA1 Message Date
Ned Batchelder
a84735057d Move common/lib/*.py to openedx/core/lib 
This makes these files importable, and puts them into the new best guess
as to where files should live.
 2015-03-23 12:40:24 -04:00
Usman Khalid
c50f828187 Fixes after rebase. 2015-03-23 19:03:31 +05:00
muzaffaryousaf
e6c75529c0 Cohort discussion topics via UI in instructor dashboard. 
TNL-1256
 2015-03-23 14:28:22 +05:00
Usman Khalid
eee6250fb2 Use RequestCache to cache cohorts information. 
TNL-1258
 2015-03-23 09:57:16 +05:00
Usman Khalid
a9e0082c7c Cache cohort info during requests to reduce SQL queries. 
TNL-1258
 2015-03-23 09:44:23 +05:00
Usman Khalid
d59be9949e Use cohort settings from CourseCohortSettings. 
TNL-1258
 2015-03-23 09:43:00 +05:00
Muhammad Ammar
70efd28483 Changes after Andy's Review 2015-03-23 09:21:21 +05:00
Muhammad Ammar
3ce494f5c5 Enable/disable cohorts from the instructor dashboard and move cohorts management to its own tab 
TNL-1268
 2015-03-23 09:21:15 +05:00
muhammad-ammar
0ebd8c29b0 Allow Instructor To Rename Cohorts And Set Cohort Assignment Method 
TNL-181
 2015-03-23 09:10:59 +05: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
Ned Batchelder
7d799e34f3 Remove unused imports 2015-03-17 07:10: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
Greg Price
f0322b9662 Merge branch 'release' 2015-03-11 11:14:48 -04:00
Christina Roberts
00313e0e51 Merge pull request #7226 from edx/christina/update-accounts-api 
Updates to account and profile APIs based on arch council feedback
 2015-03-10 12:47:15 -04:00
Clinton Blackburn
6a2b9f4521 Reorganized course_structures app 
Celery requires all tasks to be in a tasks module. Also, the task has been updated to use default values if the the course structure generator encounters a block without the graded or format fields.
 2015-03-10 11:12:51 -04:00
cahrens
e30ea5c08b Switch to api directory and improve error handling. 2015-03-09 12:51:43 -04:00
zubair-arbi
41f08055a4 Merge pull request #7018 from edx/zub/bugfix/tnl-1331-unique_users_in_cohort_group 
use 'commit_on_success' transaction decorator to avoid registering users...
 2015-03-06 12:23:25 +05: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
zubair-arbi
969bfa5916 use 'commit_on_success' transaction decorator to avoid registering users in multiple cohort groups of a particular course 
TNL-1331
 2015-03-05 15:19:57 +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
1baaf724f8 Merge pull request #7213 from edx/andya/rc-profile-visibility-fix 
Default profile visibility to off for now
 2015-03-03 18:32:35 -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
Clinton Blackburn
ebc9c75e36 Explicitly naming task 
This should prevent errors due to relative imports. See http://docs.celeryproject.org/en/latest/userguide/tasks.html#automatic-naming-and-relative-imports for additional information.
 2015-03-03 15:59:19 -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
e8a1e810f7 Merge pull request #7176 from edx/benp/fix-pep8-20150227 
Fix pep8 violation.
 2015-02-28 08:26:51 -05:00
Clinton Blackburn
dc491c4c10 Merge pull request #7156 from edx/clintonb/cs-celery-serialize-fix 
Fixed Celery Serialization Bug
 2015-02-27 19:57:05 -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
c4cdd65744 Fix PEP8: E303 too many blank lines 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
Clinton Blackburn
4062b94a0f Fixed Celery Serialization Bug 
CourseLocator is not JSON-serializable. Passing course keys as Unicode instead when scheduling tasks to update course structure.
 2015-02-27 09:59:18 -05: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