Calen Pennington
8c54d5d610
Fix accidental force push that reset master
...
Master went from 5d912b88616f05c5ec10e89b336bd1088042bba0 to
e43c2bd410
2013-04-26 10:50:53 -04:00
cahrens
c7962cf07b
Don't explicitly declare display_name.
2013-04-24 16:41:58 -04:00
Calen Pennington
9d94adbd1f
Merge pull request #1871 from MITx/feature/cale/fast-dev-server
...
Speed up local development
2013-04-24 12:12:05 -07:00
cahrens
45f86b662a
Delete unused file.
2013-04-24 14:59:32 -04:00
cahrens
cc2d06975e
Remove duplicated StringyX definitions.
2013-04-24 14:59:32 -04:00
cahrens
9e9886339a
Refer to inherited field.
2013-04-24 14:59:31 -04:00
cahrens
e874de1249
Some cleanup TODOs.
2013-04-24 14:59:31 -04:00
Diana Huang
d7f2d4b710
Merge pull request #1876 from MITx/diana/matlab-input-updates
...
Make updates to the MatlabInput InputType
2013-04-22 13:46:15 -07:00
Diana Huang
32881ed265
Change the name of the button so that it is clearer.
2013-04-22 16:38:41 -04:00
Chris Dodge
506a9a20aa
when updating the list of children of sequentials, we must use the 'direct' store otherwise we end up with draft revisions of sequentials, which is bad
2013-04-22 10:13:33 -04:00
Diana Huang
181eebc942
Miscellaneous updates and fixes.
...
* Hide "Test Code" button after we check the problem
* Only set the state of the problem to 'queued' if we have successfully
queued the problem
* Unit tests for bugs and new functionality
2013-04-18 16:37:36 -04:00
Calen Pennington
f7cad77b93
Ignore errors when deleting the old xmodule compiled assets directory
2013-04-18 15:45:32 -04:00
Calen Pennington
729daf5cbf
Move xmodule asset gathering out of server startup
...
This allows us to a) compile the coffeescript and sass from xmodules
using the new out-of-band method and b) reload xmodule static content
whenever it changes, which should make devs much happier.
2013-04-18 15:19:19 -04:00
Diana Huang
03daefb924
Change the name of the plot button
2013-04-18 14:31:51 -04:00
Will Daly
a4717aca90
Pep8 fixes
2013-04-18 09:49:05 -04:00
Calen Pennington
346aee8863
Make django-pipeline only work with raw js and css
2013-04-18 07:18:36 -04:00
Calen Pennington
9c7ba41880
Only add the xmodule.coffee file once per class, and put it before all other coffeescript files
2013-04-18 07:18:36 -04:00
Will Daly
a57a093e73
Rebased to master
2013-04-17 15:56:05 -04:00
Will Daly
841d3484c8
Added test for textline input template
2013-04-17 15:46:24 -04:00
Will Daly
52c2f3ae37
Tested additional values of rerandomize (true/false/per_student)
...
Pylint fixes
2013-04-17 15:32:39 -04:00
Will Daly
754d1eb702
Added tests for ChoiceGroup template
2013-04-17 15:32:39 -04:00
Calen Pennington
6c7c49e6bd
Fix pep8 violations
2013-04-17 11:07:58 -04:00
Calen Pennington
3cd414afbb
Merge pull request #1825 from MITx/fix/cale/gradebook
...
Fix/cale/gradebook
2013-04-17 07:37:02 -07:00
Don Mitchell
24189378d6
Merge pull request #1864 from MITx/bug/christina/export
...
Don't try to export orphaned draft items.
2013-04-16 14:24:49 -07:00
cahrens
8c336ef998
Don't try to export orphaned draft items.
...
#278
2013-04-16 17:05:11 -04:00
Vik Paruchuri
5125d8b0de
Reformat code
2013-04-16 13:48:58 -04:00
Vik Paruchuri
d82ac2b747
Merge remote-tracking branch 'origin/master' into fix/vik/sa-and-coe
2013-04-16 13:45:46 -04:00
brianhw
2314c609b6
Merge pull request #1859 from MITx/fix/brian/conditional-error
...
cope with ErrorModule as source (or required) module, and add tests.
2013-04-16 10:16:56 -07:00
Vik Paruchuri
a71658cf77
Better test for get score
2013-04-16 12:12:12 -04:00
Vik Paruchuri
36317b7d29
Fix failing test
2013-04-16 11:59:03 -04:00
Vik Paruchuri
701bdc55c0
Minor fixes
2013-04-16 11:55:54 -04:00
Vik Paruchuri
65e2514334
Convert some exception clauses
2013-04-16 11:45:57 -04:00
Calen Pennington
bf6b886ccd
Fix pylint and pep8 errors
2013-04-16 11:45:21 -04:00
Vik Paruchuri
2f6b7d1e44
Better max score handling
2013-04-16 11:41:35 -04:00
Calen Pennington
13a485076f
Properly save and restore settings.MODULESTORE, and clear at django._MODULESTORES at the end of the test
2013-04-16 11:40:04 -04:00
Calen Pennington
5f4004c5ad
Clean up whitespace
2013-04-16 11:40:04 -04:00
Calen Pennington
6644b78819
Fix gradebook when using grade cutoffs other than A/B/C
2013-04-16 11:38:58 -04:00
Vik Paruchuri
338a57768f
Remove try except block for pg scoring
2013-04-16 11:01:57 -04:00
Vik Paruchuri
b1ea6b2012
Add in comments about max score calculation
2013-04-16 10:58:58 -04:00
Vik Paruchuri
dc7913dc1e
Add in a log debug message for except clause.
2013-04-16 10:55:58 -04:00
Vik Paruchuri
0d4b9d26cf
Add in a test, rescale preview images
2013-04-16 10:51:23 -04:00
Vik Paruchuri
9acc592279
Comments for hotkeys
2013-04-16 10:23:08 -04:00
Jay Zoldak
f0fb77845e
Merge pull request #1856 from MITx/fix/will/pep8-fixes
...
Pep8 fixes for drag and drop tests
2013-04-16 06:48:44 -07:00
Brian Wilson
7486e0f637
cope with ErrorModule as source (or required) module, and add tests.
2013-04-16 01:00:46 -04:00
Will Daly
917945807b
Pep8 fixes for drag and drop tests
2013-04-12 16:37:52 -04:00
Chris Dodge
8ece663284
more drive by violation fixes
2013-04-12 15:45:27 -04:00
Chris Dodge
6d6b3a59fe
violation fixes
2013-04-12 15:27:36 -04:00
Diana Huang
ff1189c5e8
Pylint and Pep8 fixes
2013-04-12 13:23:42 -04:00
Diana Huang
06a54a8c38
Consolidate tests into one larger test
2013-04-12 10:59:03 -04:00
Diana Huang
ab7a616552
Add the ability to handle escaped HTML characters in trailing text
...
Add tests for unicode and escaped HTML characters
2013-04-12 10:59:03 -04:00
