Commits · f9f0bd0deb080b7a11285862761136211a9cda1d · edx / edx-platform · GitLab

12 Mar, 2013 23 commits
- Update course factory to reflect XBlock changes · f9f0bd0d
  Jay Zoldak committed Mar 12, 2013
  
  f9f0bd0d Browse Files
- Use the right pip for bash OR · c0b6c01f
  Calen Pennington committed Mar 12, 2013
  
  c0b6c01f Browse Files
- Squelch pep8 and pylint output unless they fail · 13766208
  Calen Pennington committed Mar 12, 2013
  
  13766208 Browse Files
- Merge pull request #1656 from MITx/fix/vik/oe-xblock-stage2 · 7b2efa9d
```
Fix/vik/oe xblock stage2
```
  Calen Pennington committed Mar 12, 2013
  7b2efa9d Browse Files
- Merge remote-tracking branch 'origin/feature/alex/poll-merged' into fix/vik/oe-xblock-stage2 · f4930fff
  Vik Paruchuri committed Mar 12, 2013
  
  f4930fff Browse Files
- Change task states · 3a22dbaf
  Vik Paruchuri committed Mar 12, 2013
  
  3a22dbaf Browse Files
- Migrate the randomize module to the new storage model · 2aa24350
  Calen Pennington committed Mar 12, 2013
  
  2aa24350 Browse Files
- Make sure to parse integers that have been stored as strings in the DB · 222aca70
  Calen Pennington committed Mar 12, 2013
  
  222aca70 Browse Files
- Make sure that test-requirements.txt doesn't install versions of libraries that… · 433e50e0
```
Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads
```
  Calen Pennington committed Mar 12, 2013
  433e50e0 Browse Files
- Merge pull request #1653 from MITx/feature/studio/advanced-settings-revamp-merge · 69221521
```
Advanced Settings changes.
```
  Don Mitchell committed Mar 12, 2013
  69221521 Browse Files
- Merge pull request #1655 from MITx/fix/vik/oe-xblock-stage · f155bd09
```
Potentially fix xblock storage model for open ended
```
  Calen Pennington committed Mar 12, 2013
  f155bd09 Browse Files
- Remove model data, save instance state after init · 19e3e79c
  Vik Paruchuri committed Mar 12, 2013
  
  19e3e79c Browse Files
- Add in Mark's copy changes. · eea59005
  cahrens committed Mar 12, 2013
  
  eea59005 Browse Files
- Make the markdown attribute default to None, to distinguish it from the empty string · f6b4d3aa
  Calen Pennington committed Mar 12, 2013
  
  f6b4d3aa Browse Files
- Fix access to children via definition · 1411fadd
  Calen Pennington committed Mar 12, 2013
  
  1411fadd Browse Files
- Make default value for format setting None, and force lms and cms to be explicit… · 2a96c456
```
Make default value for format setting None, and force lms and cms to be explicit about a string default
```
  Calen Pennington committed Mar 12, 2013
  2a96c456 Browse Files
- Merge branch 'feature/alex/poll-merged' into feature/studio/advanced-settings-revamp-merge · bdf1b1b0
  cahrens committed Mar 12, 2013
  
  bdf1b1b0 Browse Files
- Coerce correctmap keys to strings, so that they are pickleable · cfd7e6d2
  Calen Pennington committed Mar 12, 2013
  
  cfd7e6d2 Browse Files
- Do not need to pass blacklist keys to client. · 99f55266
  cahrens committed Mar 12, 2013
  
  99f55266 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 17 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
- Merge branch 'feature/alex/poll-merged' into feature/studio/advanced-settings-revamp · 84f21379
  cahrens committed Mar 11, 2013
  
  84f21379 Browse Files
- Updated Selenium test, deleted dead code related to Advanced Settings. · 7e8fcb85
  cahrens committed Mar 11, 2013
  
  7e8fcb85 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