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
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
Jay Zoldak
3ff63f78b0
Disable nps survey in test environment
2013-04-16 10:37:43 -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
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
Don Mitchell
e4c9e1bb9e
Merge pull request #1850 from MITx/fix/cdodge/studio-forum-improvements
...
Fix/cdodge/studio forum improvements
2013-04-12 06:58:54 -07:00
Chris Dodge
4345c8e09c
add unit test to assert that get_items() is not using revision=None as a wildcard
2013-04-12 09:48:11 -04:00
Jay Zoldak
fc221a09b0
Merge pull request #1848 from MITx/fix/zoldak/test-login-pylint
...
Fix pylint errors
2013-04-12 06:33:56 -07:00
Chris Dodge
1a3c622bb6
actually the query parameter is '_id.revision' not just 'revision'
2013-04-11 22:32:35 -04:00
Chris Dodge
cf7d7bd2d9
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
2013-04-11 22:12:17 -04:00
Chris Dodge
8fd8574357
get_items has an query ambiguity with respect to revision=None. None has a special semantic in get_items as a wildcard, so if we query with 'None' then we'll get back both draft and non-draft items.
2013-04-11 22:10:30 -04:00
Jay Zoldak
1cc6a0a60d
Fix pylint errors
2013-04-11 17:20:38 -04:00
Will Daly
7e35bf1912
Merge pull request #1846 from MITx/feature/zoldak/test-user-profile-factory
...
Convert login tests to use factories
2013-04-11 13:57:29 -07:00
Jay Zoldak
bb1134b8ee
Convert login tests to use factories
2013-04-11 16:54:16 -04:00
Brian Wilson
123cfa333f
add documentation for HTML textbook
2013-04-11 16:42:14 -04:00
Will Daly
dce0b53ca5
Merge pull request #1844 from MITx/feature/zoldak/cs-mock
...
Create a mock comment service that will listen for HTTP requests on a port
2013-04-11 11:26:08 -07:00
Jay Zoldak
88852c4b26
pep8 and pylint cleanup of new files
2013-04-11 14:11:30 -04:00
Jay Zoldak
442141fa04
Create a mock comment service that will listen for HTTP requests on a port
2013-04-11 14:08:32 -04:00
Christina Roberts
c455710cca
Merge pull request #1815 from MITx/fix/cdodge/studio-forum-improvements
...
Fix/cdodge/studio forum improvements
2013-04-11 10:37:49 -07:00
Chris Dodge
e0bc823365
remove auto-provisioning because of a dependency problem between cms and lms
2013-04-11 10:42:03 -04:00
Don Mitchell
f6434ed4fb
Merge pull request #1840 from MITx/fix/cdodge/export-draft-modules
...
Fix/cdodge/export draft modules
2013-04-10 13:12:09 -07:00
chrisndodge
4d9dd40268
Merge pull request #1842 from MITx/feature/christina/metadata
...
Get the "Edit High Level Source" link back in for LaTeX problems. Broken with xblock work.
2013-04-10 12:05:06 -07:00
cahrens
40adfa950d
Get the "Edit High Level Source" link back in. Broken with xblock work.
...
https://edx.lighthouseapp.com/projects/102637-studio/tickets/273
2013-04-10 14:53:26 -04:00
Chris Dodge
0a2937311d
remove commented out code. Also fix up indents and other violations
2013-04-10 12:34:18 -04:00
Chris Dodge
d9fa723eb2
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
...
Conflicts:
common/lib/xmodule/xmodule/modulestore/xml_importer.py
2013-04-10 12:02:16 -04:00
Christina Roberts
276b86a779
Merge pull request #1833 from MITx/feature/btalbot/studio-courselink
...
Feature/btalbot/studio courselink
2013-04-10 07:52:19 -07:00
Brian Talbot
97e893b2ed
Merge branch 'master' into feature/btalbot/studio-courselink
2013-04-10 10:48:33 -04:00
Brian Talbot
01b2fefdd0
studio - revised course URL link label to match wording used elsewhere in the view/app
2013-04-10 10:48:12 -04:00
