Adarnof 3e4fc7ceb4 Merge branch 'master' of https://github.com/Adarnof/allianceauth into custom_user ...

# Conflicts:
#	alliance_auth/settings.py.example
#	eveonline/views.py

2017-04-07 00:26:59 -04:00

..

migrations

Grant service access by permissions (#692)

2017-02-11 22:51:30 -05:00

templates/registered

Consolidate TS3 into base services table

2017-03-08 17:50:43 -05:00

util

Teamspeak 3 Updates (#741)

2017-02-28 11:28:51 +10:00

__init__.py

The Great Services Refactor (#594)

2017-01-25 12:50:16 +10:00

admin.py

The Great Services Refactor (#594)

2017-01-25 12:50:16 +10:00

apps.py

The Great Services Refactor (#594)

2017-01-25 12:50:16 +10:00

auth_hooks.py

Grant service access by permissions (#692)

2017-02-11 22:51:30 -05:00

forms.py

Teamspeak 3 Updates (#741)

2017-02-28 11:28:51 +10:00

manager.py

Correct translation issues.

2017-04-07 00:23:25 -04:00

models.py

Grant service access by permissions (#692)

2017-02-11 22:51:30 -05:00

signals.py

The Great Services Refactor (#594)

2017-01-25 12:50:16 +10:00

tasks.py

Merge master.

2017-04-07 00:21:14 -04:00

tests.py

Teamspeak 3 Updates (#741)

2017-02-28 11:28:51 +10:00

urls.py

The Great Services Refactor (#594)

2017-01-25 12:50:16 +10:00

views.py

Merge master.

2017-04-07 00:21:14 -04:00