Chris Dodge 22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 ...

Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt

2013-01-17 09:15:37 -05:00

..

base

Fix context links for the 123187th time

2012-09-14 04:07:04 -07:00

forum

Merge branch 'master' into feature/ibrahim/followed-threads

2012-09-20 23:55:13 -07:00

management

Adding a better command for assigning roles.

2012-11-05 15:29:49 -08:00

migrations

limit permissions of a role to courses and fix bugs

2012-08-08 10:42:29 -04:00

__init__.py

make discussions work for new users

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

helpers.py

Removed helpers.show_if.

2012-09-11 01:49:43 -07:00

middleware.py

got reply working under backbone framework

2012-08-21 02:12:21 -07:00

models.py

Merge branch 'master' into feature/cdodge/cms-master-merge4

2013-01-17 09:15:37 -05:00

mustache_helpers.py

fixed pluralize

2012-08-23 02:52:51 -07:00

permissions.py

Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions

2012-09-14 02:23:45 -07:00

settings.py

fixed file uploading

2012-08-23 02:50:26 -07:00

tests.py

Use one of our test courses when testing course permissions for the discussion client, because we now have course policy level overrides.

2012-11-02 17:21:00 -04:00

urls.py

Better fix for trailing slash

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

utils.py

remove commented out line and add a new comment. also remove debugging trace output

2013-01-09 16:05:09 -05:00