Chris Dodge e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge ...

Conflicts:
	requirements.txt

2013-01-03 10:46:24 -05:00

..

djangoapps

trigger another build

2013-01-02 15:01:21 -05:00

envs

Merge pull request #1208 from MITx/feature/cdodge/clone-course

2012-12-27 09:26:51 -08:00

static

studio - resolved unit editing bug where larger images would overflow out of editing visual area

2013-01-02 12:58:59 -05:00

templates

fixes on the export. There's some attributes not being handled correctly

2012-12-27 16:15:52 -05:00

__init__.py

Initial port of templates into filesystem based storage

2012-09-25 10:10:44 -04:00

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

CHANGELOG.md

Add changelog information

2012-11-06 10:34:51 -05:00

manage.py

Fix string layout for readability

2012-06-21 10:59:45 -04:00

urls.py

add service entry point to generate tar.gz file and return to caller. Use of the NamedTemporaryFile will auto cleanup.

2012-12-27 15:31:12 -05:00