Vik Paruchuri
baba8d3a36
Add collapse action into staff grading view
2013-02-07 12:42:05 -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
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
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
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
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
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
Your Name
d5b70d7bfc
inline cohorting working
2013-02-05 18:38:06 -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
Diana Huang
f3be02d772
Merge branch 'master' into diana/rubric-ui-improvements
2013-02-05 09:13:14 -05:00
ichuang
8ff3dde605
for require_attempted display "attempted" instead of "completed"
2013-02-04 19:54:36 -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
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
cbd0895aad
Add in single peer grading problem view
2013-02-04 16:42:14 -05:00
Your Name
a8a9975914
Merge branch 'feature/kevin/groups_ui_changes' of github.com:MITx/mitx into feature/kevin/groups_ui_changes
2013-02-04 16:40:22 -05:00
Kevin Chugh
3009acbb10
showing group names
2013-02-04 14:50:53 -05:00
Vik Paruchuri
6cf2742e32
Trim unneeded files
2013-02-04 14:22:57 -05:00
Vik Paruchuri
c6c89e4216
Make peer grading xmodule work with notifications
2013-02-04 13:16:05 -05:00
Your Name
bdfc9d9784
Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes
2013-02-04 12:30:48 -05:00
Diana Huang
f49b5ec771
Merge branch 'master' into diana/rubric-ui-improvements
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
common/lib/xmodule/xmodule/self_assessment_module.py
lms/djangoapps/open_ended_grading/grading_service.py
lms/static/sass/course.scss
2013-02-04 09:11:28 -05:00
Kevin Chugh
69225f6435
cohort ID showing, have to translate to display text
2013-02-04 08:33:33 -05:00
ichuang
363ca7031e
add coffeescript/js for conditional module, does XModule.loadModules
2013-02-03 18:53:51 -05:00
ichuang
8db96abb18
conditional_module.html
2013-02-03 18:53:51 -05:00
Kevin Chugh
fcbd4bd1cd
produce and consume group_id from dropdowns
2013-02-02 05:46:11 -05:00
Vik Paruchuri
d9517877a4
Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging
2013-02-01 18:32:48 -05:00
Diana Huang
1c5c54c862
Make the rubric for self-assessment selectable and remove the
...
separate grade selection.
2013-02-01 15:15:42 -05:00
Diana Huang
68fc794a97
Add in some better encouragement to write feedback
2013-02-01 15:15:42 -05:00
Diana Huang
0bae983982
Visual updates to rubric
2013-02-01 15:15:42 -05:00
