Edward Zarecor ac6e259388 Merge pull request #8467 from edx/release-2015-06-10-conflict ...

Release 2015 06 10 conflict

2015-06-11 10:16:48 -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

Web Certs: adjusting base/honor-code rendering to only hide staff signatures

2015-06-10 18:47:26 -04:00

coffee

TNL-1652: Allow instructors to obtain CSV file listing students who may

2015-06-04 20:50:04 +02: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

Implement OpenBadge Generation upon Certificate generation through Badgr API

2015-06-02 18:32:50 +00:00

js

Merge pull request #8461 from edx/will/verify-student-cleanup

2015-06-10 14:44:51 -04:00

sass

fixing post-release merge conflicts with DKH

2015-06-10 16:56:21 -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

…

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

TNL-1891 Browse Teams: Category Subnavigation

2015-06-08 15:05:11 -04:00

require-config-lms.js

Add teams tab

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