Vik Paruchuri
|
02ac72d0af
|
Doing some restyling on peer grading
|
2013-02-06 13:49:59 -05:00 |
|
Vik Paruchuri
|
f565d17b4f
|
Merge branch 'feature/vik/oe-versioning' into fix/vik/peer-grading-images
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
|
2013-02-06 13:23:31 -05:00 |
|
Vik Paruchuri
|
a0febd35a0
|
Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
|
2013-02-06 13:22:12 -05:00 |
|
Vik Paruchuri
|
ddda9ba55d
|
Try to fix tests
|
2013-02-06 13:19:37 -05:00 |
|
Vik Paruchuri
|
96636681e9
|
Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
|
2013-02-06 13:16:02 -05:00 |
|
Ned Batchelder
|
533127136e
|
Merge pull request #1429 from MITx/feature/cale/pep8-autofix
Feature/cale/pep8 autofix
|
2013-02-06 08:57:55 -08:00 |
|
Calen Pennington
|
cfae1cdf62
|
Pep8 autofixes
|
2013-02-06 11:13:50 -05:00 |
|
Calen Pennington
|
7fc4081495
|
Make pylint work on bare .py files from rake
|
2013-02-06 11:10:54 -05:00 |
|
Calen Pennington
|
0b650122fb
|
Config changes to make pep8 autofixes easier
|
2013-02-06 11:10:54 -05:00 |
|
Calen Pennington
|
e89948a5c6
|
Merge pull request #1415 from MITx/feature/zoldak/cms-unit-tests
Use timestamp in collection name for modulestore tests
|
2013-02-06 07:49:52 -08:00 |
|
Jay Zoldak
|
72023cb5d2
|
Improve docstring wording for ModuleStoreTestCase class.
|
2013-02-06 10:42:21 -05:00 |
|
Jay Zoldak
|
abf4ad36f4
|
Move modulestore unique naming in tests from the settings.py file into the ModuleStoreTestCase class.
|
2013-02-06 10:42:21 -05:00 |
|
Jay Zoldak
|
fde6d1ba1c
|
Refactor tests for cms contentstore.
|
2013-02-06 10:42:21 -05:00 |
|
Jay Zoldak
|
3324615270
|
Reorganize test cases
|
2013-02-06 10:41:08 -05:00 |
|
Jay Zoldak
|
5a6b039208
|
Reorganize the CmsTestCase subclass
|
2013-02-06 10:36:28 -05:00 |
|
Jay Zoldak
|
2c5a7ccdf7
|
Rearrange factories and clean up imports
|
2013-02-06 10:36:28 -05:00 |
|
Jay Zoldak
|
b329b0ea42
|
Remove toy dbs from CMS test settings.py file as they are not used.
|
2013-02-06 10:36:28 -05:00 |
|
Jay Zoldak
|
b63c3c5a67
|
Change modulestore name and subclass TestCase
|
2013-02-06 10:36:28 -05:00 |
|
Diana Huang
|
95d3957377
|
Merge pull request #1438 from MITx/feature/vik/peer-grading-xmodule
Patch peer grading tab to work
|
2013-02-06 06:07:18 -08:00 |
|
David Ormsbee
|
92f2149daa
|
Merge pull request #1443 from MITx/feature/ichuang/flag-to-disable-progress-graph
Allow policy.json to disable progress graph
|
2013-02-06 05:48:03 -08:00 |
|
ichuang
|
6a7e30e331
|
add doc about disable_progress_graph
|
2013-02-06 04:01:28 +00:00 |
|
ichuang
|
0936f448fc
|
add disable_progress_graph key to course metadata
|
2013-02-06 03:45:10 +00:00 |
|
Vik Paruchuri
|
94e6346cf2
|
Fix combined open ended tests
|
2013-02-05 19:04:30 -05:00 |
|
Vik Paruchuri
|
a1e73392c1
|
Fix descriptor creation
|
2013-02-05 19:02:21 -05:00 |
|
Victor Shnayder
|
6b468df57d
|
Merge pull request #1441 from MITx/hotfix/dave/revert_comment_client_changes
Revert "Fix permissions bug and add test cases for django comment client...
|
2013-02-05 15:54:25 -08:00 |
|
Vik Paruchuri
|
0fc50095d9
|
Fix combined open ended tests
|
2013-02-05 18:53:53 -05:00 |
|
David Ormsbee
|
a3a886bd0f
|
Revert "Add tests for django-comment-client models" (which actually had
a model change as well)
This reverts commit 053547453e.
|
2013-02-05 18:51:16 -05:00 |
|
David Ormsbee
|
119b4206a4
|
Revert "Fix permissions bug and add test cases for django comment client permissions."
This reverts commit e745087455.
|
2013-02-05 18:42:01 -05:00 |
|
Vik Paruchuri
|
8877ec3500
|
More robust default version
|
2013-02-05 18:38:21 -05:00 |
|
Vik Paruchuri
|
4614687e7f
|
Debug image submissions
|
2013-02-05 18:24:18 -05:00 |
|
Vik Paruchuri
|
8bf29c0e1a
|
Alter image test criteria
|
2013-02-05 17:17:58 -05:00 |
|
Vik Paruchuri
|
06499bbafc
|
Fix some of the tests
|
2013-02-05 17:10:35 -05:00 |
|
Vik Paruchuri
|
1d3f8f0655
|
Pass display name and content link rewriting down the chain
|
2013-02-05 16:54:57 -05:00 |
|
Vik Paruchuri
|
8e7fa6c90c
|
Support due date and display name
|
2013-02-05 16:48:21 -05:00 |
|
Vik Paruchuri
|
e6770bcaa7
|
Parse and pass metadata
|
2013-02-05 16:42:56 -05:00 |
|
Christina Roberts
|
3222e083eb
|
Merge pull request #1435 from MITx/feature/cale/no-course-collectstatic-bugfix
Fix bug where we imported two functions w/ the same name
|
2013-02-05 13:36:56 -08:00 |
|
Christina Roberts
|
0d8cfb9baa
|
Merge pull request #1437 from MITx/fix/cdodge/static-content-server-return-404
change from throwing a Http404 exception, which I believe will try to re...
|
2013-02-05 13:36:28 -08:00 |
|
Vik Paruchuri
|
0133c7c669
|
Patch peer grading tab to work
|
2013-02-05 16:32:40 -05:00 |
|
David Ormsbee
|
b68aff72f2
|
Merge pull request #1436 from MITx/debug/dave/sass
undo pipeline changes
|
2013-02-05 13:26:22 -08:00 |
|
Chris Dodge
|
3fa1fe0cd6
|
change from throwing a Http404 exception, which I believe will try to render a static 404.html template - and ironically triggers a 500 server error. Just create a HttpResponse and set the status_code to 404.
|
2013-02-05 16:26:07 -05:00 |
|
David Ormsbee
|
1ef9d6388f
|
re-add compression flag to sass
|
2013-02-05 16:25:59 -05:00 |
|
Vik Paruchuri
|
3dc05aa904
|
Make some bug fixes, alter definition passing to work
|
2013-02-05 16:25:46 -05:00 |
|
David Ormsbee
|
706a1072b9
|
undo pipeline changes
|
2013-02-05 16:24:53 -05:00 |
|
Calen Pennington
|
8360a7a7f5
|
Fix bug where we imported two functions w/ the same name
|
2013-02-05 16:23:10 -05:00 |
|
Vik Paruchuri
|
ce0b31465c
|
Add in methods to interact with xmodule, change descriptor
|
2013-02-05 16:17:55 -05:00 |
|
Christina Roberts
|
8c4b661292
|
Merge pull request #1434 from MITx/bug/btalbot/studio-boldblockquote
studio - resolved HTML display issue with bold and blockquote
|
2013-02-05 13:13:44 -08:00 |
|
Vik Paruchuri
|
8ab76f72ad
|
Switching over to a versioning system
|
2013-02-05 16:07:35 -05:00 |
|
Diana Huang
|
120aa3cd3b
|
Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule
Feature/vik/peer grading xmodule
|
2013-02-05 12:55:48 -08:00 |
|
Brian Talbot
|
d713b288b5
|
studio - resolved HTML display issue where bold and blockquote elements didn't match LMSs style
|
2013-02-05 15:21:41 -05:00 |
|
Vik Paruchuri
|
ce87e6f221
|
Skip two tests
|
2013-02-05 14:57:59 -05:00 |
|