Dennis Jen d2660e530f Merge branch 'release' ...

Conflicts:
	lms/templates/verify_student/make_payment_step.underscore

2015-01-08 15:02:26 -05:00

..

candy_res

Remove unused static assets

2014-11-01 00:11:23 -04:00

coffee

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

2015-01-06 15:24:12 -05:00

css/vendor

As per request #2898, changed the css for annotator tool to affect tinymc only when in annotator-wrapper.

2014-03-12 17:09:20 -04:00

fonts/OpenSans

Updated open sans webfonts with latest.

2014-11-18 12:18:12 +05:00

images

Placeholder image for Open edX Studio logo, when not running on edx.org

2015-01-08 12:42:26 -05:00

js

Merge branch 'release'

2015-01-08 15:02:26 -05:00

sass

Merge branch 'release'

2015-01-08 15:02:26 -05:00

scripts

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

.gitignore

Added Gemfile.lock to ignore

2012-07-30 09:51:50 -04:00

.hgignore

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

js_test_coffee.yml

Teach LMS how to render XBlockAsides

2014-12-13 08:26:28 -05:00

js_test.yml

Add Jasmine tests for the payment/verification flow.

2014-12-22 13:25:49 -05:00

require-config-lms.js

Load OVA JS with requireJS in LMS.

2014-12-09 09:49:45 -05:00

templates

Show cohorts on the new instructor dashboard

2014-10-01 09:22:29 -04:00

xmodule_js

Integrate js-test-tool into testing infrastructure

2013-08-26 20:21:18 -04:00