Commit Graph

7796 Commits

Author SHA1 Message Date
Brian Wilson
cd2a704aec Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg 2013-01-15 16:04:05 -05:00
Brian Wilson
ef0f973ca4 display client_candidate_id when registration accepted; strip whitespace from accommodation_request; cosmetic cleanup on pearson management commands. 2013-01-15 16:00:10 -05: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
Brian Wilson
fb251cacbe Merge branch 'feature/brian/pearson-reg' of github.com:MITx/mitx into feature/brian/pearson-reg 2013-01-15 15:42:29 -05:00
Brian Wilson
32b2d1b97f Perform merge from master, including renumbering of migrations in common/djangoapps/student/migrations 2013-01-15 15:42:09 -05: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
a4e53d7a7f pearson registration - restyled and tweaked markup for registration closed message and styled disabled labels appropriately 2013-01-15 14:52:39 -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
Brian Wilson
c8f52deb3d wire up registration closed functionality 2013-01-15 11:55:36 -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
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
Brian Talbot
e070a926c5 pearson registration - resolving merge conflict 2013-01-15 07:46:49 -05: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
Valera Rozuvan
1753f983ae Added ability to insert automatic "return" for dynamic element functions, and graph label dynamic element functions. 2013-01-15 12:55:23 +02:00
Valera Rozuvan
72d500c168 Feature "Dynamic Elements in Labels" has been refactored to provide the user an easier interface for access. Demo "Sample Size and Power" has been updated. 2013-01-15 12:55:22 +02:00
Valera Rozuvan
20227d219e Added new feature: ability to add a label for an asymptote. Added new demo to GST: "Power and Alpha Demo". 2013-01-15 12:55:22 +02:00
Valera Rozuvan
def8eb472c Refactoring. Added ability to add dynamic element output to graph labels. Updated 2 demos for GST. "Falsified Clinic Data", and "Sample Size and Power". 2013-01-15 12:55:22 +02:00
Valera Rozuvan
9cabaf1ef3 Added automatic insertion of missing "return" statement into simple function strings. Added an option to turn this feature off. 2013-01-15 12:55:22 +02:00
Valera Rozuvan
3fec482f7f Added support for horizontal and vertical asymptotes. 2013-01-15 12:55:22 +02:00
Valera Rozuvan
421002808d Fixed bug. Specified values that are outside the allowed range now behave properly. Plot is redrawn after the value has been set to max (or min) value. 2013-01-15 12:55:22 +02:00
Valera Rozuvan
535bd3f195 Added bar support. 2013-01-15 12:55:21 +02:00
Alexander Kryklia
3f44b3aa2a gst module docs 2013-01-15 12:55:21 +02:00
Alexander Kryklia
1fb4c8c720 grammar fix 2013-01-15 12:55:21 +02:00