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
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
9f3bad672a
Move the license test over to CourseFactory
2013-04-16 11:40:05 -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
d7796f4d47
Put test database into test_root
2013-04-16 11:40:04 -04:00
Calen Pennington
369c4a3195
Don't try and install test-requirements.txt anymore
2013-04-16 11:40:04 -04:00
Calen Pennington
708ef88d81
Rearrange requirements so that we always have test requirements installed
2013-04-16 11:40:04 -04:00
Calen Pennington
a06c1a4b57
Fix warnings to actually use correct format for string interpolation
2013-04-16 11:40:04 -04:00
Calen Pennington
deddd40c17
Pin the factory boy version
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
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
ichuang
5f74ccd1a0
use ENABLE_MASQUERADE in masquerade.py
2013-04-13 22:52:17 -04:00
ichuang
5ca0393e05
add test for masquerade
2013-04-13 22:47:49 -04:00
ichuang
fac9d758d8
fix typo in masquerade url name
2013-04-13 22:47:43 -04:00
ichuang
1c2452e401
make is_masquerading_as_student work with Mock for tests
2013-04-13 22:47:34 -04:00
ichuang
857a6e0bd0
pylint masquerade fixes
2013-04-13 22:47:28 -04:00
ichuang
fdfc37e4e3
masquerade pep8
2013-04-13 22:47:21 -04:00
ichuang
af3e08e8c7
masquerade link in courseware/views.py
2013-04-13 22:47:15 -04:00
ichuang
3b4093ab7b
url and mitx_settings for masquerade
2013-04-13 22:47:04 -04:00
ichuang
168a3aadf6
masquerade - remove debug line, careful with ifs in course_nav.html
2013-04-13 22:46:55 -04:00
ichuang
ffb125f8a9
course_navigation for masquerade
2013-04-13 22:46:48 -04:00
ichuang
fb0a23238a
allow staff to masquerade as student - works
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/course_navigation.html
2013-04-13 22:46:39 -04:00
ichuang
c905cc7416
add masquerade.py
2013-04-13 22:46:30 -04: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
