Commit Graph

7792 Commits

Author SHA1 Message Date
Diana Huang
88427ea02f Update criteria for peer grading progress bars. 2013-01-16 15:15:55 -05:00
Diana Huang
db366d4ebb Update CSS to make rubric even narrower. 2013-01-16 14:36:08 -05:00
Diana Huang
e5bb0c8e59 Fix how we calculate max value. 2013-01-16 14:31:50 -05:00
Diana Huang
60531e30fa Add progress bars to the staff grading and peer grading views. 2013-01-16 14:22:39 -05:00
Diana Huang
aec40ead57 Use tables to display problems instead of a simple list 2013-01-16 12:40:39 -05:00
Diana Huang
8b3fb33fe3 Update tests to handle rubric scores 2013-01-16 09:47:54 -05:00
Diana Huang
d844730f71 Fix some sizing issues in the CSS. 2013-01-16 09:17:00 -05:00
Diana Huang
9b2faa4987 Merge branch 'master' into feature/diana/rubric-input 2013-01-16 09:02:51 -05:00
Vik Paruchuri
8ff77329b1 Fix rubric rendering in combined open ended peer grading 2013-01-15 16:22:27 -05:00
David Ormsbee
39655bff68 Merge pull request #1283 from MITx/content/rocha/faq-update
Update to the FAQ page
2013-01-15 13:16:35 -08:00
Diana Huang
78c194aaf4 Merge pull request #1284 from MITx/feature/vik/add-staff-grading-notifications
Feature/vik/add staff grading notifications
2013-01-15 12:45:56 -08:00
Vik Paruchuri
8aa033f601 Add peer and staff grading required display, notifications 2013-01-15 15:40:23 -05:00
Vik Paruchuri
ef2b069409 Add staff grading notifications 2013-01-15 15:34:09 -05:00
Brian Talbot
540232f54d revised minor syntax/line indents on faq scss and js 2013-01-15 15:30:53 -05:00
Diana Huang
77fe6ed452 Merge branch 'master' into feature/diana/rubric-input 2013-01-15 14:48:40 -05:00
Diana Huang
4422bd996d Merge branch 'master' into feature/diana/rubric-input 2013-01-15 14:44:57 -05:00
VikParuchuri
e2f8ce9de6 Merge pull request #1276 from MITx/feature/vik/add-peer-grading-notifications
Feature/vik/add peer grading notifications
2013-01-15 11:40:59 -08:00
Vik Paruchuri
301293f8b0 Remove debug statement, fix active page issue on problem page 2013-01-15 14:33:38 -05:00
Vik Paruchuri
7b1262f667 Fix up authentication, other things 2013-01-15 14:31:02 -05:00
Diana Huang
ad526e624a Use the correct variable. 2013-01-15 14:10:45 -05:00
Diana Huang
3d2ae66cf5 Refactor out rubric rendering and pass along
the right information for peer grading
2013-01-15 13:46:18 -05:00
Carlos Andrés Rocha
8a1f30bfa0 Merge pull request #1281 from MITx/fix/apenney/numpy
Temporary workaround to our bizarre jenkins/numpy issue.
2013-01-15 08:46:06 -08:00
Ashley Penney
093839e13d flesh out comment. 2013-01-15 11:39:59 -05:00
David Ormsbee
d4259c63db Merge pull request #1260 from MITx/cale/circular-import-fix
Remove circular dependencies that connect student.models and django_comm...
2013-01-15 08:37:21 -08:00
David Ormsbee
66ffef131d Merge branch 'master' into cale/circular-import-fix
Conflicts:
	common/djangoapps/student/models.py
2013-01-15 11:35:19 -05:00
David Ormsbee
a2d5d0bc89 Merge pull request #1279 from MITx/jaakana
added problem weight description
2013-01-15 08:25:14 -08:00
David Ormsbee
36b024ab95 Merge pull request #1203 from MITx/feature/alex/gst-mitx
Feature/alex/gst mitx
2013-01-15 08:24:09 -08:00
David Ormsbee
ad261706c8 Merge pull request #1263 from MITx/feature/ichuang/instructor-dashboard-upgrade3
Upgrade to instructor dashboard: enrollment, offline grades, remote gradebook
2013-01-15 08:22:19 -08:00
Diana Huang
48be0b15a1 Clean up on staff grading code path and
the beginnings of peer grading.
2013-01-15 11:21:10 -05:00
Ashley Penney
c50c705eb6 Temporary workaround to our bizarre numpy issue. I think it's to do
with the way shiningpanda works but I can't see any reason why.
2013-01-15 11:17:45 -05:00
Diana Huang
9d4119b2a8 Merge pull request #1278 from MITx/vik/modify-rubric-input
Vik/modify rubric input
2013-01-15 05:56:27 -08:00
Alexander Kryklia
b53786b688 removed on event from slider and readonly from textbox 2013-01-15 13:34:16 +02:00
Valera Rozuvan
00bf973d4a Renamed to XML example code. 2013-01-15 12:55:25 +02:00
Valera Rozuvan
442e112d6f Updated documentation. Try #2. 2013-01-15 12:55:25 +02:00
Valera Rozuvan
c9c328cf39 Bugfix. 2013-01-15 12:55:25 +02:00
Alexander Kryklia
d3045b36ab initial function call added, fix 2013-01-15 12:55:25 +02:00
Alexander Kryklia
fc09bbd0b4 added funciton call 2013-01-15 12:55:25 +02:00
Alexander Kryklia
a49f94fe49 added none to allowed parameters in functions 2013-01-15 12:55:25 +02:00
Alexander Kryklia
b56174c8d4 updated docs 2013-01-15 12:55:25 +02:00
Valera Rozuvan
ec0bdfb445 New feature: can specify output of "none" for a dynamic element. 2013-01-15 12:55:24 +02:00
Valera Rozuvan
1770de73f1 Bugfixing. Refactoring. Removed readonly check for text edits. Styling of text edits with jQuery UI. 2013-01-15 12:55:24 +02:00
Valera Rozuvan
77962e3cdb Removed unnecessary comments. Added feature to update element either on "change" or on "slide" event. 2013-01-15 12:55:24 +02:00
Valera Rozuvan
052dc3fa22 New feature: For bar graphs, can specify bar width and bar alignment. 2013-01-15 12:55:24 +02:00
Valera Rozuvan
271c182f4e Fixed bug: jQuery slider default change event name is "slidechange", and it behaves a bit differently than "slide" event. 2013-01-15 12:55:24 +02:00
Alexander Kryklia
a75003ef2f added no_slide parameters 2013-01-15 12:55:23 +02:00
Valera Rozuvan
782fb3b465 New feature: Can specify "change" or "slide" event type of sliders. 2013-01-15 12:55:23 +02:00
Valera Rozuvan
f17e2466b1 New feature: Now can specify x-axis and y-axisnames for ticks. Updated "Fick s Second Law" demo to demonstrate this. 2013-01-15 12:55:23 +02:00
Valera Rozuvan
efa375114e Enabled automatic addition of "return" statement for asymptotes, xrange.min, and xrange.max. 2013-01-15 12:55:23 +02:00
Valera Rozuvan
ad4f4144e8 New feature: Added ability to set "color" and "weight" property of moving label text. 2013-01-15 12:55:23 +02:00
Valera Rozuvan
bd605150ad New feature: Dynamically moving labels added. "Sample size and power" demo updated. 2013-01-15 12:55:23 +02:00