Max Rothman c97314413b Merge branch 'release' into release-merge-test ...

Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py

2015-07-17 17:42:03 -04:00

..

audio

No indication the photo was taken

2015-06-02 12:41:51 +05:00

candy_res

Remove unused static assets

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

certificates

asadiqbal08/SOL-766: Add Facebook sharing to certificate view

2015-07-02 18:52:15 -04:00

coffee

Revert "Decorated instructor dashboard with sudo_required."

2015-07-17 12:11:38 -04: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

Moved Creative Commons CSS into Sass

2015-06-09 10:55:20 -04:00

images

Default "Course About" image

2015-07-06 10:29:12 -07:00

js

Revert "Decorated instructor dashboard with sudo_required."

2015-07-17 12:11:38 -04:00

sass

Merge branch 'release' into release-merge-test

2015-07-17 17:42:03 -04:00

scripts

perform a new merge from master, resolve conflicts

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

.gitignore

LMS: renaming Sass/CSS files for consistency and clarity

2015-05-14 13:14:54 -04:00

.hgignore

…

common

Create a common paginated list view

2015-06-15 13:51:09 -04:00

js_test_coffee.yml

TNL-213: Let Students Add Personal Notes to Course Content.

2015-01-14 23:34:11 +02:00

js_test.yml

Add generic paging framework

2015-07-06 08:45:03 -04:00

require-config-lms.js

Add generic paging framework

2015-07-06 08:45:03 -04:00

teams

Add teams tab

2015-06-03 09:10:44 -04: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