Diana Huang
e7bc32fd4d
Merge branch 'master' into feature/diana/rubric-input
2013-01-22 08:38:17 -05:00
Valera Rozuvan
757f955c5e
Moved JS for drag-and-drop from global capa. Now it will load only when required, and can be specified from any course.
2013-01-21 15:53:44 +02:00
Alexander Kryklia
5200534a4a
template for drag_and_drop capaproblem
2013-01-21 15:52:49 +02:00
Carlos Andrés Rocha
84efafc896
Add missing semicolon at the end of sequence display module javascript
2013-01-18 17:00:51 -05:00
Diana Huang
ef53bab5dd
One more fix
2013-01-18 16:41:00 -05:00
Diana Huang
6ab7afac4a
One more merge fix
2013-01-18 16:37:47 -05:00
Diana Huang
dd20226ec3
Merge branch 'master' into feature/diana/rubric-input
...
Fix some merge issues involving rubric rendering
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
common/lib/xmodule/xmodule/open_ended_module.py
common/lib/xmodule/xmodule/self_assessment_module.py
2013-01-18 16:36:22 -05:00
Diana Huang
89055da8ba
Take out useless logging.
2013-01-18 15:38:59 -05:00
Diana Huang
0e3aeb4041
Merge branch 'master' into diana/fix-sa-tests
2013-01-18 15:21:50 -05:00
Diana Huang
bd6d153126
Fix failing self-assessment unit tests
2013-01-18 15:18:13 -05:00
Carlos Andrés Rocha
ef69b738c9
Sort courses announcement date
...
If there is no announcement date (in the policy metadata) then use a
heuristic to sort them.
If there is an announcement date, the use it in the heuristic to
determine if the course is new or not.
2013-01-17 21:46:58 -05:00
Vik Paruchuri
18dc59c93a
Error message fix
2013-01-17 17:18:10 -05:00
Vik Paruchuri
eaa6701c6f
Remove mitxmako dependencies, make rubric and oechild inherit fro object
2013-01-17 17:13:31 -05:00
Diana Huang
18a3d5e734
Merge branch 'master' into feature/diana/rubric-input
2013-01-17 14:00:43 -05:00
Alexander Kryklia
176be15998
removed unnecssary debug information
2013-01-17 14:25:28 +02:00
Alexander Kryklia
f22af62f2c
removed jstat, added javascript_loader
2013-01-17 14:22:13 +02:00
Alexander Kryklia
1d36e7baf9
now we invoke gst consturctor as callback to javascript_loader, so dependencies are loaded first
2013-01-17 14:21:52 +02:00
Brian Wilson
bfb5f5e5bd
Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg
2013-01-16 11:24:46 -05:00
Brian Wilson
cc1b50ee4a
use new-style class for TestCenterExam
2013-01-16 11:24:20 -05:00
Diana Huang
d844730f71
Fix some sizing issues in the CSS.
2013-01-16 09:17:00 -05:00
Brian Wilson
3b28e328c4
disable export of testcenter_exam from course module (and add test).
2013-01-15 17:54:10 -05:00
Vik Paruchuri
8ff77329b1
Fix rubric rendering in combined open ended peer grading
2013-01-15 16:22:27 -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
Diana Huang
4422bd996d
Merge branch 'master' into feature/diana/rubric-input
2013-01-15 14:44:57 -05:00
Victor Shnayder
2f7210ed0c
address Ike's comments
2013-01-15 11:44:27 -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
Alexander Kryklia
b53786b688
removed on event from slider and readonly from textbox
2013-01-15 13:34:16 +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
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
