Clinton Blackburn fc242ea23e Merge branch 'release' ...

Release 2014-12-10

2014-12-09 17:39:17 -05:00

..

candy_res

Remove unused static assets

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

coffee

Improvements and bug fixes for shopping cart: WL-117, WL-114, WL-116, WL-115, WK-122

2014-12-04 01:11:49 -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

Consistently name edX branded elements within the LMS [OPEN-300]

2014-11-14 10:30:37 -05:00

js

Remove items from the shopping cart if they are for a course whose course enrollment window has closed

2014-12-09 12:20:37 +05:00

sass

Merge branch 'release'

2014-12-09 17:39:17 -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

…

js_test_coffee.yml

Support adding students to a cohort via the instructor dashboard.

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

js_test.yml

Fix logistration Jasmine tests

2014-11-06 12:07: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