Victor Shnayder 6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts ...

Conflicts:
	common/djangoapps/student/models.py

2013-01-26 12:37:26 -05:00

..

base

Address Dave's comments on https://github.com/MITx/mitx/pull/1350

2013-01-25 13:33:19 -05:00

forum

Address Dave's comments on https://github.com/MITx/mitx/pull/1350

2013-01-25 13:33:19 -05:00

management

fix cohorts in create, and read, and update regular expressions to fix courses with periods not working in General commentable

2013-01-24 14:20:18 -05: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

fix merge problem. assign_default_role() ended up being defined twice as that code was added in both master and cms-master branches, but the merge didn't pick it up as a conflict

2013-01-24 15:54:02 -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

Fix some of the test bugs. Still more to fix.

2013-01-25 15:40:13 -05:00

urls.py

Better fix for trailing slash

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

utils.py

Add note about non-unique topic id across course runs bug

2013-01-24 15:12:53 -05:00