Calen Pennington
|
cfae1cdf62
|
Pep8 autofixes
|
2013-02-06 11:13:50 -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 |
|
ichuang
|
0936f448fc
|
add disable_progress_graph key to course metadata
|
2013-02-06 03:45:10 +00: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
|
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 |
|
David Ormsbee
|
1ef9d6388f
|
re-add compression flag to sass
|
2013-02-05 16:25:59 -05:00 |
|
David Ormsbee
|
706a1072b9
|
undo pipeline changes
|
2013-02-05 16:24:53 -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 |
|
Vik Paruchuri
|
ce87e6f221
|
Skip two tests
|
2013-02-05 14:57:59 -05:00 |
|
Vik Paruchuri
|
8027cc7024
|
Fix some issues with tests
|
2013-02-05 14:35:44 -05:00 |
|
Vik Paruchuri
|
134f2f7af7
|
Fix tests, bugfix for problem url error
|
2013-02-05 14:21:08 -05:00 |
|
Vik Paruchuri
|
e13de7543f
|
Test fixes, err response fixes, address review comments
|
2013-02-05 14:12:11 -05:00 |
|
Vik Paruchuri
|
34dc6e6320
|
Fix some issues with peer grading service
|
2013-02-05 13:37:55 -05:00 |
|
David Ormsbee
|
74c112e5cc
|
Merge pull request #1373 from MITx/feature/zoldak/django-comment-client-tests
Add unit tests for django comment client
|
2013-02-05 10:37:18 -08:00 |
|
Vik Paruchuri
|
7984c4dfcb
|
Move over grading service to xmodule
|
2013-02-05 13:10:56 -05:00 |
|
Calen Pennington
|
4d8165b2b6
|
Remove bad import of replace_urls
|
2013-02-05 11:06:46 -05:00 |
|
Calen Pennington
|
2551243dfa
|
Install the static_replace app for the management command
|
2013-02-05 11:06:46 -05:00 |
|
Calen Pennington
|
5eae9c3a40
|
Make lms and cms coverage reports cover common/djangoapps
|
2013-02-05 11:06:46 -05:00 |
|
Calen Pennington
|
401f564e6a
|
Fix data directory passed to replace_static_urls
|
2013-02-05 11:06:46 -05:00 |
|
Calen Pennington
|
04879a83d3
|
Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible
|
2013-02-05 11:06:45 -05:00 |
|
Calen Pennington
|
b05ead864f
|
Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic""
This reverts commit c4f56620df.
|
2013-02-05 11:06:45 -05:00 |
|
Vik Paruchuri
|
e8a690df5e
|
Update peer grading tests
|
2013-02-05 10:46:00 -05:00 |
|
David Ormsbee
|
ecce3e5761
|
Merge pull request #1426 from MITx/debug/dave/sass
Comment out YUI compressor (cause *something* is still causing CSS compression)
|
2013-02-05 05:59:59 -08:00 |
|
David Ormsbee
|
818cd3aa48
|
Comment out YUI compressor (cause *something* is still causing CSS compression)
|
2013-02-05 08:58:59 -05:00 |
|
ichuang
|
8ff3dde605
|
for require_attempted display "attempted" instead of "completed"
|
2013-02-04 19:54:36 -05:00 |
|
Vik Paruchuri
|
443c3eda4f
|
Tests for peer grading service may be fixed.
|
2013-02-04 18:37:28 -05:00 |
|
Vik Paruchuri
|
18814196f0
|
Make things slightly robust
|
2013-02-04 18:31:32 -05:00 |
|
Vik Paruchuri
|
725f0c632c
|
Remove get statements, fix module_render
|
2013-02-04 18:27:25 -05:00 |
|
David Ormsbee
|
fae51815d8
|
Merge pull request #1420 from MITx/debug/dave/sass
Force it to do expanded mode, because it's still generating compressed CSS output
|
2013-02-04 15:04:03 -08:00 |
|
David Ormsbee
|
aeaad6f58d
|
Force it to do expanded mode, because it's still generating compressed CSS output
|
2013-02-04 18:03:05 -05:00 |
|
Vik Paruchuri
|
bf97a6a9a9
|
Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule
Conflicts:
lms/djangoapps/open_ended_grading/peer_grading_service.py
|
2013-02-04 17:55:55 -05:00 |
|
Diana Huang
|
fb777de18d
|
Merge pull request #1401 from MITx/feature/vik/peer-grading-flagging
Feature/vik/peer grading flagging
|
2013-02-04 14:45:59 -08:00 |
|
Vik Paruchuri
|
1dab4aba96
|
Fix accidental commit of dev.py
|
2013-02-04 17:44:09 -05:00 |
|
Vik Paruchuri
|
e8803985f2
|
Fix JS on after event handling
|
2013-02-04 17:41:44 -05:00 |
|
David Ormsbee
|
9f634aba3c
|
Remove compressed flag from SASS call in pipeline so we can diff the generated CSS
|
2013-02-04 17:33:26 -05:00 |
|
Vik Paruchuri
|
d89ab000d2
|
Fix a function call
|
2013-02-04 17:30:45 -05:00 |
|
Vik Paruchuri
|
eb049bda9e
|
Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging
|
2013-02-04 17:18:59 -05:00 |
|
Vik Paruchuri
|
7f96fbb3d1
|
Address review comments
|
2013-02-04 17:15:07 -05:00 |
|
Vik Paruchuri
|
c4c674367f
|
Remove unneccesary imports
|
2013-02-04 16:54:36 -05:00 |
|
Vik Paruchuri
|
83b7533a12
|
Fix CSS to fit all elements on the page
|
2013-02-04 16:49:32 -05:00 |
|
Vik Paruchuri
|
cbd0895aad
|
Add in single peer grading problem view
|
2013-02-04 16:42:14 -05:00 |
|
Vik Paruchuri
|
6cf2742e32
|
Trim unneeded files
|
2013-02-04 14:22:57 -05:00 |
|
Vik Paruchuri
|
81b86bb8fe
|
Retrack dev
|
2013-02-04 14:16:26 -05:00 |
|
Vik Paruchuri
|
43ddf1fbcf
|
Proper redirect behavior
|
2013-02-04 14:14:15 -05:00 |
|
Vik Paruchuri
|
14676d1c32
|
Untrack dev.py, add in redirect code for peer grading
|
2013-02-04 14:05:02 -05:00 |
|
Vik Paruchuri
|
3380745692
|
About to trim some lines
|
2013-02-04 13:54:27 -05:00 |
|
Vik Paruchuri
|
c6c89e4216
|
Make peer grading xmodule work with notifications
|
2013-02-04 13:16:05 -05:00 |
|
Vik Paruchuri
|
7263cbfcca
|
Fixes to make peer grading show up in notifications
|
2013-02-04 12:41:14 -05:00 |
|