cahrens 731fb209de Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce ...

Conflicts:
	cms/static/css/tiny-mce.css

2013-01-22 16:15:27 -05:00

..

djangoapps

New style base python classes and basestring type.

2013-01-22 11:30:24 -05:00

envs

Merge pull request #1240 from MITx/feature/zoldak/cms-bdd-testing

2013-01-09 06:30:03 -08:00

static

Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce

2013-01-22 16:15:27 -05:00

templates

studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules)

2013-01-22 15:51:12 -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