234 Commits

Author	SHA1	Message	Date
Renzo Lucioni	7c048fb243	Merge pull request #181 from edx/renzo/segment-io-sequentials ... Instrument sequentials with segment-io	2013-06-19 08:07:37 -07:00
Renzo Lucioni	841ff4765f	Abridge tests in light of learning how Segment.io works	2013-06-18 17:58:10 -04:00
David Baumgold	aa24508024	Add underscore.string library ... http://epeli.github.io/underscore.string/	2013-06-18 10:23:18 -04:00
cahrens	e6dfa8e81c	Merge branch 'master' into feature/christina/metadata-ui	2013-05-31 09:46:17 -04:00
David Baumgold	bdc9570cd1	Removed Symbolset font files	2013-05-30 16:09:17 -04:00
cahrens	c95b44d851	Merge branch 'master' into feature/christina/metadata-ui ... Conflicts: cms/envs/common.py cms/templates/base.html common/lib/xmodule/xmodule/combined_open_ended_module.py	2013-05-23 11:41:12 -04:00
David Baumgold	350c5460af	Revert "Update jasmine-jquery to 1.5.1" ... This reverts commit 90a9c386eb.	2013-05-22 17:29:52 -04:00
David Baumgold	525fe2d581	Expose a dummy gettext function in the Jasmine test env	2013-05-22 15:55:53 -04:00
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
cahrens	4d7c7f866a	Merge branch 'master' into feature/christina/metadata-ui	2013-05-20 15:06:40 -04:00
marco	c0cff81e5e	styled firefox number buttons	2013-05-20 14:39:37 -04:00
marco	c356904027	css styles for firefox input number fields	2013-05-20 12:06:30 -04:00
marco	32f7691040	minor style changes for increment and decrement buttons on firefox number fields	2013-05-20 11:39:13 -04:00
cahrens	3229aaf503	Call polyfill at right time.	2013-05-20 11:16:20 -04:00
marco	aa41aed9d1	prototype for polyfill on number input fields, minimal styling to up down buttons	2013-05-20 09:45:33 -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
marco	ef14155306	cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill	2013-05-16 09:50:16 -04:00
marco	12dae84a07	commented out firefox polyfill ad well as xmodule css editor changes	2013-05-15 16:07:45 -04:00
marco	b3e41d19f6	styling for static pages updated	2013-05-15 13:29:35 -04:00
marco	0422350e8c	final changes to codemirror styling, and clean up style for settings button clearing	2013-05-15 12:05:43 -04:00
marco	e157173c11	styling adjustments to codemirror and wrapped polyfill into a function	2013-05-15 10:53:54 -04:00
marco	8d8c8d83df	updated unit styling, added polyfill js library, updated javascript handling for modes swap	2013-05-14 12:38:52 -04:00
marco	0aaaf84f62	added number metadata template, cleaned up editor theme ui bordering and settings styles	2013-05-14 08:22:36 -04:00
cahrens	5edbf3d8f7	Merge branch 'master' into feature/christina/metadata-ui	2013-05-13 10:55:32 -04:00
marco	97de97cc18	minimal mce editor style changes to borders	2013-05-13 09:27:13 -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