Chris Dodge 3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 ...

Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt

2013-01-07 12:34:48 -05:00

..

courseware

Merge branch 'master' into feature/cdodge/cms-master-merge2

2013-01-07 12:34:48 -05:00

discussion

Implement basic ability to close off a forum for a given course such that Students can no longer post or edit, but can still view.

2012-11-01 04:37:16 -04:00

emails

Email wording changes based on Sarina's review

2012-10-18 14:28:15 -04:00

instructor

perform a new merge from master, resolve conflicts

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

licenses

Added html view of serial numbers. Refactored code.

2012-10-15 18:46:31 -04:00

registration

Email wording changes based on Sarina's review

2012-10-18 14:28:15 -04:00

simplewiki

Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki

2012-08-20 16:10:17 -04:00

static_templates

media kit - added in new tab/window behavior for download links, revised edX name styling on homepage cta, and provided more context on logo download text

2013-01-04 10:02:14 -05:00

university_profile

perform a new merge from master, resolve conflicts

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

wiki

Added call to load schematics on wiki pages.

2012-09-13 12:38:28 -04:00

.gitignore

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

.hgignore

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

accounts_login.html

perform a new merge from master, resolve conflicts

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

book_toc.xml

XML based table of contents for books.

2012-08-08 14:13:20 -04:00

contact.html

Fix grid and make sure that everything is fluid

2012-07-23 13:56:44 -04:00

course_filter.html

gets app completly uptodate with prototype

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

course.html

perform a new merge from master, resolve conflicts

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

dashboard.html

Only show certificate criteria for notpassing students

2012-11-26 17:57:38 -05:00

dogfood.html

Passes course around for courseware. Fix static assets.

2012-07-03 12:13:15 -04:00

edit_circuit.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

email_change_successful.html

Change email change success notice to say email instead of name

2012-10-18 12:20:52 -04:00

email_exists.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

emails_change_successful.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

enroll_students.html

Added missing file

2012-08-22 16:15:24 -04:00

extauth_failure.html

add openid authentication

2012-08-01 14:59:55 -04:00

feed.rss

perform a new merge from master, resolve conflicts

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

feedback_email.txt

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

footer.html

Fix link to root page on the main page footer

2013-01-03 17:21:54 -05:00

forgot_password_modal.html

adds styles to password reset modal

2012-07-17 22:53:03 -04:00

gitupdate.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

google_analytics.html

Add google analytics to course info pages

2012-10-30 16:05:06 -04:00

homework.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

identity.xml

OpenID provider implementation

2012-08-29 10:29:42 -04:00

index.html

media kit - added in new tab/window behavior for download links, revised edX name styling on homepage cta, and provided more context on logo download text

2013-01-04 10:02:14 -05:00

invalid_email_key.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

login_modal.html

optimize!

2012-09-24 09:22:35 -04:00

main_django.html

Added ie fixes stylesheet to main_django.html. Cleaned up whitespace to more closely match main.html.

2012-09-13 11:39:32 -04:00

main.html

add meta tag for google verification

2012-11-12 13:52:58 -08:00

module-error.html

more template updates to rename MITx to edX

2012-09-06 15:12:19 -04:00

name_changes.html

First pass at branding the header logo on subdomains

2012-08-22 14:05:19 -04:00

navigation.html

revised no certificate state for dashboard messages and removed course message UI for future work on separate branch

2012-11-09 18:18:36 -05:00

open_ended_error.html

perform a new merge from master, resolve conflicts

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

open_ended_feedback.html

perform a new merge from master, resolve conflicts

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

press.json

add press mentions for October, update missing logos, and add sorting.

2012-11-19 10:28:40 -05:00

problem_ajax.html

Update code according to changes in 829e502

2012-07-03 14:33:24 -04:00

problem.html

remove collapsible from problem template

2012-09-28 12:37:25 -04:00

provider_login.html

[#35491529] Small corrections to OpenID provider login page

2012-09-04 20:53:51 -04:00

quickedit.html

Merge remote-tracking branch 'origin/master' into dormsbee/multicourse

2012-07-10 13:39:19 -04:00

self_assessment_hint.html

more css tweaks

2012-11-12 13:17:26 -05:00

self_assessment_prompt.html

perform a new merge from master, resolve conflicts

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

self_assessment_rubric.html

Add in ability to define score points

2012-11-12 14:19:04 -05:00

seq_module.html

Make editing work, building towards drag/drop saving

2012-10-01 15:17:41 -04:00

show_circuit.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

signup_modal.html

You need to fill out your full name but it's not marked with a * as

2012-11-27 11:39:33 -05:00

staff_problem_info.html

Refactored videos to a much simpler impl b/c about videos don't have

2012-12-18 12:46:54 -05:00

staticbook.html

Display the last top level element in the Table of Contents as expandable.

2012-09-19 17:37:15 -04:00

stripped-main.html

transferred edge styles from cms to lms

2012-10-11 14:02:13 -04:00

tab_module.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

tracking_log.html

fix view_tracking_log to show proper timezone

2012-08-17 15:46:09 -04:00

using.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

vert_module.html

Make drag/drop save content immediately in seqs and verticals

2012-10-01 15:17:41 -04:00

video_modal.html

Added {COURSE_STATIC_URL} format key for about section html. Changed get_about_section to be get_course_about_section in courseware.courses.

2012-07-18 13:48:20 -04:00

video.html

Merge branch 'master' into feature/cdodge/cms-master-merge2

2013-01-07 12:34:48 -05:00

xrds.xml

OpenID provider implementation

2012-08-29 10:29:42 -04:00