Adarnof 00cc89d71c Merge branch 'master' of https://github.com/Adarnof/allianceauth into custom_user ...

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

Fix some tests.

2017-05-27 18:34:59 -04:00

..

migrations

Grant service access by permissions (#692)

2017-02-11 22:51:30 -05: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

manager.py

IPS4 and Market PHP hash fix (#727)

2017-02-20 23:20:12 -05:00

models.py

Grant service access by permissions (#692)

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

tasks.py

Grant service access by permissions (#692)

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

tests.py

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

2017-05-27 18:34:59 -04:00

urls.py

Prevent market url patterns from conflicting

2017-01-30 16:46:35 +10:00

views.py

Bulk of the profile work is done.

2017-03-23 22:54:25 -04:00