Dennis Jen d2660e530f Merge branch 'release' ...

Conflicts:
	lms/templates/verify_student/make_payment_step.underscore

2015-01-08 15:02:26 -05:00

..

djangoapps

Merge branch 'release'

2015-01-08 15:02:26 -05:00

envs

Merge branch 'release'

2015-01-08 15:02:26 -05:00

lib

Studio render XBlockAside views

2014-12-17 15:44:49 -05:00

static

Merge pull request #6252 from edx/studio-move-branded

2015-01-08 12:42:40 -05:00

templates

Merge pull request #6252 from edx/studio-move-branded

2015-01-08 12:42:40 -05: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

s/pylint: disable=W0104/pylint: disable=pointless-statement/

2014-12-01 11:22:12 -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

Add front end for Studio video upload feature

2014-12-15 13:09:59 -05:00

wsgi.py

Fix PEP8: W391 blank line at end of file

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