Ned Batchelder c8a7b259ff Resolve conflicts merging master to rc/2013-11-21

2013-11-27 11:55:44 -05:00

..

djangoapps

Resolve conflicts merging master to rc/2013-11-21

2013-11-27 11:55:44 -05:00

envs

Added LMS_BASE to devstack settings to enable View Live in Studio

2013-11-23 10:42:12 -05:00

static

Studio: adding basic italicize text styling into xmodule/block preview UI

2013-11-26 12:21:55 -05:00

templates

Merge pull request #1773 from edx/andy/unitidentifier

2013-11-26 08:23:27 -08: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

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

urls_dev.py

pylint cleanup

2013-08-01 14:16:55 -04:00

urls.py

Restful api for course advanced settings

2013-11-26 10:17:52 -05:00

wsgi.py

Centralize startup code, and execute in all contexts

2013-08-27 12:12:20 -04:00

xmodule_namespace.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00