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

58 Commits

Author SHA1 Message Date
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
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
Clinton Blackburn
92ca64fa2a Finishing async course structure work 
- Added tests
- Updated model field specification
- Fixed issue of multiple event emission
- Updated admin page
- Added management command to manually generate course structures
 2015-02-13 12:21:51 -05:00
David Ormsbee
88681ba91a Make the Course Structure admin slightly more usable (list/search fields) 2015-02-11 16:13:10 -05:00
David Ormsbee
24fcab7f24 Very rough cut at generating a course outline after publishing. 2015-02-11 16:13:10 -05:00
Daniel Friedman
322f6d1be2 Ignore staff member's cohort when masquerade is on 
TNL-1269
 2015-02-11 09:38:32 -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
2bb1aafaaf Merge pull request #6752 from cpennington/modulestore-test-case-cleanup 
Clean up ModuleStoreTestCase
 2015-02-04 15:57:01 -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
Calen Pennington
a69c4efd21 Add the ability to send SIGPROF to an edx-platform process to obtain a memory dump 2015-02-02 13:12:58 -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
Daniel Friedman
fff84928fa Create and edit content groups in Studio 2015-01-15 10:37:24 -05:00
Andy Armstrong
ac58ebf7da Rename 'cohort groups' to just 'cohorts' 2015-01-15 10:33:48 -05:00
cahrens
39d9fdee34 Stop using to_deprecated_string. 2015-01-15 10:33:47 -05:00
cahrens
79cd321028 Bok choy test improvements. 2015-01-15 10:33:46 -05:00
cahrens
5ea7ced900 Create a RESTful handle_cohort view method for GET and PUT/POST. 2015-01-15 10:33:46 -05:00
Andy Armstrong
561c57dbe9 Extend preview to support cohorted courseware 
TNL-651
 2015-01-15 10:33:44 -05:00
jsa
55d2f1d547 test that students are auto-assigned to cohorts in partition scheme 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
Braden MacDonald
877e231c7a Fix two tests failing on January 1, 2015 2015-01-02 12:25:26 -08:00
Alan Boudreault
68fcdcc030 Add always_cohort_inline_discussions in course settings 2014-12-26 18:03:50 +00:00
Will Daly
18f6980922 Merge pull request #6247 from edx/will/update-verified-requirements 
Separate verification / payment flow.
 2014-12-15 13:11:45 -05:00
Will Daly
93cc03a570 Separate verification / payment flow. 2014-12-15 13:11:33 -05:00