cahrens 7f1c89b492 Merge branch 'master' into feature/btalbot/studio-alerts

2013-04-08 10:28:52 -04:00

..

djangoapps

Fix some pylint errors in the lettuce terrain module

2013-04-03 13:01:42 -04:00

lib

Merge pull request #1812 from MITx/feature/christina/gmt

2013-04-08 07:00:08 -07:00

static

Merge branch 'master' into feature/btalbot/studio-alerts

2013-04-08 10:28:52 -04:00

templates

Fixed jasmine test issue with cms caused by previous change

2013-03-11 11:27:49 -04:00

test

get metadata inheritance to work with draft stores. Fix bug on .publish() method whereby inherited metadata got written to the DB as 'own-metadata'. Change filter in mako_module.py to return list of own-metadata and inherited-metadata as 'editable-metadata'. Also, add unit test for draft metadata-inheritance and publish

2013-04-07 19:33:04 -04:00

xml_cleanup.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00