Ned Batchelder
d4db4c6dea
Fix encoding errors when hashing XML
...
We occasionally get UnicodeEncodeErrors from these two places,
because the XML is a Unicode string, and is implicitly encoded to ascii.
2013-06-07 07:10:32 -04:00
Ned Batchelder
cab49716b5
Whitelisted courses now run Python code outside the sandbox.
2013-06-06 14:27:12 -04:00
Ned Batchelder
9a631fe476
All uses of safe_exec need to get the correct random seed.
2013-06-06 14:27:12 -04:00
Calen Pennington
5489a3b645
Merge pull request #44 from edx/feature/cale/run-all-tests
...
Run all tests on jenkins
2013-06-06 09:52:27 -07:00
Peter Fogg
4415fb4c42
Started removing XML from video editor.
...
TODO: This breaks the 1.5x and .75x speeds. I'm still looking into
why.
TODO: VideoDescriptor inherits from RawDescriptor in order to
use the from_xml and export_to_xml methods. This seems really ugly,
though; I'd rather find a better way to do this.
2013-06-06 10:29:24 -04:00
Vasyl Nakvasiuk
45e32107e7
video module: remove old methods
2013-06-06 16:46:47 +03:00
Vasyl Nakvasiuk
68716f99cc
video module: _get_timeframe -> get_timeframe
2013-06-06 16:46:47 +03:00
Anto Stupak
8b06916eb6
Fix tests for firefox
2013-06-06 16:45:16 +03:00
Anton Stupak
7eb18fe019
adds test files for video
2013-06-06 16:45:16 +03:00
Peter Baratta
83f1f9c2fc
Set numpy so it does not print out warnings on student input
2013-06-05 15:50:35 -04:00
Peter Baratta
a85a7f71df
Rename variables; get rid of OPS
2013-06-05 15:50:17 -04:00
Calen Pennington
16fc7b37fb
Make xmodule_assets incremental, rather than removing the entire generated asset tree
2013-06-05 13:08:53 -04:00
Chris Dodge
4391783248
add exporting of 'about' content as well as adding unit test checks
2013-06-05 12:40:09 -04:00
Diana Huang
ff7b851f95
Merge pull request #4 from edx/diana/fix-error-descriptor
...
Ensure that the original error gets preserved by the ErrorModule
2013-06-05 07:39:40 -07:00
Joe Blaylock
e092aadbf9
Merge pull request #48 from edx/jrbl/substitute-anonymous-user-id-in-html
...
Expose site-wide anonymized ids to HTML module
2013-06-04 14:13:59 -07:00
Diana Huang
d895c64f4a
Use full descriptor when showing errors, not just the model data.
2013-06-04 10:43:06 -04:00
Diana Huang
f3b36b8bc9
Use from_descriptor instead of from_xml to make ErrorDescriptor
2013-06-03 17:21:41 -04:00
Joe Blaylock
6262274805
Expose site-wide anonymized ids to HTML module
...
Co-authored-by: Nate Hardison <natehardison@gmail.com >
2013-06-03 11:35:42 -07:00
Ned Batchelder
c865641f13
Merge pull request #23 from edx/ned/move-loncapa-etc-into-sandbox
...
Ned/move loncapa etc into sandbox
2013-06-03 11:27:16 -07:00
jkarni
4bc27b930c
Merge pull request #47 from edx/hotfix/jkarni/folditpartialcred
...
Add partial credit for foldit
2013-06-03 09:19:10 -07:00
Julian Arni
198d63db86
Update docstring for get_score
2013-06-03 12:13:05 -04:00
Julian Arni
c639bbc6f0
Add partial credit for foldit
2013-06-03 11:15:45 -04:00
Peter Baratta
72d149caae
Add docstrings and comments
2013-06-03 10:46:11 -04:00
Peter Baratta
ed45c505a3
Simpler pyparsing
2013-06-03 10:44:06 -04:00
Peter Baratta
74866a38b0
Move parseActions and statics out of evaluator()
2013-06-03 10:42:42 -04:00
Peter Fogg
8c5f9e6e41
Fix merge conflict.
2013-06-03 08:49:52 -04:00
Christina Roberts
52b76c87f4
Merge pull request #11 from edx/feature/christina/metadata-ui
...
Feature/christina/metadata ui
2013-06-01 16:01:53 -07:00
Ned Batchelder
88d3f253b6
Move symmath to be its own directory, and install it into the sandbox.
2013-05-31 15:22:16 -04:00
VikParuchuri
4a997842c7
Merge pull request #2 from edx/fix/vik/single-step-oe
...
Fix js that prevented single step OE problems (ie only self assessment) ...
2013-05-31 12:10:45 -07:00
Jay Zoldak
cd82bd054d
Merge pull request #20 from edx/zoldak/distribute-version
...
require distribute >= because there is an old branch out there that messes up the build server
2013-05-31 12:09:17 -07:00
Ned Batchelder
98673f8e6a
Somehow, when I moved symmath, I left behind its test files!?
2013-05-31 14:39:23 -04:00
VikParuchuri
1c0bcf476a
Merge pull request #3 from edx/fix/vik/speed-up-oe-test
...
Fix/vik/speed up oe test
2013-05-31 11:05:35 -07:00
Vik Paruchuri
badd3a8d13
Properly stub out the controller_qs variable in the tested module. Test times out without this.
2013-05-31 13:14:19 -04:00
Vik Paruchuri
9281a80089
Fix js that prevented single step OE problems (ie only self assessment) from working
2013-05-31 13:08:41 -04:00
marco
290d049c29
Merge branch 'feature/christina/metadata-ui' of https://github.com/edx/edx-platform into feature/christina/metadata-ui
2013-05-31 12:41:13 -04:00
marco
72e1fab1c4
SASS variable and naming standards sync-up based on @talbs feedback completed
2013-05-31 12:40:40 -04:00
Peter Baratta
ff3997e72e
Add test to verify a single period is not accepted as input
2013-05-31 12:37:14 -04:00
Ned Batchelder
1bedc2e4bd
Change the file paths to be less specific.
2013-05-31 12:23:58 -04:00
Ned Batchelder
35a1dc123a
Wrap the lines so I can read the text.
2013-05-31 12:23:16 -04:00
Ned Batchelder
9314154ec1
Move loncapa grading helpers into the sandbox-packages directory.
2013-05-31 12:01:33 -04:00
cahrens
ab5834fb41
Pylint cleanup.
2013-05-31 11:26:19 -04:00
Jay Zoldak
a5ee903ef5
Pin capa to require distribute greater than 28 because an old branch had it at 30
2013-05-31 11:24:49 -04:00
Peter Baratta
087834337a
Pep8 newline
2013-05-31 11:05:21 -04:00
Peter Baratta
80a27f9391
Add test and functionality for trailing period
2013-05-31 10:41:08 -04:00
cahrens
e6dfa8e81c
Merge branch 'master' into feature/christina/metadata-ui
2013-05-31 09:46:17 -04:00
Peter Baratta
e17f9f6c37
Merge pull request #2108 from edx/pbaratta/calc-tests
...
Add some testing to calc.py prior to changes
2013-05-30 12:54:52 -07:00
cahrens
8fd15ce45d
Review feedback.
2013-05-30 14:13:10 -04:00
cahrens
14eb9c9a3b
Merge branch 'master' into feature/christina/metadata-ui
2013-05-30 12:27:03 -04:00
Diana Huang
5118b06ef2
Merge pull request #2147 from edx/diana/fix-error-descriptor
...
Fix XML Error Module so that it no longer shows the data to non-staff.
2013-05-30 08:52:41 -07:00
Peter Fogg
6eeb12ad1c
Add Lettuce tests for autoplay in Studio.
2013-05-30 11:34:15 -04:00
