Zia Fazal b3f85e1d4a Instructor Dashboard management tools for Entrance Exams ...

Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset
added rescore, delete state and task history functionality

2015-02-23 15:04:05 -05:00

..

candy_res

Remove unused static assets

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

coffee

Instructor Dashboard management tools for Entrance Exams

2015-02-23 15:04:05 -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

Add tracking code to LinkedIn URL.

2015-02-23 11:52:47 -05:00

js

Instructor Dashboard management tools for Entrance Exams

2015-02-23 15:04:05 -05:00

sass

Add tracking code to LinkedIn URL.

2015-02-23 11:52:47 -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

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

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

js_test.yml

Instructor Dashboard management tools for Entrance Exams

2015-02-23 15:04:05 -05:00

require-config-lms.js

TNL-1353: Fix annotator dependency.

2015-02-05 15:51:30 +02: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