Calen Pennington 029d8c8085 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py

2013-03-15 09:46:47 -04:00

..

base

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

2013-03-15 09:46:47 -04:00

forum

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

2013-03-15 09:46:47 -04:00

management

Pep8 autofixes

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

migrations

Pep8 autofixes

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

tests

Removed test_permissions.py

2013-03-06 10:20:02 -05:00

__init__.py

make discussions work for new users

2012-08-23 06:48:37 -07:00

helpers.py

Pep8 autofixes

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

middleware.py

Pep8 autofixes

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

models.py

Pep8 autofixes

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

mustache_helpers.py

Pep8 autofixes

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

permissions.py

pinning .1

2013-03-12 17:40:26 -04:00

settings.py

Pep8 autofixes

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

tests.py

Remove references to .definition and .metadata in modules

2013-03-06 18:07:56 -05:00

urls.py

Better fix for trailing slash

2012-09-21 05:42:51 -07:00

utils.py

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

2013-03-15 09:46:47 -04:00