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

..

askbot

MAnage images

2012-08-16 12:06:20 -04:00

courses

Add new video to frontpage with gates foundation announcement

2012-11-19 10:02:17 -05:00

discussion

display loading status

2012-08-23 01:47:47 -07:00

portal-icons

Run all images through compression

2012-07-23 14:12:20 -04:00

press

perform a new merge from master, resolve conflicts

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

press-kit

Add content and assets for media kit

2013-01-03 13:28:45 -05:00

social

Run all images through compression

2012-07-23 14:12:20 -04:00

textbook

Add images for book and fix styles for wiki

2012-08-06 16:08:40 -04:00

university

perform a new merge from master, resolve conflicts

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

about_1.jpg

Run all images through compression

2012-07-23 14:12:20 -04:00

admin-actions-sprite.png

added admin controls to main post and comments

2012-08-08 16:42:19 -04:00

amplifier-slider-handle.png

Run all images through compression

2012-07-23 14:12:20 -04:00

BerkeleyX-on-edx-logo.png

First pass at branding the header logo on subdomains

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

bg-texture.png

darker background for increased contrast

2012-08-22 09:03:38 -04:00

brazilstory_blog_arthur.jpg

Run all images through compression

2012-07-23 14:12:20 -04:00

browse-icon.png

started adding updated styles

2012-08-29 13:22:55 -04:00

bullet-triangle.png

Run all images through compression

2012-07-23 14:12:20 -04:00

calc-icon.png

Run all images through compression

2012-07-23 14:12:20 -04:00

calendar-icon.png

Better styles for updates

2012-09-13 15:13:42 -04:00

close-calc-icon.png

Passes course around for courseware. Fix static assets.

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

comment-icon-bottoms.png

tweaked sidebar bugs

2012-08-31 16:58:13 -04:00

contact-page.jpg

Run all images through compression

2012-07-23 14:12:20 -04:00

document-download.png

Run all images through compression

2012-07-23 14:12:20 -04:00

edge-on-edx-logo.png

Merge branch 'course-info' into feature/dhm/cms-settings

2012-11-19 16:00:27 -05:00

edx_bw.png

Run all images through compression

2012-07-23 14:12:20 -04:00

edx-location.png

Run all images through compression

2012-07-23 14:12:20 -04:00

edx-logo-large-bw.png

Run all images through compression

2012-07-23 14:12:20 -04:00

edx-logo-large-color.png

Run all images through compression

2012-07-23 14:12:20 -04:00

edx.png

Run all images through compression

2012-07-23 14:12:20 -04:00

endorse-icon.png

Get voting hooked up

2012-08-29 10:07:20 -04:00

favicon.ico

Added a favicon.

2012-07-22 18:49:10 -04:00

follow-dog-ear.png

started adding updated styles

2012-08-29 13:22:55 -04:00

following-flag.png

Get voting hooked up

2012-08-29 10:07:20 -04:00

graded.png

Added icon to mark it as having a due date

2012-08-31 17:58:08 -04:00

HarvardX-on-edx-logo.png

Add HarvardX- and MITx- on-edx-logo.png files

2012-08-22 14:47:50 -04:00

header-logo.png

Run all images through compression

2012-07-23 14:12:20 -04:00

home_bg.jpg

Run all images through compression

2012-07-23 14:12:20 -04:00

homepage_interns_placeholder_2025x550.jpg

Run all images through compression

2012-07-23 14:12:20 -04:00

homepage-bg.jpg

Run all images through compression

2012-07-23 14:12:20 -04:00

info-icon.png

Add back in calculator related code.

2012-08-27 09:43:37 -04:00

intro-video.jpg

Run all images through compression

2012-07-23 14:12:20 -04:00

jobs.jpeg

Run all images through compression

2012-07-23 14:12:20 -04:00

large-white-error-icon.png

added image

2012-10-02 13:39:42 -04:00

link-icon.png

Added opencourseware box on course about page

2012-09-07 09:49:43 -04:00

logo_bw.png

Run all images through compression

2012-07-23 14:12:20 -04:00

logo_harvard_v5.png

Run all images through compression

2012-07-23 14:12:20 -04:00

logo-edx-support.png

perform a new merge from master, resolve conflicts

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

logo.png

Run all images through compression

2012-07-23 14:12:20 -04:00

MITx-on-edx-logo.png

Add HarvardX- and MITx- on-edx-logo.png files

2012-08-22 14:47:50 -04:00

moderator-delete-icon.png

Get voting hooked up

2012-08-29 10:07:20 -04:00

moderator-edit-icon.png

Get voting hooked up

2012-08-29 10:07:20 -04:00

mongolia_post.jpeg

Run all images through compression

2012-07-23 14:12:20 -04:00

nested-icon.png

started adding updated styles

2012-08-29 13:22:55 -04:00

new-post-icon.png

Get voting hooked up

2012-08-29 10:07:20 -04:00

new-post-icons-full.png

new icons for new post; fixed icons on reply

2012-09-04 11:22:46 -04:00

new-post-icons.png

added new post markup, style and basic interactions

2012-08-30 11:37:50 -04:00

opencourseware.png

Some edits for the resources box

2012-09-07 09:49:43 -04:00

pause-icon.png

Run all images through compression

2012-07-23 14:12:20 -04:00

play-icon.png

Run all images through compression

2012-07-23 14:12:20 -04:00

profile.jpg

Run all images through compression

2012-07-23 14:12:20 -04:00

schools.png

Run all images through compression

2012-07-23 14:12:20 -04:00

search-icon.png

added drag functionality

2012-08-14 16:09:32 -04:00

show-hide-discussion-icon.png

new show/hide button for inline discussions

2012-09-10 12:12:46 -07:00

sidebar-resolved-icons.png

started adding updated styles

2012-08-29 13:22:55 -04:00

slide-left-icon.png

Passes course around for courseware. Fix static assets.

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

slide-right-icon.png

Passes course around for courseware. Fix static assets.

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

slider-bars.png

Run all images through compression

2012-07-23 14:12:20 -04:00

small-grey-arrows.png

new inline post styles

2012-09-07 16:24:25 -04:00

small-header-home-icon.png

new header styles

2012-08-21 14:46:35 -04:00

small-header-logo.png

new header styles

2012-08-21 14:46:35 -04:00

staff-icons.png

added sidebar styling for staff posts and responses

2012-09-06 11:27:46 -04:00

treeview-default.gif

Passes course around for courseware. Fix static assets.

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

ui-icons_222222_256x240.png

Make the sidebar links more standard, and remove some of their styling

2012-08-08 16:27:47 -04:00

video-image.png

Run all images through compression

2012-07-23 14:12:20 -04:00

vote-arrows.png

added vote arrows

2012-08-07 10:16:08 -04:00

vote-plus-icon.png

started adding updated styles

2012-08-29 13:22:55 -04:00

white-error-icon.png

styled new post error messages

2012-09-06 17:22:00 -04:00

wmd-buttons-transparent.png

added transparent icons for the comment form

2012-09-14 16:17:34 -04:00

wmd-buttons.png

files for wmd editor

2012-07-25 20:47:11 -04:00