Trever Fischer 82222860c9 Merge branch 'master' of dev.camin.us:www ...

Conflicts:
	profiles/models.py
	profiles/views.py
	templates/base_full.html

2012-03-04 23:22:47 -05:00

..

management

Move MinecraftProfile from the profiles app into the minecraft app, and stop using the auth profiles feature.

2012-03-04 23:18:00 -05:00

migrations

Move MinecraftProfile from the profiles app into the minecraft app, and stop using the auth profiles feature.

2012-03-04 23:18:00 -05:00

templatetags

Use minecraft avatars

2012-03-03 22:09:40 -05:00

__init__.py

Implement a context processor to load gamespy query stuff

2012-02-19 17:46:02 -05:00

admin.py

Move MinecraftProfile from the profiles app into the minecraft app, and stop using the auth profiles feature.

2012-03-04 23:18:00 -05:00

context.py

Move all the player queries into the server model object

2012-03-02 14:51:05 -05:00

forms.py

Move MinecraftProfile from the profiles app into the minecraft app, and stop using the auth profiles feature.

2012-03-04 23:18:00 -05:00

models.py

Merge branch 'master' of dev.camin.us:www

2012-03-04 23:22:47 -05:00

urls.py

Use minecraft avatars

2012-03-03 22:09:40 -05:00

views.py

Use minecraft avatars

2012-03-03 22:09:40 -05:00