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

..

applets/capa

Replace editamolecule input type applet with GWT version

2013-02-05 20:15:50 -05:00

coffee

Add leanModal vendor src to files.json for cms jasmine tests. Also .gitignore compiled js from coffee specs

2013-04-30 15:22:08 -04:00

css

use same images for prev/next as used in image-based textbooks

2013-02-26 16:43:48 -05:00

images

Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo

2013-04-30 13:34:52 -07:00

js

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

sass

resolved local master merge conflicts with studio sass

2013-03-21 16:15:19 -04:00

scripts

fix tests on merge

2013-01-04 10:32:31 -05:00

.gitignore

Ignore compiled xmodule assets

2013-04-18 15:46:08 -04:00