Michael DeHaan 7a9cd89d80 Merge conflict

2013-03-22 13:49:26 -04:00

..

migrations

Updated description to be optional, added migration for description change and removal of application user model.

2013-03-22 13:41:35 -04:00

models

Merge conflict

2013-03-22 13:49:26 -04:00

__init__.py

Rename acom to lib to avoid confusion with repo name.

2013-03-13 15:32:22 -04:00

admin.py

Hide fields not needed for the user admin.

2013-03-22 12:02:16 -04:00

rbac.py

Use request.user.is_anonymous versus doing type check.

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

serializers.py

Hide fields not needed for the user admin.

2013-03-22 12:02:16 -04:00

tasks.py

Added basic celery support and configuration.

2013-03-14 16:11:14 -04:00

tests.py

Simplify user model by just using the Django user object.

2013-03-22 11:35:26 -04:00

views.py

Merge conflict

2013-03-22 13:49:26 -04:00