Will Daly 5085b71677 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form ...

Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py

2014-11-10 15:05:37 -05:00

..

collections

Show cohorts on the new instructor dashboard

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

dashboard

Merge pull request #5541 from edx/will/dashboard-js-shame

2014-10-14 11:54:57 -04:00

fixtures

Add donation end-point

2014-10-07 14:22:55 -04:00

models

Support adding cohorts from the instructor dashboard

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

spec

Include course ID in analytics events for logistration

2014-11-10 10:23:34 -05:00

student_account

Include course ID in analytics events for logistration

2014-11-10 10:23:34 -05:00

student_profile

Fix logistration Jasmine tests

2014-11-06 12:07:49 -05:00

vendor

fixup! Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4)

2014-11-03 16:49:18 -05:00

verify_student

Handle the indexerror exception on create_order

2014-09-02 19:08:53 +05:00

views

Make student profile CSV download a background task, add cohort column

2014-10-02 14:21:13 -04:00

wiki

mitx_markdown => edx_markdown

2013-12-04 10:23:47 -05:00

ajax-error.js

Use confirm dialogue.

2014-06-23 18:24:53 +03:00

bootstrap-alert.js

added additional bootstrap js files

2012-08-17 14:14:07 -04:00

bootstrap-collapse.js

added additional bootstrap js files

2012-08-17 14:14:07 -04:00

bootstrap-modal.js

Added bootstrap-modal for the wiki preview modals.

2012-08-15 20:07:05 -04:00

bootstrap-transition.js

added additional bootstrap js files

2012-08-17 14:14:07 -04:00

bootstrap.min.js

added bootstrap js and other dependencies; tweaked settings template

2012-08-17 09:37:42 -04:00

common_helpers

Support adding students to a cohort via the instructor dashboard.

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

course_info.js

cleans up course info/profile page

2012-07-02 14:11:25 -04:00

course_survey.js

Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course

2014-10-30 13:11:02 -04:00

form.ext.js

IE7 compatibility: no trailing commas in arrays, including the third party json2.js lib because IE<8 has no JSON object.

2012-12-07 16:03:05 -05:00

help.js

Restore /faq page, and moved new content to /help

2013-01-17 10:47:50 -05:00

html5shiv.js

adding html5shiv.js to static/js

2012-07-11 15:26:18 -04:00

jquery.ajaxfileupload.js

Fixes image uploades in firefox

2012-09-17 15:54:24 -07:00

jquery.autocomplete.js

adjust new post button in forum view

2012-08-14 12:43:15 -07:00

jquery.gradebook.js

added simple table filtering to gradebook

2012-08-23 16:57:03 -04:00

jquery.treeview.js

added treeview

2012-07-30 17:39:44 -04:00

Markdown.Converter.js

moved some stuff & ajax link to page

2012-08-03 15:55:21 -04:00

Markdown.Editor.js

Unicode support for course names in reverification flow

2014-04-08 13:11:41 -04:00

Markdown.Sanitizer.js

moved some stuff & ajax link to page

2012-08-03 15:55:21 -04:00

mustache.js

moved some stuff & ajax link to page

2012-08-03 15:55:21 -04:00

my_courses_dropdown.js

User menu a11y changes to allow use of spacebar, escape key and arrow keys or tab and shift+tab to navigate

2013-11-01 14:34:02 -07:00

pdf-analytics.js

Added analytics event logging to PDF book viewer

2014-04-14 17:55:53 -04:00

pending_tasks.js

Refactor test_views from test_api. Pull out pending_tasks.js.

2013-06-18 11:19:25 -04:00

query-params.js

Fix login-if-?next behavior

2012-09-23 22:33:20 -04:00

RequireJS-namespace-undefine.js

Convert Studio JS to use require.js

2013-10-04 13:43:50 -04:00

simplewiki-AutoSuggest_c_2.0.js

Most of the wiki pages are now loading without errors.

2012-07-03 09:50:58 -07:00

split.js

moved some stuff & ajax link to page

2012-08-03 15:55:21 -04:00

staff_debug_actions.js

Fixed links for units loaded via ajax.

2014-06-02 14:19:19 +05:00

sticky_filter.js

wip modal

2012-06-21 11:05:18 -04:00

sticky_footer.js

gets app completly uptodate with prototype

2012-06-20 14:37:37 -04:00

toggle_login_modal.js

Instructors can view previously sent email content

2014-08-04 10:08:32 -07:00