David Baumgold
90a9c386eb
Update jasmine-jquery to 1.5.1
2013-05-22 15:55:52 -04:00
David Baumgold
d10e644c6e
Added sinon.js to project
2013-05-22 15:55:52 -04:00
Kevin Chugh
ef3204da69
Merge pull request #2059 from edx/feature/zoldak/forum-testing
...
Feature/zoldak/forum testing
2013-05-17 10:10:55 -07:00
Arthur Barrett
52e5fe223c
update annotator.js library and fix the annotator-adder button hover state in courseware.
2013-05-16 14:27:21 -04:00
Jay Zoldak
cc2cc469fe
more work on jasmine tests for forums
2013-05-16 10:56:57 -04:00
Arthur Barrett
dd583ce4f9
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-09 14:32:05 -04:00
David Baumgold
ec79ebd4a7
Updated Backbone.js and Underscore.js
...
Backbone 1.0.0, Underscore 1.4.4
2013-05-08 09:29:15 -04:00
Arthur Barrett
04e75485ba
merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html.
2013-05-06 13:40:38 -04:00
jmclaus
edfa456483
Grading works when sequence is loaded from saved state
2013-04-15 14:05:39 +02:00
Brian Talbot
ceb4c719f7
changing default timeFormat within datepair.js for instances where the plugin is called by default HTML classes
2013-04-04 17:38:14 -04:00
John Hess
17fa312b26
Merge pull request #1695 from MITx/jmclaus/genex-save-state
...
Genex now saves its state
2013-04-02 07:58:17 -07:00
Victor Shnayder
b0356e32b2
Merge pull request #1589 from MITx/peter/symbolic
...
Added support for superscripts in variables
2013-03-27 10:40:50 -07:00
Arthur Barrett
d636f4fab0
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-03-25 19:04:58 -04:00
Victor Shnayder
235cce1323
Merge pull request #1713 from MITx/jmclaus/edit-molecule-css-fix
...
CSS from JSME doesn't affect surrounding content now
2013-03-25 07:51:02 -07:00
jmclaus
d763a6fc3a
CSS from JSME doesn't affect surrounding content now
2013-03-21 12:19:40 +01:00
jmclaus
8e7990598c
Merge branch 'master' into jmclaus/genex-save-state
2013-03-20 09:23:16 +01:00
Arthur Barrett
0710bbd70c
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-03-19 13:43:45 -04:00
jmclaus
57b43d7a6c
Genex now saves its state
2013-03-19 16:36:55 +01:00
cahrens
49ee903eda
Merge branch 'master' into feature/btalbot/studio-checklists
...
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/template_loader.js
2013-03-18 15:30:19 -04:00
Arthur Barrett
20767d5cc7
create notes djangoapp for annotator.js
2013-03-15 12:41:52 -04:00
Calen Pennington
fb8352e2cc
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
2013-03-15 10:33:54 -04:00
Calen Pennington
8531d56268
Merge pull request #1665 from MITx/jmpm-analytics
...
Enables basic analytics tab in instructor dashboard
2013-03-15 07:06:02 -07:00
Calen Pennington
029d8c8085
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
2013-03-15 09:46:47 -04:00
Brian Talbot
1aa8786b53
studio - checklists: added in smoothscrolling to in-page links across Studio but used only on checklists currently
2013-03-14 19:07:03 -04:00
Valera Rozuvan
c54ad38fef
Better positioning of elements draggables with labels in slider.
2013-03-14 19:42:55 +02:00
Peter Baratta
bac9f1f571
Merge branch 'master' into peter/symbolic
2013-03-14 06:31:17 -06:00
jmclaus
db282d891c
Problem 5 grades correctly. Also added missing images
2013-03-13 16:27:56 +01:00
David Ormsbee
5f125e6807
Merge branch 'master' into jmpm-analytics
2013-03-10 01:09:03 -05:00
Peter Baratta
49f85211fa
More documentation for the javascript
2013-03-08 03:39:34 -07:00
Victor Shnayder
84f05f9f61
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/foldit_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_conditional.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
2013-03-08 00:40:18 -05:00
Victor Shnayder
57700a56d4
remove links to missing image files. We can add them if needed later.
2013-03-06 19:11:36 -05:00
jkarni
3bb108b12e
Merge pull request #1608 from MITx/feature/jkarni/genex
...
Feature/jkarni/genex
2013-03-06 14:35:01 -08:00
David Ormsbee
d0bff1ed3c
Merge branch 'master' into jmpm-analytics
...
Conflicts:
lms/djangoapps/instructor/views.py
lms/envs/common.py
lms/templates/courseware/instructor_dashboard.html
2013-03-06 17:09:09 -05:00
Victor Shnayder
12b6b7d403
Merge pull request #1609 from MITx/diana/refactor-chemical-equation
...
Refactor Chemical Equation Preview
2013-03-06 12:09:03 -08:00
Victor Shnayder
fb350ed1e3
Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule
...
Feature/abarrett/annotatable xmodule DO NOT MERGE
2013-03-06 12:05:27 -08:00
Diana Huang
42e711e7d2
Update tests and documentation.
2013-03-06 14:53:13 -05:00
Diana Huang
1aa3580dcb
Switch over to using the inputtype ajax handler for chemical input.
2013-03-06 14:41:48 -05:00
Julian Arni
d05e82e35c
Merge branch 'master' into feature/jkarni/genex
2013-03-06 13:25:30 -05:00
Calen Pennington
8a9ba79d1f
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
2013-03-06 12:15:07 -05:00
Peter Baratta
c6545eb092
Begin to document symmath as we go
2013-03-06 06:21:08 -07:00
Vasyl Nakvasiuk
0d83fefecf
merge feature/alex/drag_and_drop-mitx into feature/alex/poll-merged
2013-03-05 18:20:38 +02:00
Christina Roberts
d0eefc6a67
Merge pull request #1580 from MITx/bug/dhm/course_update_js
...
Fix for script tags w/in json objects being oddly evaluated on html page
2013-03-04 12:42:42 -08:00
jmclaus
cb14893daa
Genex updates hidden input field on any modification of dna sequence
2013-03-03 21:41:52 +01:00
jmclaus
72b7193c03
Genex is gradable
2013-03-03 10:43:16 +01:00
Don Mitchell
e55bb845b2
Fix for script tags w/in json objects being oddly evaluated on html page
...
load by doing load separately. In process, upgraded backbone which
necessitated changing getByCid to get and got rid of obsolete
course_settings master object.
2013-03-01 16:05:58 -05:00
Julian Arni
3203360e9e
Removed console.logs
2013-03-01 14:57:38 -05:00
Julian Arni
b39bbec23e
Fixed many more broken references in css
2013-03-01 14:43:28 -05:00
Julian Arni
6ccd496add
Fixing broken split-button-arrow-focus link
2013-03-01 14:22:41 -05:00
Julian Arni
09ff623561
Updated version of JSME.
2013-03-01 13:38:35 -05:00
Arthur Barrett
1da644fcb3
merge from master. resolved conflict with test_responsetypes.py by using the version from master.
2013-02-28 11:22:32 -05:00
