Carlos Andrés Rocha 4d266fa3ca Merge pull request #1718 from MITx/victor/fewer-phds-more-associates ...

In sign up form, merge PhD-science and PhD-other, add Associate's degree

2013-03-21 14:35:16 -07:00

..

djangoapps

Merge pull request #1718 from MITx/victor/fewer-phds-more-associates

2013-03-21 14:35:16 -07:00

lib

Merge pull request #1710 from MITx/feature/will/speed_up_lettuce_tests

2013-03-21 12:17:07 -07:00

static

studio - fixing a default mixin value used when defining font-size for elements

2013-03-21 12:21:02 -04:00

templates

Fixed jasmine test issue with cms caused by previous change

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

test

import needs to enumerate through the fields for all content scopes. Also add unit test

2013-03-20 21:37:09 -04:00

xml_cleanup.py

Pep8 autofixes

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