Adam Palay c37715a7c7 Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt

2016-01-26 11:25:41 -05:00

..

audio

No indication the photo was taken

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

certificates

Adding optimized images in batches [16/19]

2016-01-13 20:38:42 -05:00

coffee

Revert "Calculator layout and help popup fixes"

2016-01-11 12:47:05 -05:00

css/vendor

Adding optimized images in batches [16/19]

2016-01-13 20:38:42 -05:00

fonts

removing extra bold font-weight (800) from style rules/typeface files

2015-06-25 22:49:54 -04:00

images

Adding optimized images in batches [18/19]

2016-01-13 20:38:43 -05:00

js

Merge pull request #10699 from doganov/TNL-3644

2016-01-25 13:43:24 -05:00

lms/js

Support tool for changing enrollments.

2015-12-17 16:03:58 -05:00

sass

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2016-01-26 11:25:41 -05:00

scripts

perform a new merge from master, resolve conflicts

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

themed_sass

Comprehensive theming

2015-09-17 15:39:03 -04: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

Fixes after rebase to Django 1.8

2015-12-17 22:10:21 +05:00

support

Support team UI for regenerating certificates

2015-08-12 07:09:46 -07: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