Victor Shnayder
2af06ef1d4
Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 66889b87240dd9c24e74
2013-02-06 20:29:17 -05:00
Kevin Chugh
55c205b9b4
merged master
2013-02-06 17:13:52 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Your Name
8fd32ed502
update to show cohort name on create and cohort name on view all threads, added cohort dictionary to convert ids to names
2013-02-01 13:01:54 -05:00
Your Name
da1660a043
fix get_cohorted_commentables
2013-01-31 17:34:37 -05:00
Your Name
3fa67c1425
allow moderators and students to select cohort on post creation
2013-01-31 17:05:15 -05:00
Your Name
1fc26de945
merge master
2013-01-30 15:19:43 -05:00
Victor Shnayder
46570b01ef
refactor tests, add test for is_commentable_cohorted, fix a bug
2013-01-26 13:49:12 -05:00
Victor Shnayder
439acf2df7
Fix docstring and test for get_cohort
...
Returns None if course isn't cohorted, even if cohorts exist. Shouldn't happen on prod, but could if cohorting is turned off mid-course.
2013-01-26 13:06:09 -05:00
Victor Shnayder
66934ce220
Address Dave's comments on https://github.com/MITx/mitx/pull/1350
2013-01-25 13:33:19 -05:00
Victor Shnayder
22ccf9c500
Some test cleanups
2013-01-24 17:33:25 -05:00
Victor Shnayder
69711a91ff
Fix inline discussion cohorting, debug logging
2013-01-24 16:58:19 -05:00
Victor Shnayder
fb7614a81c
oops--fix logging bug
2013-01-24 15:47:41 -05:00
Victor Shnayder
ea3aebdfe5
add logging, explicit check whether course is cohorted
2013-01-24 15:46:22 -05:00
Victor Shnayder
103db8aaf3
add conflict detection--users should be in at most one cohort per course
2013-01-24 15:14:34 -05:00
Victor Shnayder
9e84ae14d4
Started integration work with Kevin's cohort changes
...
- Create new cohorts.py file
- moved code there from models.py
- implemented necessary functions.
Next: testing :)
2013-01-24 15:14:33 -05:00
