Calen Pennington
f2cd0bbc97
Add comment about enabling pdb in tests
...
Uncommenting the pdb=1 line will cause pdb to open on every test
failure, allowing immediate debugging of the failure case
2013-04-17 10:34:48 -04:00
Calen Pennington
f252c62f31
Enable test colors in nosetests
...
Use setup.cfg to set up default settings when running nose tests. Enable
the rednose library to color test output.
2013-04-17 09:58:52 -04: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
brianhw
91d84c0208
Merge pull request #1863 from MITx/fix/brian/jobs-20130410
...
Update with 2013-04-10 changes
2013-04-16 12:56:58 -07:00
Brian Wilson
7f90e31709
Update with 2013-04-10 changes
2013-04-16 15:43:14 -04:00
John Hess
ee4d70cf84
Merge pull request #1862 from MITx/jmclaus/genex-grading-fix
...
Grading works when sequence is loaded from saved state
2013-04-16 12:22:52 -07:00
Carlos Andrés Rocha
a947f620a0
Merge pull request #1861 from MITx/fix/btalbot/stanford-logo
...
fixing the visual display of the stanford logo
2013-04-16 11:50:43 -07:00
Brian Talbot
b417651cf1
fixing the visual display of the stanford logo used in press releases on the homepage and dashboard (proportions were off)
2013-04-16 14:47:26 -04:00
VikParuchuri
e789c3820f
Merge pull request #1837 from MITx/fix/vik/sa-and-coe
...
Fix/vik/sa and coe
2013-04-16 11:19:59 -07: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
brianhw
976b71929d
Merge pull request #1845 from MITx/feature/brian/doc-html-text
...
add documentation for HTML textbook
2013-04-16 10:15:49 -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
Vik Paruchuri
2f6b7d1e44
Better max score handling
2013-04-16 11:41:35 -04:00
Mark L. Chang
f51aea1889
Merge pull request #1860 from MITx/fix/zoldak/disable-nps
...
Disable nps survey in test environment
2013-04-16 08:08:10 -07: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
Jay Zoldak
3ff63f78b0
Disable nps survey in test environment
2013-04-16 10:37:43 -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
Don Mitchell
9ac85b43b1
Merge pull request #1857 from MITx/fix/cdodge/violation-fixes
...
more cleanups in CMS project
2013-04-16 06:11:33 -07:00
Brian Wilson
7486e0f637
cope with ErrorModule as source (or required) module, and add tests.
2013-04-16 01:00:46 -04:00
jmclaus
edfa456483
Grading works when sequence is loaded from saved state
2013-04-15 14:05:39 +02:00
Chris Dodge
00674ee66b
need timedelta import
2013-04-13 21:21:15 -04:00
Chris Dodge
b4fe23f3a2
more cleanups in CMS project
2013-04-13 21:13:34 -04:00
Will Daly
917945807b
Pep8 fixes for drag and drop tests
2013-04-12 16:37:52 -04:00
Christina Roberts
260dc84f1f
Merge pull request #1854 from MITx/fix/cdodge/violation-fixes
...
violation fixes
2013-04-12 13:14:29 -07:00
Piotr Mitros
c0b32caad2
Merge pull request #1855 from MITx/fix/dcadams/npm_incompatibility
...
Remove npm package from Ubuntu installation dependencies file.
2013-04-12 13:05:34 -07:00
Chris Dodge
3ca2bf4627
move lines together
2013-04-12 15:51:47 -04:00
dcadams
d6fb5a7cc7
Remove npm package from Ubuntu installation dependencies file.
...
Install of edX gives the following error:
-----------------------------------------------
The following packages have unmet dependencies:
nodejs : Conflicts: npm
E: Unable to correct problems, you have held broken packages.
-----------------------------------------------
This is caused by the latest version of nodejs including npm and being
incompatible with the previous version.
Fix is to remove npm line from apt-packages.txt
2013-04-12 12:50:04 -07: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
d4536c657d
Merge pull request #1852 from MITx/feature/diana/textline-trailing
...
Pylint and Pep8 fixes for InputTypes
2013-04-12 10:47:32 -07:00
Diana Huang
ff1189c5e8
Pylint and Pep8 fixes
2013-04-12 13:23:42 -04:00
Brian Wilson
2d9deaf38c
remove code for supporting anchor_id on html textbooks, since it doesn't work
2013-04-12 11:53:06 -04:00
Diana Huang
13aed41790
Merge pull request #1843 from MITx/feature/diana/textline-trailing
...
Add the ability to add trailing text to textlines
2013-04-12 08:50:38 -07: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
Diana Huang
d6e722a698
Remove unnecessary check and add better textline documentation
2013-04-12 10:59:03 -04:00
Diana Huang
fd35b2c7e3
Fix and create new test for trailing text
2013-04-12 10:59:03 -04:00
Diana Huang
c93b8076bf
Add trailing text to textlines, most useful for units.
2013-04-12 10:59:03 -04:00
Calen Pennington
734b169ebd
Merge pull request #1851 from MITx/fix/zoldak/test-login-pylint
...
fix pylint errors in test_login.py
2013-04-12 07:46:35 -07:00
Jay Zoldak
d8c186d3a1
fix pylint errors in test_login.py
2013-04-12 10:25:12 -04:00
