Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,228 Commits 1 Branch 0 Tags
4e3e2ec707ff409ec8a2fb4a332cfc19a744a28e
Commit Graph

10228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Shnayder
d453a6136b fix regexp 2013-01-25 13:42:04 -05:00
Victor Shnayder
faaf290e10 Merge pull request #1351 from MITx/content/rocha/most-important-change-ever 
Added one more year!
 2013-01-25 10:37:54 -08:00
Diana Huang
47c24d8e7e Raise smarter exceptions when parsing rubrics. 2013-01-25 13:33:35 -05:00
Victor Shnayder
76c4730532 whitespace 2013-01-25 13:33:25 -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
Carlos Andrés Rocha
f35d4a16c3 Added one more year! 2013-01-25 13:31:23 -05:00
Don Mitchell
e58193f87f Updated comment 2013-01-25 13:03:54 -05:00
Victor Shnayder
3d303518eb Remove old user replication code. 
- we don't use it, and if we do want to change the arch, we should have a proper central user info service.
 2013-01-25 12:51:34 -05:00
Don Mitchell
45393ac6f8 Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag 2013-01-25 12:46:09 -05:00
Don Mitchell
5ef3f3ee66 Update jquery ui. Overrode draggable w/ an in place fix for scroll 
racing condition.
 2013-01-25 12:44:58 -05:00
Diana Huang
115f6c3acf Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-25 11:19:38 -05:00
Diana Huang
71d27def0d Fix tests and add new documentation 2013-01-25 11:18:30 -05:00
Ashley Penney
a54778551e This needs to be a list of strings. 2013-01-25 10:49:20 -05:00
Diana Huang
3ec2a83ec1 Merge branch 'diana/open-ended-ui-updates' into tests/diana/update-oe-unit-tests 
Fix

Conflicts:
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
 2013-01-25 10:35:55 -05:00
Diana Huang
bb521a20b7 fix a bug caught with testing and update some tests 
(the last couple are still broken, though)
 2013-01-25 10:19:09 -05:00
Victor Shnayder
0e78d9eb61 Merge pull request #1349 from MITx/fix/cdodge/position-jumping-fix 
put back the 'position' argument to get_module() which got accidentially...
 2013-01-24 18:49:25 -08:00
Kevin Chugh
07c1999a95 prep for staging 2013-01-24 21:43:36 -05:00
Chris Dodge
1787157e00 put back the 'position' argument to get_module() which got accidentially - or so I think - dropped in a previous commit 2013-01-24 21:38:02 -05:00
Victor Shnayder
771a55a631 turn forums on in test.py 
- this may not be a good idea, but needed for testing cohorts for now...
 2013-01-24 18:35:34 -05:00
Victor Shnayder
d17aedf3b4 the reverse isn't working for some reason... need to figure it out 2013-01-24 18:08:51 -05:00
Victor Shnayder
0b7e7b35dc stub out django comment client test system 2013-01-24 17:33:40 -05:00
Victor Shnayder
22ccf9c500 Some test cleanups 2013-01-24 17:33:25 -05:00
Diana Huang
bb60dde45e Add OpenEndedModule tests 2013-01-24 17:09:19 -05:00
David Ormsbee
d31229360f Merge pull request #1348 from MITx/fix/zoldak/ie-keyword 
Fix broken IE due to using the word function
 2013-01-24 14:07:59 -08:00
Jay Zoldak
896933a3c4 Fix broken IE 2013-01-24 17:02:18 -05:00
Victor Shnayder
69711a91ff Fix inline discussion cohorting, debug logging 2013-01-24 16:58:19 -05:00
Brian Wilson
368e3d5c97 Merge branch 'feature/apenney/pearson-merge' of github.com:MITx/mitx into feature/apenney/pearson-merge 2013-01-24 16:38:07 -05:00
Brian Wilson
872f4b6c13 fix handling of rejected accommodations 2013-01-24 16:37:02 -05:00
David Ormsbee
acfafa6516 Merge pull request #1347 from MITx/fix/cdodge/remove-duplicate-assign-default-role 
fix merge problem. assign_default_role() ended up being defined twice as...
 2013-01-24 13:00:40 -08:00
Chris Dodge
dfbe7dd4f9 fix merge problem. assign_default_role() ended up being defined twice as that code was added in both master and cms-master branches, but the merge didn't pick it up as a conflict 2013-01-24 15:54:02 -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
Ashley Penney
135369a3d7 Merge branch 'feature/apenney/pearson-merge' of github.com:MITx/mitx into feature/apenney/pearson-merge 2013-01-24 15:20:49 -05:00
Ashley Penney
b02ebc4618 Add these two options in as well. 2013-01-24 15:20:27 -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
5fa8cf5a78 Only show cohort config for cohorted courses 2013-01-24 15:14:34 -05:00
Victor Shnayder
3bfe9decf4 Change config keys to use underscores for consistency with other policy keys 2013-01-24 15:14:34 -05:00
Victor Shnayder
de02721158 Add removing students from cohorts. 2013-01-24 15:14:33 -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
Victor Shnayder
7bdb5c23e1 Allow listing of users in cohorts and adding users 
- still needs style, more features, but basic functionality works
 2013-01-24 15:12:53 -05:00
Victor Shnayder
64f820828e whitespace 2013-01-24 15:12:53 -05:00
Victor Shnayder
bab3b0c39e Add initial set of views for managing cohorts 
- lets user see and add cohorts
- needs styling
- needs to allow them to actually manage membership!
 2013-01-24 15:12:53 -05:00
Victor Shnayder
ac8c59126d Add note about non-unique topic id across course runs bug 2013-01-24 15:12:53 -05:00
Victor Shnayder
0d41a04490 fix line length 2013-01-24 15:12:52 -05:00
Victor Shnayder
3488083e6b Add a get_course_cohorts function and test 2013-01-24 15:12:52 -05:00
Victor Shnayder
90a5703419 Test for cohort config 2013-01-24 15:12:52 -05:00
Victor Shnayder
f005b70f3b Minor test cleanups 2013-01-24 15:12:52 -05:00
Victor Shnayder
fa17913a91 is_cohorted course descriptor property, docs 2013-01-24 15:12:52 -05:00
Victor Shnayder
1b9a3557eb get_cohort() function and test 2013-01-24 15:12:52 -05:00
Victor Shnayder
0e78eaaf80 Add a course_groups djangoapp with a CourseUserGroup model. 2013-01-24 15:12:52 -05:00