Brian Talbot cdcdfd49e0 studio - alerts: resolving local master merge conflcits

2013-03-18 10:58:16 -04:00

..

features

Updated Selenium test, deleted dead code related to Advanced Settings.

2013-03-11 16:56:24 -04:00

management

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

tests

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

__init__.py

move call to update_templates on service startup into a django-admin command

2013-03-04 08:06:58 -05:00

course_info_model.py

Fix tests

2013-02-15 15:44:11 -05:00

module_info_model.py

Iterate over metadata items when setting module info

2013-03-11 14:32:56 -04:00

utils.py

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00

views.py

studio - alerts: resolving local master merge conflcits

2013-03-18 10:58:16 -04:00