Commits · cfd7e6d2147bec50ec0be8a912cfb0592ad987c9 · edx / edx-platform · GitLab

12 Mar, 2013 5 commits
- Coerce correctmap keys to strings, so that they are pickleable · cfd7e6d2
  Calen Pennington committed Mar 12, 2013
  
  cfd7e6d2 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged · 21135416
```
Conflicts:
	.ruby-version
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/models/settings/course_metadata.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
```
  Calen Pennington committed Mar 12, 2013
  21135416 Browse Files
- Don't use mutable defaults for fields · 40f134ed
  Calen Pennington committed Mar 11, 2013
  
  40f134ed Browse Files
- Merge pull request #1651 from MITx/fix/cdodge/pylint-improvements · 90caa65b
```
do a bunch of pylint improvements
```
  chrisndodge committed Mar 11, 2013
  90caa65b Browse Files
- do a bunch of pylint improvements · bf0e5a27
  Chris Dodge committed Mar 11, 2013
  
  bf0e5a27 Browse Files
11 Mar, 2013 35 commits
- Merge pull request #1646 from MITx/feature/jkarni/folditx · 331806f1
```
Feature/jkarni/folditx
```
  John Hess committed Mar 11, 2013
  331806f1 Browse Files
- whitespace back to original. for real though. · ad92eb4d
  John Hess committed Mar 11, 2013
  
  ad92eb4d Browse Files
- whitespace back to original · 00c35c95
  John Hess committed Mar 11, 2013
  
  00c35c95 Browse Files
- reverted change to definition to/from xml · cc2c26b9
  John Hess committed Mar 11, 2013
  
  cc2c26b9 Browse Files
- Make default course grading weights integers, to minimize floating point variation · a39d607a
  Calen Pennington committed Mar 11, 2013
  
  a39d607a Browse Files
- Be a little more liberal with what count's as not having a due date in a section · 4cea094f
  Calen Pennington committed Mar 11, 2013
  
  4cea094f Browse Files
- Merge pull request #1647 from MITx/fix/zoldak/pep8-cleanup-tests · 894f9171
```
Fix modulestore tests for pep8 violations
```
  chrisndodge committed Mar 11, 2013
  894f9171 Browse Files
- Fix modulestore tests for pep8 violations · 1c98d5fc
  Jay Zoldak committed Mar 11, 2013
  
  1c98d5fc Browse Files
- Merge pull request #1645 from MITx/feature/cdodge/pylint-cleanup · d85f7ac9
```
Feature/cdodge/pylint cleanup
```
  Don Mitchell committed Mar 11, 2013
  d85f7ac9 Browse Files
- Fixed score order. · 6e92666a
```
  Less is more.
```
  Julian Arni committed Mar 11, 2013
  6e92666a Browse Files
- clean up some pylint violations · 4ec3683c
  Chris Dodge committed Mar 11, 2013
  
  4ec3683c Browse Files
- clean up some pylint violations · 26f44245
  Chris Dodge committed Mar 11, 2013
  
  26f44245 Browse Files
- clean up pyling violations from views.py · 78c83589
  Chris Dodge committed Mar 11, 2013
  
  78c83589 Browse Files
- Merge pull request #1636 from MITx/feature/brian/htmlbook · 0605c941
```
Initial implementation of htmlbook.
```
  David Ormsbee committed Mar 11, 2013
  0605c941 Browse Files
- Use .get to avoid key errors during inheritance · de46666a
  Calen Pennington committed Mar 11, 2013
  
  de46666a Browse Files
- Iterate over metadata items when setting module info · 07059d0d
  Calen Pennington committed Mar 11, 2013
  
  07059d0d Browse Files
- Don't write data to metadata when updating course grading · 7e134977
  Calen Pennington committed Mar 11, 2013
  
  7e134977 Browse Files
- return empty list if no html or pdf textbook appears in policy.json · 53f85f2a
  Brian Wilson committed Mar 11, 2013
  
  53f85f2a Browse Files
- Log ErrorDescriptor creation as a warning · a9431176
  Calen Pennington committed Mar 11, 2013
  
  a9431176 Browse Files
- Fix bad reference to item_location · c1dbd985
  Calen Pennington committed Mar 11, 2013
  
  c1dbd985 Browse Files
- Merge pull request #1642 from MITx/fix/rocha/numericresponse-exponential · aceb6660
```
Make numeric response handle plus sign exponential correctly
```
  David Ormsbee committed Mar 11, 2013
  aceb6660 Browse Files
- Merge pull request #1641 from MITx/fix/cdodge/delete-not-removing-parent-reference · ce1807b7
```
delete_item should update the parent's list of children to reflect the d...
```
  Christina Roberts committed Mar 11, 2013
  ce1807b7 Browse Files
- Make numeric response handle plus sign exponential correctly · 5f95c684
```
NumericResponse was failing to accept as correct an answer with a plus
sign in the exponential. For example: 5.0e+1 was marked as incorrect
if the answer was 50. However, 5.0e1 was marked as correct. This
caused confusion, since the answer shown to students included the plus
sign.

LMS Lighthouse [#242]
```
  Carlos Andrés Rocha committed Mar 11, 2013
  5f95c684 Browse Files
- Move pep8 and pylint into test suite, so that we can rachet down the number of violations · 81527d60
  Calen Pennington committed Mar 11, 2013
  
  81527d60 Browse Files
- Save lcp state on initialization (for seed initialization) · 7b542700
  Calen Pennington committed Mar 11, 2013
  
  7b542700 Browse Files
- Save lcp state when a problem is saved · 881e137f
  Calen Pennington committed Mar 11, 2013
  
  881e137f Browse Files
- htmlbook-specific styling to make Heroes text presentable. · cd95872b
  Brian Wilson committed Mar 11, 2013
  
  cd95872b Browse Files
- Added Descriptor method, fixed order issue. · 588b27c9
  Julian Arni committed Mar 11, 2013
  
  588b27c9 Browse Files
- Merge pull request #1638 from MITx/feature/diana/show-correctness · 7806acc7
```
Add the ability to hide correctness markers
```
  David Ormsbee committed Mar 11, 2013
  7806acc7 Browse Files
- add checks that book_index is in range · 2199ae67
  Brian Wilson committed Mar 11, 2013
  
  2199ae67 Browse Files
- Merge pull request #1637 from MITx/fix/cdodge/performance-optimize-comment-client-use-jumpto · fcc3113b
```
Fix/cdodge/performance optimize comment client use jumpto
```
  Calen Pennington committed Mar 11, 2013
  fcc3113b Browse Files
- Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged · 95f8f811
```
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
```
  Calen Pennington committed Mar 11, 2013
  95f8f811 Browse Files
- Fixing tests created on master · 9c85d920
  Calen Pennington committed Mar 11, 2013
  
  9c85d920 Browse Files
- delete_item should update the parent's list of children to reflect the delete… · d38b37f0
```
delete_item should update the parent's list of children to reflect the delete operation. Also added unit test
```
  Chris Dodge committed Mar 11, 2013
  d38b37f0 Browse Files
- fix basic alignment issue with html textbook display · fcb618f0
  Brian Wilson committed Mar 11, 2013
  
  fcb618f0 Browse Files