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

11117 Commits

Author SHA1 Message Date
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
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
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
872f4b6c13 fix handling of rejected accommodations 2013-01-24 16:37: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
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
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
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
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
Victor Shnayder
c655f62f7a Remove out-of-date text about user replication, askbot 2013-01-24 15:12:51 -05:00
Brian Wilson
4f37ea9149 add --create_dummy_exam option to pearson_make_tc_registration 2013-01-24 14:45:31 -05:00
Diana Huang
37c7b47017 Update comments and add new OpenEndedChild tests 2013-01-24 14:02:24 -05:00
Brian Wilson
cb2d8db57c store files in S3 bucket in separate directories by mode 2013-01-24 12:46:00 -05:00
Brian Wilson
20db3841cb Merge branch 'feature/apenney/pearson-merge' of github.com:MITx/mitx into feature/apenney/pearson-merge 2013-01-24 12:42:01 -05:00
Diana Huang
1f8db18903 New tests for open ended module 2013-01-24 12:36:48 -05:00
David Ormsbee
e074c629fc Merge pull request #1344 from MITx/bugfix/brian/pearson-reg-end-date 
add UTC time to registration end date
 2013-01-24 09:27:11 -08:00
Brian Wilson
1199b1ecfa debug pearson import and update unit tests 2013-01-24 09:42:25 -05:00
Brian Wilson
d395c4448d add more pearson tests, and update commands in response 2013-01-24 09:42:25 -05:00
Brian Wilson
740d0403e9 change name of function back to get_testcenter_registration, and disable its use as a test 2013-01-24 09:42:25 -05:00
Brian Wilson
f4703b40cb add test-with-settings 2013-01-24 09:42:25 -05:00
Brian Wilson
553528cd1c change get_testcenter_registration to get_tc_registration, so it's not treated as a test. 2013-01-24 09:42:25 -05:00
Brian Wilson
d30974b560 Get pearson export working in a unit test 2013-01-24 09:42:24 -05:00
Brian Wilson
7bcfc44b71 add first test shell 2013-01-24 09:42:24 -05:00
Ashley Penney
d0ecae30d7 Fix datadog logging to use .name on the file objects and add an additional logging line. 2013-01-24 09:42:24 -05:00
Ashley Penney
274cb8d865 Actually call the appropriate file. 2013-01-24 09:42:24 -05:00
Ashley Penney
3aacba1f63 Run over each file and run the import. We could probably do this as a try/except and not delete if the output of the import failed but it may be simply easier to refetch those files from the S3 backup and try again. 2013-01-24 09:42:24 -05:00
Ashley Penney
05b36bdd09 Add tags to the datadog event which will be set to the appropriate filename so we can see the cause of failures. 2013-01-24 09:42:24 -05:00
Ashley Penney
3a4091b798 Tweaks to enable datadog error events as well as some pep8 tidyup vim was shouting at me about. 2013-01-24 09:42:24 -05:00
Ashley Penney
333f2e5167 Fix ccd->cdd, I typed ccd so many times while working on this code. I am bad at typing! 2013-01-24 09:42:24 -05:00
Brian Wilson
5e76c9d033 add pearson_import_conf_zip command 2013-01-24 09:42:24 -05:00
Ashley Penney
46e9a8f6ac Add help string. 2013-01-24 09:42:23 -05:00
Ashley Penney
482cefd246 Bunch of fixes to pep8 formatting, missing imports, change of kwargs to 
options, quoting variables and a few other fixups.
 2013-01-24 09:42:23 -05:00
Ashley Penney
5431332cec Fix up help. 2013-01-24 09:42:23 -05:00