edx-platform

Files

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

drag_and_drop

merge feature/alex/drag_and_drop-mitx into feature/alex/poll-merged

2013-03-05 18:20:38 +02:00

genex

remove links to missing image files. We can add them if needed later.

2013-03-06 19:11:36 -05:00

jsme

Fixed many more broken references in css

2013-03-01 14:43:28 -05:00

jsmolcalc

Have errors go through jsmolcalc's getInfo

2013-02-05 23:27:52 -05:00

protex

Back to last version of Protex

2013-02-13 09:45:44 +01:00

annotationinput.js

add grading for annotationinput

2013-02-27 01:44:07 -05:00

chemical_equation_preview.js

Update tests and documentation.

2013-03-06 14:53:13 -05:00

design-protein-2d.js

Moved onclick to 'fold' button instead of to courseware's button

2013-02-13 15:10:32 -05:00

drag_and_drop.js

Refactoring of Drag and Drop complete. Draggable properties isUsable, isOriginal included, but functionality connected with them is not complete. Found and fixed bug with z-index ordering.

2013-01-21 15:56:37 +02:00

edit-a-gene.js

Genex updates hidden input field on any modification of dna sequence

2013-03-03 21:41:52 +01:00

editamolecule.js

Removed console.logs

2013-03-01 14:57:38 -05:00

README

Add a chemicalequationinput with live preview

2012-10-12 13:52:48 -04:00

README

These files really should be in the capa module, but we don't have a way to load js from there at the moment.  (TODO)