Arthur Barrett bea943d537 merged master. resolved conflict with the cms contentstore/views.py that was refactored into separate modules.

2013-05-13 16:26:28 -04:00

..

djangoapps

Filter out the template course from the mongo modulestore get_courses function

2013-05-09 16:22:23 -04:00

lib

Merge pull request #2018 from edx/fix/peter/numerical_infinite_bug

2013-05-13 11:08:54 -07:00

static

Merge branch 'master' into feature/abarrett/lms-notes-app

2013-05-09 14:32:05 -04:00

templates

Fixed jasmine test issue with cms caused by previous change

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

test

Merge pull request #1991 from edx/feature/vik/oe-tests

2013-05-13 10:49:33 -07:00

xml_cleanup.py

Pep8 autofixes

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