Adam Palay cfeb76e67f Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py

2014-09-05 13:20:15 -04:00

..

djangoapps

Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts

2014-09-05 13:20:15 -04:00

envs

Move edit info into xblock and runtime mixins

2014-09-02 10:08:39 -04:00

lib

Add Studio handling for changes to group configurations

2014-06-20 11:41:22 -04:00

static

Studio: resolves layout issues with icons in system feedback UI

2014-09-04 11:07:54 -04:00

templates

Studio: resolves layout issues with icons in system feedback UI

2014-09-04 11:07:54 -04:00

__init__.py

…

.coveragerc

…

startup.py

Monkey patch 'django.utils.translation'

2014-08-27 15:27:34 -07: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

Unflag Group Configurations, Render only existing children in staff view of split_test.

2014-08-22 16:43:54 -04:00

wsgi.py

Centralize startup code, and execute in all contexts

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