marco 81a2ac413d Merge branch 'release' ...

Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py

2013-10-01 17:05:02 -04:00

..

applets/capa

Replace editamolecule input type applet with GWT version

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

coffee

Merge pull request #1167 from edx/fix/kevin/forums_accessibility

2013-09-27 14:18:09 -07:00

css

xmodule - Capa/HTML: adds in standard text-justification class names authors can use within table cells

2013-09-20 11:10:56 -04:00

images

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

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

js

Merge pull request #1057 from edx/usman/lms-1114-pdf-arrows

2013-09-27 12:50:38 -07:00

sass

Studio: Converts all class-based Sass archetype-focused @extends to use Sass placeholder syntax

2013-09-18 14:14:11 -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

js_test.yml

Rewriting of links for Course Updates and Course Handouts.

2013-08-29 14:35:16 -04:00