Chris Dodge 8fdeee06ed Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements ...

Conflicts:
	cms/one_time_startup.py
	common/lib/xmodule/xmodule/modulestore/mongo.py

2013-03-28 13:27:29 -04:00

..

base

Merge pull request #1687 from MITx/hotfix/edz/pinning

2013-03-19 09:31:14 -07:00

forum

add fixes for 500 bugs (lighthouse 287 and 293) by requiring login for accessing licenses and inline discussions. Add unit tests for licenses, and rearrange tests based off of (the former) PageLoad. Also cleanups for pylint and pep8.

2013-03-27 17:59:56 -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

Make the django_comment_client return errors that can't be parsed as JSON just as simple strings when in an ajax context

2013-03-27 08:10:25 -04:00

__init__.py

make discussions work for new users

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

helpers.py

Make relative imports explicitly relative

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

middleware.py

Make the django_comment_client return errors that can't be parsed as JSON just as simple strings when in an ajax context

2013-03-27 08:10:25 -04: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

add fixes for 500 bugs (lighthouse 287 and 293) by requiring login for accessing licenses and inline discussions. Add unit tests for licenses, and rearrange tests based off of (the former) PageLoad. Also cleanups for pylint and pep8.

2013-03-27 17:59:56 -04:00

urls.py

Better fix for trailing slash

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

utils.py

remove discussion caching for now. It might be overkill and I need to figure out how to serialize out the resultset into the cache as writing modules into the cache causes a pickle error

2013-03-21 15:46:57 -04:00