Greg Price a0fb4d6c85 Merge branch 'master' into drupal-new ...

Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html

2013-05-10 10:30:10 -04:00

..

__init__.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

factories.py

Consolidate and upgrade factories

2013-04-18 15:11:10 -04:00

test_access.py

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

test_login.py

fix pylint errors in test_login.py

2013-04-12 10:25:12 -04:00

test_masquerade.py

add test for masquerade

2013-04-13 22:47:49 -04:00

test_model_data.py

Consolidate and upgrade factories

2013-04-18 15:11:10 -04:00

test_module_render.py

Convert due date to a Date (vs. a string with no year).

2013-04-01 11:37:05 -04:00

test_progress.py

Pep8 fixes for tests

2013-03-05 11:53:00 -05:00

test_tabs.py

Add an omnipresent help tab to the LMS

2013-05-06 13:35:52 -04:00

test_views.py

On course about page, display course end date if no about page HTML blog (end_date.html) exists.

2013-04-04 15:35:07 -04:00

tests.py

Merge branch 'master' into drupal-new

2013-05-10 10:30:10 -04:00