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

..

djangoapps

Remove TODO.

2013-05-02 13:53:17 -04:00

envs

Add cookie name to the cms settings so we don't error out

2013-05-02 17:21:49 -04:00

static

Merge pull request #1980 from edx/backbone-1.0.0

2013-05-09 09:34:35 -07:00

templates

studio - alerts: synced up example HTML to show advanced settings live notification, aria roles, and action classes; integrated typography mixins

2013-05-08 15:30:17 -04:00

__init__.py

Pep8 autofixes

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

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:53:12 -05:00

CHANGELOG.md

Add changelog information

2012-11-06 10:34:51 -05:00

manage.py

Pep8 autofixes

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

one_time_startup.py

remove discussion cache, which isn't used

2013-04-05 15:27:50 -04:00

urls.py

Making linters happier

2013-05-03 15:08:28 -04:00

xmodule_namespace.py

Remove duplicated StringyX definitions.

2013-04-24 14:59:32 -04:00