Commits · bf6b886ccd0c96beef3a17c6ebd2eb3a2e83b938 · edx / edx-platform · GitLab

16 Apr, 2013 14 commits
- Fix pylint and pep8 errors · bf6b886c
  Calen Pennington committed Apr 16, 2013
  
  bf6b886c Browse Files
- Move the license test over to CourseFactory · 9f3bad67
  Calen Pennington committed Apr 16, 2013
  
  9f3bad67 Browse Files
- Properly save and restore settings.MODULESTORE, and clear at… · 13a48507
```
Properly save and restore settings.MODULESTORE, and clear at django._MODULESTORES at the end of the test
```
  Calen Pennington committed Apr 16, 2013
  13a48507 Browse Files
- Put test database into test_root · d7796f4d
  Calen Pennington committed Apr 16, 2013
  
  d7796f4d Browse Files
- Don't try and install test-requirements.txt anymore · 369c4a31
  Calen Pennington committed Apr 16, 2013
  
  369c4a31 Browse Files
- Rearrange requirements so that we always have test requirements installed · 708ef88d
  Calen Pennington committed Apr 16, 2013
  
  708ef88d Browse Files
- Fix warnings to actually use correct format for string interpolation · a06c1a4b
  Calen Pennington committed Apr 16, 2013
  
  a06c1a4b Browse Files
- Pin the factory boy version · deddd40c
  Calen Pennington committed Apr 16, 2013
  
  deddd40c Browse Files
- Clean up whitespace · 5f4004c5
  Calen Pennington committed Apr 16, 2013
  
  5f4004c5 Browse Files
- Fix gradebook when using grade cutoffs other than A/B/C · 6644b788
  Calen Pennington committed Apr 16, 2013
  
  6644b788 Browse Files
- Merge pull request #1860 from MITx/fix/zoldak/disable-nps · f51aea18
```
Disable nps survey in test environment
```
  Mark L. Chang committed Apr 16, 2013
  f51aea18 Browse Files
- Disable nps survey in test environment · 3ff63f78
  Jay Zoldak committed Apr 16, 2013
  
  3ff63f78 Browse Files
- Merge pull request #1856 from MITx/fix/will/pep8-fixes · f0fb7784
```
Pep8 fixes for drag and drop tests
```
  Jay Zoldak committed Apr 16, 2013
  f0fb7784 Browse Files
- Merge pull request #1857 from MITx/fix/cdodge/violation-fixes · 9ac85b43
```
more cleanups in CMS project
```
  Don Mitchell committed Apr 16, 2013
  9ac85b43 Browse Files
14 Apr, 2013 2 commits
- need timedelta import · 00674ee6
  Chris Dodge committed Apr 13, 2013
  
  00674ee6 Browse Files
- more cleanups in CMS project · b4fe23f3
  Chris Dodge committed Apr 13, 2013
  
  b4fe23f3 Browse Files
12 Apr, 2013 23 commits
- Pep8 fixes for drag and drop tests · 91794580
  Will Daly committed Apr 12, 2013
  
  91794580 Browse Files
- Merge pull request #1854 from MITx/fix/cdodge/violation-fixes · 260dc84f
```
violation fixes
```
  Christina Roberts committed Apr 12, 2013
  260dc84f Browse Files
- Merge pull request #1855 from MITx/fix/dcadams/npm_incompatibility · c0b32caa
```
Remove npm package from Ubuntu installation dependencies file.
```
  Piotr Mitros committed Apr 12, 2013
  c0b32caa Browse Files
- move lines together · 3ca2bf46
  Chris Dodge committed Apr 12, 2013
  
  3ca2bf46 Browse Files
- Remove npm package from Ubuntu installation dependencies file. · d6fb5a7c
```
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
```
  dcadams committed Apr 12, 2013
  d6fb5a7c Browse Files
- more drive by violation fixes · 8ece6632
  Chris Dodge committed Apr 12, 2013
  
  8ece6632 Browse Files
- violation fixes · 6d6b3a59
  Chris Dodge committed Apr 12, 2013
  
  6d6b3a59 Browse Files
- Merge pull request #1852 from MITx/feature/diana/textline-trailing · d4536c65
```
Pylint and Pep8 fixes for InputTypes
```
  Diana Huang committed Apr 12, 2013
  d4536c65 Browse Files
- Pylint and Pep8 fixes · ff1189c5
  Diana Huang committed Apr 12, 2013
  
  ff1189c5 Browse Files
- Merge pull request #1843 from MITx/feature/diana/textline-trailing · 13aed417
```
Add the ability to add trailing text to textlines
```
  Diana Huang committed Apr 12, 2013
  13aed417 Browse Files
- Consolidate tests into one larger test · 06a54a8c
  Diana Huang committed Apr 12, 2013
  
  06a54a8c Browse Files
- Add the ability to handle escaped HTML characters in trailing text · ab7a6165
```
Add tests for unicode and escaped HTML characters
```
  Diana Huang committed Apr 12, 2013
  ab7a6165 Browse Files
- Remove unnecessary check and add better textline documentation · d6e722a6
  Diana Huang committed Apr 12, 2013
  
  d6e722a6 Browse Files
- Fix and create new test for trailing text · fd35b2c7
  Diana Huang committed Apr 12, 2013
  
  fd35b2c7 Browse Files
- Add trailing text to textlines, most useful for units. · c93b8076
  Diana Huang committed Apr 12, 2013
  
  c93b8076 Browse Files
- Merge pull request #1851 from MITx/fix/zoldak/test-login-pylint · 734b169e
```
fix pylint errors in test_login.py
```
  Calen Pennington committed Apr 12, 2013
  734b169e Browse Files
- fix pylint errors in test_login.py · d8c186d3
  Jay Zoldak committed Apr 12, 2013
  
  d8c186d3 Browse Files
- Merge pull request #1850 from MITx/fix/cdodge/studio-forum-improvements · e4c9e1bb
```
Fix/cdodge/studio forum improvements
```
  Don Mitchell committed Apr 12, 2013
  e4c9e1bb Browse Files
- add unit test to assert that get_items() is not using revision=None as a wildcard · 4345c8e0
  Chris Dodge committed Apr 12, 2013
  
  4345c8e0 Browse Files
- Merge pull request #1848 from MITx/fix/zoldak/test-login-pylint · fc221a09
```
Fix pylint errors
```
  Jay Zoldak committed Apr 12, 2013
  fc221a09 Browse Files
- actually the query parameter is '_id.revision' not just 'revision' · 1a3c622b
  Chris Dodge committed Apr 11, 2013
  
  1a3c622b Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements · cf7d7bd2
  Chris Dodge committed Apr 11, 2013
  
  cf7d7bd2 Browse Files
- get_items has an query ambiguity with respect to revision=None. None has a… · 8fd85743
```
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.
```
  Chris Dodge committed Apr 11, 2013
  8fd85743 Browse Files
11 Apr, 2013 1 commit
- Fix pylint errors · 1cc6a0a6
  Jay Zoldak committed Apr 11, 2013
  
  1cc6a0a6 Browse Files