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

2013-05-07 17:27:40 -04:00

..

djangoapps

Merge pull request #1911 from edx/feature/gprice/feedback-button

2013-05-06 11:03:41 -07:00

lib

Merge pull request #1920 from edx/feature/christina/fields

2013-05-07 09:38:34 -07:00

static

merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html.

2013-05-06 13:40:38 -04:00

templates

Fixed jasmine test issue with cms caused by previous change

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

test

add a simple Studio walkthough to check page loads

2013-04-08 13:55:38 -04:00

xml_cleanup.py

Pep8 autofixes

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