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

3963 Commits

Author SHA1 Message Date
Alexander Kryklia
e7f1baad62 Fixes broken imports in checker.py 2013-06-20 12:58:33 +03:00
Calen Pennington
b021d9cc12 Merge pull request #209 from edx/cale/pep8-fixes 
Cleanup pep8 violations in test_correctmap.py
 2013-06-19 13:36:18 -07:00
lapentab
24bee17da5 Merge pull request #156 from edx/blapenta/fix-test-coverage 
Fix test_system looking like a test to nosetest. Fix class inheritance causing double counting of coverage.
 2013-06-19 08:50:54 -07:00
Calen Pennington
4cc30aab00 Cleanup pep8 violations in test_correctmap.py 2013-06-19 10:04:32 -04:00
lapentab
dece800888 Renames self.get_test_system to test_system, removes duplicate function. 2013-06-19 09:57:16 -04: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
lapentab
f0fb620be6 Fixes missing refactoring 2013-06-18 14:12:23 -04:00
lapentab
b9ca9a84d7 Merge branch 'master' into blapenta/fix-test-coverage 
Conflicts:
	AUTHORS
	common/lib/xmodule/xmodule/tests/test_annotatable_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_html_module.py
	common/lib/xmodule/xmodule/tests/test_progress.py
	common/lib/xmodule/xmodule/tests/test_xml_module.py
	lms/djangoapps/courseware/tests/__init__.py
 2013-06-18 13:41:53 -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
lapentab
b93f00e02f Rename system_test to get_test_system 2013-06-18 11:37:24 -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
d2b3977f57 Add dogstat logging to background tasks. 2013-06-18 11:13:55 -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
c1fff1568e reenable psychometrics for regrading 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
8660c9a7af Check descriptor to identify problems that don't support regrading. 2013-06-18 11:09:32 -04:00
Brian Wilson
73b25e1f32 Add check for problems that (do not) support regrading. 2013-06-18 11:09:32 -04:00
Brian Wilson
07d2de4789 Add tests for regrading at capa_module level. 2013-06-18 11:09:32 -04:00
Brian Wilson
ee5ffedfee Clean up task progress javascript. Add before/after scores to tracking of regrading requests. 2013-06-18 11:09:18 -04:00
Brian Wilson
91ac6e68e8 Define initial celery task on instructor dash. 
Add CourseTaskLog, and make calls to regrading.

Add regrading implementation, and hack the marshalling of request.
 2013-06-18 11:04:05 -04:00
Valera Rozuvan
3086f16d77 Added comment about enabling some Video Alpha tests when testing locally. Updated CHANGELOG. 2013-06-18 16:30:15 +03:00
Valera Rozuvan
b75876e3ac As per PR comments from reviewer, fixing coding style. 2013-06-18 16:30:15 +03:00
Anton Stupak
cfb9a54e21 Add tests for additional events 2013-06-18 16:30:15 +03:00
Anton Stupak
78e22a910e Disable tests because of problems with phantomjs 2013-06-18 16:30:15 +03:00
Anton Stupak
70889c3625 Add tests for Event Logger 2013-06-18 16:30:15 +03:00
Anto Stupak
499c682d95 Add tests for HTML5 part of Videoalpha 2013-06-18 16:30:14 +03:00
Anto Stupak
70cc9a168b Add tests for Youtube part of Videoalpha 2013-06-18 16:30:14 +03:00
Vasyl Nakvasiuk
80f38b8f3c python tests for videoalpha 2013-06-18 16:30:14 +03:00
Don Mitchell
085a590bdd timezone conversion: more unit tests 
and code reorganization
 2013-06-17 14:48:18 -04:00
Don Mitchell
9d464701f9 timezone conversion tests 2013-06-17 14:04:12 -04:00
Calen Pennington
82606a062c Make XModuleDescriptor use __init__ from XBlock 
Fixes JIRA LMS-203
 2013-06-17 13:38:57 -04:00
Calen Pennington
438ac3b1a4 Move video xmodule tests to xmodule directory 2013-06-17 13:38:29 -04:00
Don Mitchell
cb40e9ff88 Fix a few remaining tz naive dates 
And remove redundant but != date parsing methods. In process make
the general parsing function less lenient (don't default date nor
month)
 2013-06-17 13:26:45 -04:00
Chris Dodge
7cebb873df allow for an optional throw_on_not_found on contentstore().find() so we can clean up caller logic in the tests 2013-06-17 11:10:36 -04:00
Chris Dodge
7e46447cd5 there is no default for empty_asset_trashcan, caller must provide a list 2013-06-17 11:10:36 -04:00
Chris Dodge
7f1768f8f8 put back the verbose switch in xml_importer.py 2013-06-17 11:10:36 -04:00
Chris Dodge
70ee4b8060 add unit tests for asset delete/restore 2013-06-17 11:10:35 -04:00
Chris Dodge
85b904f176 fix sizing of the delete column 2013-06-17 11:09:52 -04:00
Chris Dodge
3fa6e77dff add new collection configuration to support a 'trashcan' for assets. Update class factory to allow callers to specify if they want the default set of assets or the trashcan 2013-06-17 11:09:52 -04:00
Valera Rozuvan
184c0a5c40 Added comment regarding the fact that the temporary bug fix should be eventually removed. 2013-06-17 09:17:48 +03:00
Peter Baratta
5b388f52c1 Merge pull request #125 from edx/pbaratta/calc-add-trig 
Simplify calc.py; add trig/other functions
 2013-06-14 10:08:09 -07:00
Anton Stupak
74426bdcc6 Add tracking of additional events 2013-06-14 11:30:21 +03:00
Valera Rozuvan
89da47a134 Merge pull request #138 from edx/valera/bugfix_firefox_videoalpha_speed_1 
force-refresh youtube iframe when changing speeds back to 1.0 in firefox
 2013-06-14 01:28:59 -07:00
Valera Rozuvan
72d7c9ca97 Moved the definition of autoplay attribute to videoalpha_module.py file. Changed double negative if statement for autoplay check to simple if. 2013-06-14 11:12:32 +03:00
Valera Rozuvan
66e106a9e2 Copied autoplay attribute from video xmoudle to videoalpha. Now students will have the video autoplaying, and in Studio it will be pause by default. 2013-06-14 11:12:32 +03:00