Greg Price 372084e0b6 Merge branch 'drupal-new' ...

Conflicts:
	lms/envs/common.py

2013-05-17 16:17:35 -04:00

..

djangoapps

Merge pull request #2061 from edx/bug/christina/static-pages

2013-05-17 09:59:59 -07:00

envs

Merge branch 'drupal-new'

2013-05-17 16:17:35 -04:00

static

adjusted width of header nav to prevent wrapping in PC FF, also put max-width on Org name and Course number in header to prevent the nav from getting bumped way over

2013-05-17 14:07:06 -04:00

templates

Merge pull request #2039 from edx/fix-course-updates

2013-05-14 16:14:20 -07: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

Add status app with simple view to check celery workers

2013-05-17 11:33:14 -04:00

xmodule_namespace.py

Remove duplicated StringyX definitions.

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