Brian Talbot c8cceb7140 Merge branch 'master' into feature/btalbot/studio-alerts

2013-04-08 11:40:53 -04:00

..

djangoapps

fix default giturl link

2013-04-07 00:51:07 +00:00

lib

Merge pull request #1819 from MITx/feature/ichuang/fix-edit-links-and-giturl

2013-04-08 08:17:31 -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