Vik Paruchuri
eaa6701c6f
Remove mitxmako dependencies, make rubric and oechild inherit fro object
2013-01-17 17:13:31 -05:00
Diana Huang
87990b36f4
Rubric sizing tweaks and text improvements.
2013-01-17 14:35:49 -05:00
cahrens
77865f7ab2
Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce
2013-01-17 14:22:18 -05:00
Diana Huang
7171e6b7cc
Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates
2013-01-17 14:02:00 -05:00
Diana Huang
18a3d5e734
Merge branch 'master' into feature/diana/rubric-input
2013-01-17 14:00:43 -05:00
Diana Huang
3646ff53d8
Display updates and fixes.
2013-01-17 14:00:02 -05:00
cahrens
5f05ec83f1
Change the div being used to create code mirror to a textarea-- just make sure to escape the content! Update tests accordingly.
2013-01-17 13:11:47 -05:00
Chris Dodge
fe964ec8ba
disable caching in draft mode stores. It doesn't behave as we expect and we need more time to investigate
2013-01-17 13:11:16 -05:00
Chris Dodge
45bb511e15
remove obsolete test (per Vik)
2013-01-17 12:06:21 -05:00
Diana Huang
2b4e9f45b9
Updates to the CSS and html formatting for statuses
...
and self-assessment
2013-01-17 11:34:44 -05:00
cahrens
b6fcf3a51e
Some refactoring from Brian's submission.
2013-01-17 10:36:04 -05:00
Diana Huang
280a2f290e
Merge branch 'master' into diana/open-ended-ui-updates
2013-01-17 10:09:16 -05:00
Diana Huang
df8d088492
Display updates to the xmodule.
2013-01-17 09:44:47 -05:00
Diana Huang
589e848fd4
Pass along the correct display name to the controller
2013-01-17 09:44:13 -05:00
Chris Dodge
48cbf38a41
resolve merge conflicts
2013-01-17 09:36:09 -05:00
Chris Dodge
22695d80c7
Merge branch 'master' into feature/cdodge/cms-master-merge4
...
Conflicts:
common/djangoapps/student/models.py
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/xml_module.py
jenkins/test.sh
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/django_comment_client/models.py
requirements.txt
2013-01-17 09:15:37 -05:00
chrisndodge
358c56da9e
Merge pull request #1297 from MITx/fix/cdodge/filesystem-xml-fixes
...
Fix/cdodge/filesystem xml fixes
2013-01-17 05:55:22 -08: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 Talbot
f34fd5c426
studio html editor - sync'ed up previous style and behavior work to refactored xmodule sass/js
2013-01-16 16:55:11 -05:00
Diana Huang
9079c66a32
Some interface cleanup stuff for the combined open ended module.
2013-01-16 16:35:58 -05:00
cahrens
bc80779f6f
Fix bug related to creation of thumbnails for non-image files.
...
https://edx.lighthouseapp.com/projects/102637-studio/tickets/139-uploads-of-non-images-dont-have-reasonable-icon#ticket-139-2
2013-01-16 15:40:14 -05:00
Brian Talbot
e8ba078d4e
studio HTML editor - codemirror/tinymce toggle work - wip
2013-01-16 14:54:28 -05:00
Diana Huang
db366d4ebb
Update CSS to make rubric even narrower.
2013-01-16 14:36:08 -05:00
cahrens
cc5a5e2996
Fix multiple choice checkbox.
...
#117
2013-01-16 12:52:05 -05: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
Brian Talbot
ed6134ea11
abstracted out common editor styles shared by problem and html editors
2013-01-15 14:14:31 -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
Brian Talbot
623769e9d8
separated common editor UI from problem and HTML editor SCSS - wip
2013-01-15 09:57:48 -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
