Vik Paruchuri
baba8d3a36
Add collapse action into staff grading view
2013-02-07 12:42:05 -05:00
Vik Paruchuri
3457b86bd0
Fix JS, style student response box
2013-02-07 12:36:57 -05:00
Vik Paruchuri
c195fe65cd
Restyle rubric list, submission container
2013-02-07 11:10:29 -05:00
Vik Paruchuri
aa699905d6
Feedback and view only rubric restyle
2013-02-07 10:32:39 -05:00
Vik Paruchuri
f22849ebdd
Re-arrange feedback, fix rubric HTML issue
2013-02-07 10:29:58 -05:00
Vik Paruchuri
b30407d7c8
Work on showing results properly
2013-02-07 10:22:33 -05:00
Vik Paruchuri
de8e1e9472
Change around some names, restyle rubric
2013-02-07 09:57:41 -05:00
Vik Paruchuri
03a6572bbe
Restyle status, get rubric to work properly
2013-02-07 09:49:56 -05:00
Vik Paruchuri
2542b6cb72
Merge remote-tracking branch 'origin/master' into feature/vik/improve-oe-ui
2013-02-07 09:26:40 -05:00
Vik Paruchuri
6a6962df9e
Alter rubric list, restyle rubric
2013-02-07 09:26:27 -05:00
David Ormsbee
a6b35853f9
Merge pull request #1455 from MITx/hotfix/dave/youtube_object
...
Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue.
2013-02-06 19:47:25 -08:00
David Ormsbee
976776643b
Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue.
2013-02-06 22:46:22 -05:00
Victor Shnayder
37b735d708
Merge pull request #1454 from MITx/hotfix/dave/youtube_object
...
Hack to disable YouTube <iframe> API when they break it.
2013-02-06 19:41:12 -08:00
David Ormsbee
a470a62d12
Hack to disable YouTube <iframe> API when they break it.
2013-02-06 22:37:41 -05:00
Victor Shnayder
2af06ef1d4
Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 66889b87240dd9c24e74
2013-02-06 20:29:17 -05:00
Victor Shnayder
884a7a61b9
Revert "Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 965e3b4c491a7d2a06a8
2013-02-06 20:27:01 -05:00
Victor Shnayder
edf96036c8
Merge remote-tracking branch 'origin/master' into 7012x-clean
2013-02-06 18:53:14 -05:00
Victor Shnayder
965e3b4c49
Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes
...
addressed somme comments in pull request and instructor fixes and blank ...
2013-02-06 15:40:33 -08:00
Kevin Chugh
1dd0ef274d
addressed somme comments in pull request and instructor fixes and blank group fix
2013-02-06 18:26:41 -05:00
Victor Shnayder
1a7d2a06a8
Merge pull request #1442 from MITx/marketing/reg-tweak
...
Fix placeholder email in signup form
2013-02-06 15:26:26 -08:00
Kevin Chugh
55c205b9b4
merged master
2013-02-06 17:13:52 -05:00
Vik Paruchuri
83608fd983
Restyle lists
2013-02-06 16:58:59 -05:00
Vik Paruchuri
28a0e44120
Quick rubric restyle
2013-02-06 16:57:10 -05:00
Vik Paruchuri
8bc98b2ff8
Fix sass
2013-02-06 16:32:16 -05:00
Vik Paruchuri
48719a7a45
Merge branch 'feature/vik/oe-versioning' into feature/vik/improve-oe-ui
...
Conflicts:
common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
lms/static/sass/course/_staff_grading.scss
2013-02-06 16:04:01 -05:00
Vik Paruchuri
9e4e98ef74
Fix some css to get things to properly close/open
2013-02-06 15:13:56 -05:00
Vik Paruchuri
02ac72d0af
Doing some restyling on peer grading
2013-02-06 13:49:59 -05:00
Diana Huang
4adf2f6180
Merge branch 'master' into diana/rubric-ui-improvements
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
2013-02-06 13:16:24 -05:00
Diana Huang
1f5beba383
Merge branch 'master' into diana/rubric-ui-improvements
2013-02-06 13:12:04 -05:00
Your Name
6b4a1dfd34
minor tweaks after testing
2013-02-06 12:54:06 -05:00
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
Kevin Chugh
c7a133470d
inline discussions working
2013-02-05 22:43:09 -05:00
Victor Shnayder
219c51f898
Fix placeholder email in signup form
2013-02-05 22:24:20 -05:00
Victor Shnayder
739938f35f
add readme for symbolicresponse implementation (thanks Ike!)
2013-02-05 20:15:48 -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
Your Name
d5b70d7bfc
inline cohorting working
2013-02-05 18:38:06 -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
51db547a63
Merge branch 'master' into diana/rubric-ui-improvements
...
Conflicts:
common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
2013-02-05 16:18:56 -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
