Don Mitchell 70e5344949 Merge pull request #1256 from MITx/fix/cdodge/import-ordering-error ...

make sure we commit the course module first when importing. There's a sn...

2013-01-10 10:40:30 -08:00

..

djangoapps

Merge branch 'master' into feature/cdodge/cms-master-merge2

2013-01-07 12:34:48 -05:00

lib

make sure we commit the course module first when importing. There's a sneaky little ordering dependency where we can't save a static tabe until the course module has been saved. This is because - when saving a static tab - we have to scribble on the course module's metadata to point to it.

2013-01-10 13:24:40 -05:00

static

Update timepicker b/c it wasn't handling minutes from 01-09 and they'd

2013-01-10 11:05:14 -05:00

templates

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-12-07 11:17:41 -05:00

test

Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

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

xml_cleanup.py

{} -> {0} etc in .format statements

2012-08-16 16:22:26 -04:00