Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

Browse Source

Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py

...

This commit is contained in:

Calen Pennington

2012-11-16 09:03:15 -05:00

parent a1a3b92517 7c7ca3ff6b

commit 0fff578e7d

711 changed files with 1812 additions and 38736 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

lms/static/images/press/amradiowrks_press_logo_178x138.jpg Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

lms/static/images/press/ap_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

lms/static/images/press/arstechnica_logo_178x138.jpg Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.0 KiB

BIN

lms/static/images/press/austin_statesman_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

lms/static/images/press/busweek_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

lms/static/images/press/campdenfb_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

BIN

lms/static/images/press/campustech_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.4 KiB

BIN

lms/static/images/press/center_digeducation_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

lms/static/images/press/cnn_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

lms/static/images/press/college_classes_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB

BIN

lms/static/images/press/concord_consortium_logo.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

lms/static/images/press/dailycollegian_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.2 KiB

BIN

lms/static/images/press/dailynews_india_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.4 KiB

BIN

lms/static/images/press/edtechtimes_logo_178x138.jpg Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.2 KiB

BIN

lms/static/images/press/eduinvest_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

lms/static/images/press/forbes_logo_178x138.jpg Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

lms/static/images/press/ft_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

lms/static/images/press/govtech_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.4 KiB

BIN

lms/static/images/press/ibtimes_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

lms/static/images/press/knowledgespeak_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

lms/static/images/press/masshightech_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

lms/static/images/press/npq_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

BIN

lms/static/images/press/nz_listener_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.8 KiB

BIN

lms/static/images/press/online_colleges_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

lms/static/images/press/outsell_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

lms/static/images/press/reuters_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.8 KiB

BIN

lms/static/images/press/techreview_logo_178x138.jpg Executable file → Normal file

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.2 KiB After Width:  |  Height:  |  Size: 3.8 KiB

BIN

lms/static/images/press/test/bbc_logo_178x138.jpg Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.0 KiB

BIN

lms/static/images/press/test/bostonglobe_logo_178x138.jpg Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

lms/static/images/press/test/bostonmag_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

BIN

lms/static/images/press/test/nyt_logo_178x138.jpg Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

lms/static/images/press/test/usnews_logo_178x138.jpg Executable file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.7 KiB

BIN

lms/static/images/press/texaspulse_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

lms/static/images/press/texastribune_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.5 KiB

BIN

lms/static/images/press/theadvocate_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.7 KiB

BIN

lms/static/images/press/thehopen_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.6 KiB

BIN

lms/static/images/press/timeshighered_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

BIN

lms/static/images/press/washpost_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.9 KiB

BIN

lms/static/images/press/wsj_logo_178x138.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.0 KiB