Merge branch 'master' into feature/diana/close-oe-problems
Conflicts: common/lib/xmodule/xmodule/combined_open_ended_module.py
Showing
common/lib/sample-post.py
0 → 100644
common/static/applets/capa/Protex.jar
0 → 100644
File added
common/static/applets/capa/genex.jar
0 → 100644
File added
common/static/js/capa/design-protein-2d.js
0 → 100644
common/static/js/capa/edit-a-gene.js
0 → 100644
common/static/js/capa/editamolecule.js
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
1.46 KB
432 Bytes
1.11 KB
412 Bytes
1.95 KB
706 Bytes
222 Bytes
231 Bytes
298 Bytes
189 Bytes
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
43 Bytes
1.46 KB
432 Bytes
1.11 KB
412 Bytes
1.95 KB
706 Bytes
222 Bytes
231 Bytes
298 Bytes
189 Bytes
common/static/js/capa/jsmolcalc/hosted.html
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
common/static/js/capa/protex/clear.cache.gif
0 → 100644
43 Bytes
common/static/js/capa/protex/hosted.html
0 → 100644
common/static/js/capa/protex/protex.css
0 → 100644
1.81 KB
lms/lib/symmath/README.md
0 → 100644