Commit Graph

14670 Commits

Author SHA1 Message Date
JonahStanley
0524ff53cc Merge branch 'master' into jonahstanley/add-courseteam-tests
Conflicts:
	cms/djangoapps/contentstore/features/common.py
2013-06-19 11:29:43 -04:00
Renzo Lucioni
7c048fb243 Merge pull request #181 from edx/renzo/segment-io-sequentials
Instrument sequentials with segment-io
2013-06-19 08:07:37 -07:00
David Baumgold
cb3d46d815 Merge pull request #199 from edx/db/notifications-refactor
Refactor Backbone notifications
2013-06-19 08:04:18 -07:00
Don Mitchell
86344417ff Merge pull request #207 from edx/dhm/pep8
pep8 changes made during long refactoring
2013-06-19 08:00:04 -07:00
Renzo Lucioni
841ff4765f Abridge tests in light of learning how Segment.io works 2013-06-18 17:58:10 -04:00
Will Daly
b82eedbefd Merge pull request #184 from edx/will/fix-diff-cover-bug
Fix a bug in diff-cover
2013-06-18 14:32:46 -07:00
Don Mitchell
1ff022e181 Incidental pep8 changes 2013-06-18 17:25:06 -04:00
brianhw
54a3bc620b Merge pull request #40 from edx/feature/brian/regrade-celery-2
Feature/brian/regrade celery 2
2013-06-18 12:36:36 -07:00
Brian Wilson
fd206a4128 Make sure InstructorTask is committed. 2013-06-18 15:07:15 -04:00
Brian Wilson
5389bba490 Add changelog entry. 2013-06-18 14:28:00 -04:00
Renzo Lucioni
305e9315ef Write Jasmine tests to prove Segment.io works in Logger 2013-06-18 14:27:43 -04:00
JonahStanley
9dc1262719 This was causing some failures in the unit tests for some reason 2013-06-18 13:58:58 -04:00
Brian Wilson
2d1ebb7329 Test when querying for a non-existent task 2013-06-18 13:51:05 -04:00
Calen Pennington
c5dc404b01 Merge pull request #150 from edx/fix/cale/update-django-wiki
Cherry pick change to url matching regular expression. Fixes LMS-37
2013-06-18 10:29:33 -07:00
chrisndodge
c74220779e Merge pull request #201 from edx/fix/cdodge/fix-busted-JS-pipeline
remove assets.js from the PIPELINE_JS since it seems to cause that file ...
2013-06-18 10:21:51 -07:00
JonahStanley
0b51f1bbba Merge branch 'master' into jonahstanley/add-courseteam-tests 2013-06-18 13:20:13 -04:00
Don Mitchell
cf2675d701 Update fields.py
When changing variable names for code review critique, accidental cut/paste prevented intended behavior.
2013-06-18 12:32:26 -04:00
Don Mitchell
b151d6c155 Merge pull request #183 from edx/dhm/timeconv/bug0
Fix a few remaining tz naive dates
2013-06-18 09:09:24 -07:00
Don Mitchell
a1f181e7bb Make the variable and method names clearer 2013-06-18 11:45:16 -04:00
Chris Dodge
54cb64a2c6 actually, seems like if we remove it from PIPELINE_JS then it doesn't work in production 2013-06-18 11:37:50 -04:00
David Baumgold
02626ffda7 Removed unused test code 2013-06-18 11:27:13 -04:00
JonahStanley
650a2ba423 Added deletion tests 2013-06-18 11:20:23 -04:00
Brian Wilson
77032067ac Refactor test_views from test_api. Pull out pending_tasks.js. 2013-06-18 11:19:25 -04:00
Chris Dodge
c129fa4a77 remove assets.js from the PIPELINE_JS since it seems to cause that file to be loaded twice 2013-06-18 11:17:29 -04:00
Brian Wilson
c2aadbfb18 Fix issue with unicode in errors. 2013-06-18 11:17:17 -04:00
Brian Wilson
a8c3e91051 Handle failure task_output that won't fit in the model column. 2013-06-18 11:17:17 -04:00
Brian Wilson
eb1fe899e8 Fix progress reporting. 2013-06-18 11:17:17 -04:00
Brian Wilson
2c5e038f82 initial test_tasks 2013-06-18 11:17:17 -04:00
Brian Wilson
3bd2b08258 factor out InstructorTaskTestCase base class, for reuse in test_tasks. 2013-06-18 11:17:16 -04:00
Brian Wilson
a0dcc97e08 tasks now extract task_input and course_id from InstructorTask, instead of passing explicitly. 2013-06-18 11:17:16 -04:00
Brian Wilson
a67674fe34 set task_id on LMS side. 2013-06-18 11:17:16 -04:00
Brian Wilson
b224f4e8cc move test_tasks to test_integration. 2013-06-18 11:17:16 -04:00
Brian Wilson
c48dabc383 Move code to instructor_task Django app. 2013-06-18 11:17:15 -04:00
chrisndodge
a3c7ece85b Merge pull request #195 from pdehaye/patch-1
need to import os
2013-06-18 08:16:55 -07:00
Brian Wilson
d2b3977f57 Add dogstat logging to background tasks. 2013-06-18 11:13:55 -04:00
Brian Wilson
9e11a5659f Rename task_queue.py to task_submit.py. 2013-06-18 11:13:19 -04:00
Brian Wilson
c676cfd64a Rename fields in CourseTaskLog, including a task_key column for indexing. Use 'rescore' instead of 'regrade'. Clean up task submission. 2013-06-18 11:13:19 -04:00
Brian Wilson
76773c5bdf Change updating of CourseTaskLog to mostly occur in worker thread. 2013-06-18 11:13:18 -04:00
Brian Wilson
c1fff1568e reenable psychometrics for regrading 2013-06-18 11:13:18 -04:00
Brian Wilson
3b657d6d36 Disable randomized-problem test until bug-fix is merged in. 2013-06-18 11:13:18 -04:00
Brian Wilson
9c1881e5d6 Add unit test to regrade problem using randomization. 2013-06-18 11:13:18 -04:00
Brian Wilson
d37ebea6c0 Add tracking calls to reset (and delete). Add tests for delete. Remove sleep statement used for manual testing. 2013-06-18 11:13:18 -04:00
Brian Wilson
79a0f6a16b remove call to psychometrics when regrading 2013-06-18 11:13:18 -04:00
Brian Wilson
003c9ba5d9 Define MITX_FEATURES['ENABLE_COURSE_BACKGROUND_TASKS'] to allow background tasks to be removed from instructor dash. 2013-06-18 11:13:17 -04:00
Brian Wilson
616d18e1e3 Post-rebasing fixes to re-enable masquerading. 2013-06-18 11:13:17 -04:00
Brian Wilson
1984cfecc1 Add duration to task status. Add tests for reset-attempts. 2013-06-18 11:13:17 -04:00
Brian Wilson
297206f260 Add background task history to instructor dash (as table).
Add task-history-per-student button, and fix display of task messages.
2013-06-18 11:13:01 -04:00
Brian Wilson
6cd23875ea Remove delete button from instructor dash. (Also remove last-modified
column from task-in-progress table).
2013-06-18 11:11:34 -04:00
Brian Wilson
8872fbccd2 Add factory for CourseTaskLog.
Add unit tests for regrading at courseware level (task and task_queue).
2013-06-18 11:09:32 -04:00
Brian Wilson
8660c9a7af Check descriptor to identify problems that don't support regrading. 2013-06-18 11:09:32 -04:00