Commits · 9e4e98ef74d4c14dc472c121ea4a174b7311efe0 · edx / edx-platform · GitLab

06 Feb, 2013 25 commits
- Fix some css to get things to properly close/open · 9e4e98ef
  Vik Paruchuri committed Feb 06, 2013
  
  9e4e98ef Browse Files
- Doing some restyling on peer grading · 02ac72d0
  Vik Paruchuri committed Feb 06, 2013
  
  02ac72d0 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 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 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
- 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 15 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
- Revert "Fix permissions bug and add test cases for django comment client permissions." · 119b4206
```
This reverts commit e7450874.
```
  David Ormsbee committed Feb 05, 2013
  119b4206 Browse Files
- More robust default version · 8877ec35
  Vik Paruchuri committed Feb 05, 2013
  
  8877ec35 Browse Files
- Debug image submissions · 4614687e
  Vik Paruchuri committed Feb 05, 2013
  
  4614687e Browse Files
- Alter image test criteria · 8bf29c0e
  Vik Paruchuri committed Feb 05, 2013
  
  8bf29c0e Browse Files
- Fix some of the tests · 06499bba
  Vik Paruchuri committed Feb 05, 2013
  
  06499bba Browse Files
- Pass display name and content link rewriting down the chain · 1d3f8f06
  Vik Paruchuri committed Feb 05, 2013
  
  1d3f8f06 Browse Files
- Support due date and display name · 8e7fa6c9
  Vik Paruchuri committed Feb 05, 2013
  
  8e7fa6c9 Browse Files
- Parse and pass metadata · e6770bca
  Vik Paruchuri committed Feb 05, 2013
  
  e6770bca Browse Files
- Merge pull request #1435 from MITx/feature/cale/no-course-collectstatic-bugfix · 3222e083
```
Fix bug where we imported two functions w/ the same name
```
  Christina Roberts committed Feb 05, 2013
  3222e083 Browse Files
- Merge pull request #1437 from MITx/fix/cdodge/static-content-server-return-404 · 0d8cfb9b
```
change from throwing a Http404 exception, which I believe will try to re...
```
  Christina Roberts committed Feb 05, 2013
  0d8cfb9b Browse Files
- Patch peer grading tab to work · 0133c7c6
  Vik Paruchuri committed Feb 05, 2013
  
  0133c7c6 Browse Files
- Merge pull request #1436 from MITx/debug/dave/sass · b68aff72
```
undo pipeline changes
```
  David Ormsbee committed Feb 05, 2013
  b68aff72 Browse Files