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
Vik Paruchuri
358482c55b
Add in test for child weight
2013-04-11 11:54:00 -04:00
Vik Paruchuri
4d3b4a60d6
Significantly less verbose test code
2013-04-11 11:51:27 -04:00
John Jarvis
0c1fd783cb
Setting the edxloggedin cookie on registration
...
Previously it was only set for login
2013-04-11 10:44:22 -04:00
Chris Dodge
e0bc823365
remove auto-provisioning because of a dependency problem between cms and lms
2013-04-11 10:42:03 -04:00
Vik Paruchuri
442d0fcf4f
Add tests for orderings with only one task
2013-04-10 17:41:10 -04:00
Vik Paruchuri
09e18cb815
Add in tests for alternate xml orderings
2013-04-10 17:38:31 -04:00
Vik Paruchuri
ca2eb9cd1b
Add in tests for combinedopenended scoring
2013-04-10 17:33:43 -04:00
Vik Paruchuri
820a2b407a
Add in js image upload preview
2013-04-10 17:06:02 -04:00
Vik Paruchuri
9f04769c00
Better confirmation for flagging
2013-04-10 16:16:13 -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
Vik Paruchuri
a64d57ae1d
Add popup when flag box is checked
2013-04-10 16:01:56 -04:00
Vik Paruchuri
2a5631da86
Code cleanup
2013-04-10 15:26:45 -04:00
Vik Paruchuri
cef4d0cb09
Display instructor feedback
2013-04-10 15:25:05 -04:00
Vik Paruchuri
799c8282bc
Fix hotkeys for combined open ended
2013-04-10 15:15:22 -04:00
Vik Paruchuri
d0ecbbb4cf
Fix hotkeys in peer and staff grading to use ctrl prefix
2013-04-10 15:10:48 -04: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
John Jarvis
54e5e3d31f
Adding the EDX_MKTG feature flag and links back to the marketing site
2013-04-10 14:29:55 -04:00
jarv
7102c23d6d
Merge pull request #1841 from MITx/fix/btalbot/loginregister-actions
...
Fix/btalbot/loginregister actions
2013-04-10 10:40:43 -07:00
Brian Talbot
22a56fddb4
edx.org - adding in an intermediate disabled state for login/register submit buttons when the form is first processed
2013-04-10 13:38:25 -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
