Commits · e5fda33eff852ffa65026073c7f848fce083dcfe · edx / edx-platform · GitLab

06 Feb, 2013 37 commits
- Throw the error back up if we don't have a console to log it to. · e5fda33e
  David Ormsbee committed Feb 06, 2013
  
  e5fda33e Browse Files
- Merge pull request #1446 from MITx/fix/vik/peer-grading-images · bbf37ef9
```
Fix/vik/peer grading images
```
  Diana Huang committed Feb 06, 2013
  bbf37ef9 Browse Files
- Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images · 463f3161
  Vik Paruchuri committed Feb 06, 2013
  
  463f3161 Browse Files
- Merge pull request #1439 from MITx/feature/vik/oe-versioning · c68b0d3c
```
Feature/vik/oe versioning
```
  VikParuchuri committed Feb 06, 2013
  c68b0d3c Browse Files
- Add in close date to metadata · cf81fb27
  Vik Paruchuri committed Feb 06, 2013
  
  cf81fb27 Browse Files
- Fix git issue · 733faeba
  Vik Paruchuri committed Feb 06, 2013
  
  733faeba Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning · 5a51d142
```
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
```
  Vik Paruchuri committed Feb 06, 2013
  5a51d142 Browse Files
- Fix oe version tests · f568e492
  Vik Paruchuri committed Feb 06, 2013
  
  f568e492 Browse Files
- Merge pull request #1440 from MITx/diana/rubric-ui-improvements · f42f84d9
```
Rubric UI updates
```
  Diana Huang committed Feb 06, 2013
  f42f84d9 Browse Files
- Merge pull request #1428 from MITx/feature/diana/close-oe-problems · 62dcd09b
```
Close OE Problems
```
  VikParuchuri committed Feb 06, 2013
  62dcd09b Browse Files
- Merge branch 'master' into feature/diana/close-oe-problems · f3fa4380
```
Conflicts:
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/timeparse.py
```
  Diana Huang committed Feb 06, 2013
  f3fa4380 Browse Files
- Merge branch 'feature/vik/oe-versioning' into fix/vik/peer-grading-images · f565d17b
```
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
```
  Vik Paruchuri committed Feb 06, 2013
  f565d17b Browse Files
- Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images · a0febd35
```
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
```
  Vik Paruchuri committed Feb 06, 2013
  a0febd35 Browse Files
- Try to fix tests · ddda9ba5
  Vik Paruchuri committed Feb 06, 2013
  
  ddda9ba5 Browse Files
- Merge branch 'master' into diana/rubric-ui-improvements · 4adf2f61
```
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
```
  Diana Huang committed Feb 06, 2013
  4adf2f61 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning · 96636681
```
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
```
  Vik Paruchuri committed Feb 06, 2013
  96636681 Browse Files
- Merge branch 'master' into diana/rubric-ui-improvements · 1f5beba3
  Diana Huang committed Feb 06, 2013
  
  1f5beba3 Browse Files
- Merge pull request #1429 from MITx/feature/cale/pep8-autofix · 53312713
```
Feature/cale/pep8 autofix
```
  Ned Batchelder committed Feb 06, 2013
  53312713 Browse Files
- Pep8 autofixes · cfae1cdf
  Calen Pennington committed Feb 06, 2013
  
  cfae1cdf Browse Files
- Make pylint work on bare .py files from rake · 7fc40814
  Calen Pennington committed Feb 06, 2013
  
  7fc40814 Browse Files
- Config changes to make pep8 autofixes easier · 0b650122
  Calen Pennington committed Feb 06, 2013
  
  0b650122 Browse Files
- Merge pull request #1415 from MITx/feature/zoldak/cms-unit-tests · e89948a5
```
Use timestamp in collection name for modulestore tests
```
  Calen Pennington committed Feb 06, 2013
  e89948a5 Browse Files
- Improve docstring wording for ModuleStoreTestCase class. · 72023cb5
  Jay Zoldak committed Feb 06, 2013
  
  72023cb5 Browse Files
- Move modulestore unique naming in tests from the settings.py file into the… · abf4ad36
```
Move modulestore unique naming in tests from the settings.py file into the ModuleStoreTestCase class.
```
  Jay Zoldak committed Feb 06, 2013
  abf4ad36 Browse Files
- Refactor tests for cms contentstore. · fde6d1ba
  Jay Zoldak committed Feb 06, 2013
  
  fde6d1ba Browse Files
- Reorganize test cases · 33246152
  Jay Zoldak committed Feb 06, 2013
  
  33246152 Browse Files
- Reorganize the CmsTestCase subclass · 5a6b0392
  Jay Zoldak committed Feb 06, 2013
  
  5a6b0392 Browse Files
- Rearrange factories and clean up imports · 2c5a7ccd
  Jay Zoldak committed Feb 06, 2013
  
  2c5a7ccd Browse Files
- Remove toy dbs from CMS test settings.py file as they are not used. · b329b0ea
  Jay Zoldak committed Feb 06, 2013
  
  b329b0ea Browse Files
- Change modulestore name and subclass TestCase · b63c3c5a
  Jay Zoldak committed Feb 06, 2013
  
  b63c3c5a Browse Files
- Remove unneeded error type. · f9304a88
  Diana Huang committed Feb 06, 2013
  
  f9304a88 Browse Files
- Merge pull request #1438 from MITx/feature/vik/peer-grading-xmodule · 95d39573
```
Patch peer grading tab to work
```
  Diana Huang committed Feb 06, 2013
  95d39573 Browse Files
- Merge pull request #1443 from MITx/feature/ichuang/flag-to-disable-progress-graph · 92f2149d
```
Allow policy.json to disable progress graph
```
  David Ormsbee committed Feb 06, 2013
  92f2149d Browse Files
- add doc about disable_progress_graph · 6a7e30e3
  ichuang committed Feb 06, 2013
  
  6a7e30e3 Browse Files
- add disable_progress_graph key to course metadata · 0936f448
  ichuang committed Feb 06, 2013
  
  0936f448 Browse Files
- Fix combined open ended tests · 94e6346c
  Vik Paruchuri committed Feb 05, 2013
  
  94e6346c Browse Files
- Fix descriptor creation · a1e73392
  Vik Paruchuri committed Feb 05, 2013
  
  a1e73392 Browse Files
05 Feb, 2013 3 commits
- Merge pull request #1441 from MITx/hotfix/dave/revert_comment_client_changes · 6b468df5
```
Revert "Fix permissions bug and add test cases for django comment client...
```
  Victor Shnayder committed Feb 05, 2013
  6b468df5 Browse Files
- Fix combined open ended tests · 0fc50095
  Vik Paruchuri committed Feb 05, 2013
  
  0fc50095 Browse Files
- Revert "Add tests for django-comment-client models" (which actually had · a3a886bd
```
a model change as well)

This reverts commit 05354745.
```
  David Ormsbee committed Feb 05, 2013
  a3a886bd Browse Files