John Jarvis 209ea51c28 merging from master

2014-11-26 16:21:16 -05:00

..

djangoapps

Merge pull request #6049 from Shrhawk/shr/bug/TNL-290-incorrect-message-duplicate-course

2014-11-26 19:03:52 +05:00

envs

merging from master

2014-11-26 16:21:16 -05:00

lib

TNL-481: Add RequireJS Optimizer.

2014-10-20 17:33:21 +03:00

static

hotfix-2014-11-20

2014-11-20 12:00:19 -05:00

templates

TNL-772: Fix course time settings.

2014-11-20 14:56:12 +02: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

startup.py

Moved imports to manage.py and wsgi.py.

2014-10-14 18:27:31 +05:00

urls_dev.py

Add the ability to view templates in a browser in development mode

2014-02-07 14:56:35 -05:00

urls.py

Fix PEP8: E128 continuation line under-indented

2014-11-24 20:46:50 -05:00

wsgi.py

Fix PEP8: W391 blank line at end of file

2014-11-10 11:00:18 -08:00