Commit Graph

37 Commits

Author SHA1 Message Date
Sarina Canelake
e53b9c83d9 Use Django 1.4 @ensure_csrf_cookie method PLAT-664 2015-06-06 08:48:36 -04:00
Diana Huang
dae137feaa Convert all tabs to the new plugin framework. 2015-06-02 15:05:16 -04:00
Greg Price
7ce579c274 Add group fields to thread list endpoint 2015-05-11 15:59:35 -04:00
Ned Batchelder
777be12ada Add missing __init__.py files 2015-04-30 07:43:08 -04: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
c6ab15c64c Merge pull request #7352 from edx/sarina/pep8-quality-report
Improve pep8 reporting
2015-03-23 21:10:58 -04:00
Sarina Canelake
e77211b713 Run pep8 on all files, and fix uncovered errors 2015-03-23 15:50:29 -04:00
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
Ned Batchelder
7d799e34f3 Remove unused imports 2015-03-17 07:10:31 -04: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
stv
c4cdd65744 Fix PEP8: E303 too many blank lines 2015-02-27 10:04:52 -08:00
Daniel Friedman
322f6d1be2 Ignore staff member's cohort when masquerade is on
TNL-1269
2015-02-11 09:38:32 -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
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
muhammad-ammar
5ba492ecf3 Get students experiments, groups, and cohorts
TNL-498
2015-01-08 14:29:53 +05:00
Alan Boudreault
68fcdcc030 Add always_cohort_inline_discussions in course settings 2014-12-26 18:03:50 +00:00
Christine Lytwynec
3c1821a7ed fixes failing unit test in course_groups 2014-12-12 13:34:05 -05:00
Daniel Friedman
3d91f43030 Support cohorting students via a CSV File.
TNL-735
2014-12-10 09:23:04 -05:00
jsa
de6ca4a7a7 avoid errors when forward-migrating course_groups after south conversion
JIRA: TNL-937
2014-12-05 12:33:05 -05:00
jsa
f24f01d217 Add support for user partitioning based on cohort.
JIRA: TNL-710

IMPORTANT: this commit converts the course_groups
package to using migrations.  When deploying to an
existing openedx instance, migration 0001 may fail
with an error indicating that the CourseUserGroup
table already exists.  If this happens, running
the 0001 migration first, with the --fake option,
is recommended.  After performing this step,
remaining migrations should work as expected.
2014-12-05 09:53:44 -05:00