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
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
95c1c4b8a8 Refactor tracking and xqueue initialization to no longer require a request. Get tracking logs to work. Add transaction annotations. 
Make sure to read only once from result objects when getting result status,
so that values are consistent.
 2013-06-18 11:04:05 -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
Peter Fogg
a4032522a3 Fix merge conflict in CHANGELOG.rst. 2013-06-18 10:31:57 -04:00
David Baumgold
aa24508024 Add underscore.string library 
http://epeli.github.io/underscore.string/
 2013-06-18 10:23:18 -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
Peter Fogg
5cb456ba85 Fix merge conflict. 2013-06-17 16:49:22 -04:00
Peter Fogg
56015e4b94 Update CHANGELOG.rst; move acceptance test methods into more appropriate files; docstring cleaning. 2013-06-17 16:47:15 -04:00
JonahStanley
46da897610 Merge branch 'master' into jonahstanley/add-courseteam-tests 
Conflicts:
	cms/envs/test.py
 2013-06-17 16:43:56 -04:00
Christina Roberts
080c5e4bc1 Merge pull request #186 from edx/christina/latex_and_click 
Bug fix for LaTeX source not saving
 2013-06-17 13:36:49 -07:00
Renzo Lucioni
f528f61ec1 Add new Jasmine test to ensure Segment.io is called when appropriate 2013-06-17 16:18:07 -04:00
Don Mitchell
085a590bdd timezone conversion: more unit tests 
and code reorganization
 2013-06-17 14:48:18 -04:00
JonahStanley
ef1f523c55 Removed _MODULESTORE reference that was doing nothing 2013-06-17 14:12:42 -04:00
Don Mitchell
9d464701f9 timezone conversion tests 2013-06-17 14:04:12 -04:00
cahrens
298417c732 Remove waits by adding code in click that will try the operation multiple times (thanks to Jonah). 2013-06-17 13:55:15 -04:00
Renzo Lucioni
c30d2d2f52 Incorporate Segment.io into Logger.log with whitelist 2013-06-17 13:48:50 -04:00
Peter Fogg
8159e86141 Many changes to finish up PR. To wit: 
-- Changed docstrings to use double quote.
-- More consistent naming for youtube IDs (normal_speed_id -> youtube_id_1_0).
-- Formatting changes for readability.
-- Updated test XML to expect JSON-encoded strings; prevents tests from spuriously failing.
 2013-06-17 13:46:20 -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
Jean Manuel Nater
07486a4dbc Refactoring the code in tests.py to remove unnecessary dependencies on the XML Modulestore. 2013-06-17 11:54:16 -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
Renzo Lucioni
7518f32f5e Instrument sequentials with segment-io so we know when people switch tabs manually or using the arrows to navigate 2013-06-17 10:30:17 -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 Fogg
d8f307a50b Merge branch 'master' into peter-fogg/remove-video-xml 2013-06-14 15:33:51 -04:00
cahrens
2cf71b7ff3 Add helper method for typing in CodeMirror, make it robust to Mac and Unix. 2013-06-14 15:12:25 -04:00
Peter Fogg
6035d0a23a Addresses latest comments on pull request #132. In particular: 
- Make 1.0x speed default Youtube ID Lyla's introduction video.
- Add acceptance tests for toggling captions on/off.
- Move captions settings acceptance tests into video-editor.feature.
- Rename acceptance test methods to reflect their function.
- Remove undefined variable from video Jasmine tests.
- Test VideoDescriptor.from_xml when no attributes are set.
- Convert Stringy* to non-Stringy equivalents.
- Test parsing of Youtube ID strings and times in more cases.
- Remove some commented-out code.
 2013-06-14 14:08:28 -04: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
Peter Fogg
206f582503 Fix merge conflict in common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml. 2013-06-14 10:44:05 -04: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