Commit Graph

14212 Commits

Author SHA1 Message Date
Diana Huang
ad526e624a Use the correct variable. 2013-01-15 14:10:45 -05:00
John Hess
9a81c56254 Tracking progess page lookups on instructor dashboard 2013-01-15 13:51:24 -05:00
John Hess
9ef1a4ded5 Tracking problem resets, clearer msgs 2013-01-15 13:51:24 -05:00
John Hess
d025ca248f Added instructor tools for resetting attempts on a single student's problem to 0 and for getting student's progress page 2013-01-15 13:51:24 -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
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
cahrens
0461407857 Proposed changes to fix asset caching bug. 2013-01-15 11:45:08 -05:00
Victor Shnayder
02d5cfd14d add comment about time format conversion 2013-01-15 11:44:27 -05:00
Victor Shnayder
2f7210ed0c address Ike's comments 2013-01-15 11:44:27 -05:00
Victor Shnayder
570df1c9e6 Fix bugs, refactor, support lists of users 2013-01-15 11:44:27 -05:00
Victor Shnayder
3f654af7cd Refactor common code, fix view a bit
remaining:
 * support putting multiple names / emails in the big box we now have
2013-01-15 11:44:27 -05:00
Victor Shnayder
1a5fc065ad Add beta test group management view to instructor dashboard
* still needs to support uploading a list
* also want to clean up and refactor the code a bit
2013-01-15 11:44:26 -05: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
Victor Shnayder
58a9fdeddc add note about settings needed for manual testing 2013-01-15 11:36:25 -05:00
Victor Shnayder
3e5a2f9bde Add beta test group support
* add a days_early_for_beta inherited policy option
* students in the beta_testers_{COURSE} group get to see content that many days early
* Clean up some docstrings related to time formats
* Add basic test
2013-01-15 11:36:25 -05: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
Don Mitchell
244584ce6c DnD for subsections and units (no auto open) 2013-01-15 11:33:11 -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
Don Mitchell
e8bcc1729a Merge branch 'feature/cale/cms-master' into feature/dhm/drag 2013-01-15 11:00:41 -05:00
Don Mitchell
3a2c57524f Basic dnd for units 2013-01-15 10:35:20 -05:00
Brian Talbot
623769e9d8 separated common editor UI from problem and HTML editor SCSS - wip 2013-01-15 09:57:48 -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
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