Commits · e789c3820f1884b5ba51942d29e627650e03ead2 · edx / edx-platform · GitLab

16 Apr, 2013 20 commits
- Merge pull request #1837 from MITx/fix/vik/sa-and-coe · e789c382
```
Fix/vik/sa and coe
```
  VikParuchuri committed Apr 16, 2013
  e789c382 Browse Files
- Reformat code · 5125d8b0
  Vik Paruchuri committed Apr 16, 2013
  
  5125d8b0 Browse Files
- Merge remote-tracking branch 'origin/master' into fix/vik/sa-and-coe · d82ac2b7
  Vik Paruchuri committed Apr 16, 2013
  
  d82ac2b7 Browse Files
- Merge pull request #1859 from MITx/fix/brian/conditional-error · 2314c609
```
cope with ErrorModule as source (or required) module, and add tests.
```
  brianhw committed Apr 16, 2013
  2314c609 Browse Files
- Merge pull request #1845 from MITx/feature/brian/doc-html-text · 976b7192
```
add documentation for HTML textbook
```
  brianhw committed Apr 16, 2013
  976b7192 Browse Files
- Better test for get score · a71658cf
  Vik Paruchuri committed Apr 16, 2013
  
  a71658cf Browse Files
- Fix failing test · 36317b7d
  Vik Paruchuri committed Apr 16, 2013
  
  36317b7d Browse Files
- Minor fixes · 701bdc55
  Vik Paruchuri committed Apr 16, 2013
  
  701bdc55 Browse Files
- Convert some exception clauses · 65e25143
  Vik Paruchuri committed Apr 16, 2013
  
  65e25143 Browse Files
- Better max score handling · 2f6b7d1e
  Vik Paruchuri committed Apr 16, 2013
  
  2f6b7d1e 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
- Remove try except block for pg scoring · 338a5776
  Vik Paruchuri committed Apr 16, 2013
  
  338a5776 Browse Files
- Add in comments about max score calculation · b1ea6b20
  Vik Paruchuri committed Apr 16, 2013
  
  b1ea6b20 Browse Files
- Add in a log debug message for except clause. · dc7913dc
  Vik Paruchuri committed Apr 16, 2013
  
  dc7913dc Browse Files
- Add in a test, rescale preview images · 0d4b9d26
  Vik Paruchuri committed Apr 16, 2013
  
  0d4b9d26 Browse Files
- Disable nps survey in test environment · 3ff63f78
  Jay Zoldak committed Apr 16, 2013
  
  3ff63f78 Browse Files
- Comments for hotkeys · 9acc5922
  Vik Paruchuri committed Apr 16, 2013
  
  9acc5922 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
- cope with ErrorModule as source (or required) module, and add tests. · 7486e0f6
  Brian Wilson committed Apr 16, 2013
  
  7486e0f6 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 18 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
- remove code for supporting anchor_id on html textbooks, since it doesn't work · 2d9deaf3
  Brian Wilson committed Apr 12, 2013
  
  2d9deaf3 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