edx-platform

Files

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

2013-03-14 19:42:55 +02:00

2013-03-13 16:27:56 +01:00

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

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

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

annotationinput.js

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

chemical_equation_preview.js

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

design-protein-2d.js

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

drag_and_drop.js

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

edit-a-gene.js

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

editamolecule.js

Removed console.logs

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

README

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

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)