mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2026-02-05 06:36:19 +01:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
7dec4deb70 | ||
|
|
d511221899 | ||
|
|
d2b7de5221 | ||
|
79c5be02e2 | ||
|
|
09df37438d | ||
|
|
8561e4c6fd | ||
|
976cb4d988 | ||
|
20f7d5103c | ||
|
|
d049ec2832 |
@@ -1,7 +1,7 @@
|
|||||||
Alliance Auth
|
Alliance Auth
|
||||||
============
|
============
|
||||||
|
|
||||||
[](https://gitter.im/R4stl1n/allianceauth?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
[](https://discord.gg/fjnHAmk)
|
||||||
[](http://allianceauth.readthedocs.io/?badge=latest)
|
[](http://allianceauth.readthedocs.io/?badge=latest)
|
||||||
[](https://gitlab.com/allianceauth/allianceauth/commits/master)
|
[](https://gitlab.com/allianceauth/allianceauth/commits/master)
|
||||||
[](https://gitlab.com/allianceauth/allianceauth/commits/master)
|
[](https://gitlab.com/allianceauth/allianceauth/commits/master)
|
||||||
@@ -12,7 +12,7 @@ An auth system for EVE Online to help in-game organizations manage online servic
|
|||||||
|
|
||||||
[Read the docs here.](http://allianceauth.rtfd.io)
|
[Read the docs here.](http://allianceauth.rtfd.io)
|
||||||
|
|
||||||
[Get help on gitter](https://gitter.im/R4stl1n/allianceauth) or submit an Issue.
|
[Get help on Discord](https://discord.gg/fjnHAmk) or submit an Issue.
|
||||||
|
|
||||||
|
|
||||||
Active Developers:
|
Active Developers:
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# This will make sure the app is always imported when
|
# This will make sure the app is always imported when
|
||||||
# Django starts so that shared_task will use this app.
|
# Django starts so that shared_task will use this app.
|
||||||
|
|
||||||
__version__ = '2.1.0'
|
__version__ = '2.1.1'
|
||||||
NAME = 'Alliance Auth v%s' % __version__
|
NAME = 'Alliance Auth v%s' % __version__
|
||||||
default_app_config = 'allianceauth.apps.AllianceAuthConfig'
|
default_app_config = 'allianceauth.apps.AllianceAuthConfig'
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -122,7 +122,7 @@ def fatlink_statistics_corp_view(request, corpid, year=None, month=None):
|
|||||||
start_of_next_month = first_day_of_next_month(year, month)
|
start_of_next_month = first_day_of_next_month(year, month)
|
||||||
start_of_previous_month = first_day_of_previous_month(year, month)
|
start_of_previous_month = first_day_of_previous_month(year, month)
|
||||||
fat_stats = {}
|
fat_stats = {}
|
||||||
corp_members = CharacterOwnership.objects.filter(character__corporation_id=corpid).values('user_id').distinct()
|
corp_members = CharacterOwnership.objects.filter(character__corporation_id=corpid).order_by('user_id').values('user_id').distinct()
|
||||||
|
|
||||||
for member in corp_members:
|
for member in corp_members:
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -8,12 +8,12 @@
|
|||||||
<ul class="list-group">
|
<ul class="list-group">
|
||||||
{% for notif in notifications %}
|
{% for notif in notifications %}
|
||||||
<li class="list-group-item">
|
<li class="list-group-item">
|
||||||
{% if notif.state == 'open' %}
|
{% if notif.state == 'opened' %}
|
||||||
<span class="label label-success">{% trans "Open" %}</span>
|
<span class="label label-success">{% trans "Open" %}</span>
|
||||||
{% else %}
|
{% else %}
|
||||||
<span class="label label-danger">{% trans "Closed" %}</span>
|
<span class="label label-danger">{% trans "Closed" %}</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<a href="{{ notif.web_url }}" target="_blank">#{{ notif.number }} {{ notif.title }}</a>
|
<a href="{{ notif.web_url }}" target="_blank">#{{ notif.iid }} {{ notif.title }}</a>
|
||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ class TimerForm(forms.ModelForm):
|
|||||||
|
|
||||||
structure_choices = [('POCO', 'POCO'),
|
structure_choices = [('POCO', 'POCO'),
|
||||||
('I-HUB', 'I-HUB'),
|
('I-HUB', 'I-HUB'),
|
||||||
|
('TCU', 'TCU'),
|
||||||
('POS[S]', 'POS[S]'),
|
('POS[S]', 'POS[S]'),
|
||||||
('POS[M]', 'POS[M]'),
|
('POS[M]', 'POS[M]'),
|
||||||
('POS[L]', 'POS[L]'),
|
('POS[L]', 'POS[L]'),
|
||||||
@@ -45,8 +46,9 @@ class TimerForm(forms.ModelForm):
|
|||||||
('Engineering Complex[XL]', 'Engineering Complex[XL]'),
|
('Engineering Complex[XL]', 'Engineering Complex[XL]'),
|
||||||
('Refinery[M]', 'Refinery[M]'),
|
('Refinery[M]', 'Refinery[M]'),
|
||||||
('Refinery[L]', 'Refinery[L]'),
|
('Refinery[L]', 'Refinery[L]'),
|
||||||
('Station', 'Station'),
|
('Cyno Beacon','Cyno Beacon'),
|
||||||
('TCU', 'TCU'),
|
('Cyno Jammer','Cyno Jammer'),
|
||||||
|
('Jump Gate','Jump Gate'),
|
||||||
('Moon Mining Cycle', 'Moon Mining Cycle'),
|
('Moon Mining Cycle', 'Moon Mining Cycle'),
|
||||||
(_('Other'), _('Other'))]
|
(_('Other'), _('Other'))]
|
||||||
objective_choices = [('Friendly', _('Friendly')),
|
objective_choices = [('Friendly', _('Friendly')),
|
||||||
|
|||||||
@@ -64,14 +64,19 @@
|
|||||||
href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }} </a>
|
href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }} </a>
|
||||||
</td>
|
</td>
|
||||||
<td class="text-center">
|
<td class="text-center">
|
||||||
|
{% ifequal timer.structure "POCO" %}
|
||||||
|
<div class="label label-info">
|
||||||
|
POCO
|
||||||
|
</div>
|
||||||
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "I-HUB" %}
|
{% ifequal timer.structure "I-HUB" %}
|
||||||
<div class="label label-warning">
|
<div class="label label-warning">
|
||||||
I-HUB
|
I-HUB
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "POCO" %}
|
{% ifequal timer.structure "TCU" %}
|
||||||
<div class="label label-success">
|
<div class="label label-danger">
|
||||||
POCO
|
TCU
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "POS[S]" %}
|
{% ifequal timer.structure "POS[S]" %}
|
||||||
@@ -119,16 +124,6 @@
|
|||||||
Engineering Complex [XL]
|
Engineering Complex [XL]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Station" %}
|
|
||||||
<div class="label label-danger">
|
|
||||||
Station
|
|
||||||
</div>
|
|
||||||
{% endifequal %}
|
|
||||||
{% ifequal timer.structure "TCU" %}
|
|
||||||
<div class="label label-danger">
|
|
||||||
TCU
|
|
||||||
</div>
|
|
||||||
{% endifequal %}
|
|
||||||
{% ifequal timer.structure "Refinery[M]" %}
|
{% ifequal timer.structure "Refinery[M]" %}
|
||||||
<div class="label label-warning">
|
<div class="label label-warning">
|
||||||
Refinery [M]
|
Refinery [M]
|
||||||
@@ -139,6 +134,21 @@
|
|||||||
Refinery [L]
|
Refinery [L]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
|
{% ifequal timer.structure "Cyno Beacon" %}
|
||||||
|
<div class="label label-warning">
|
||||||
|
Cyno Beacon
|
||||||
|
</div>
|
||||||
|
{% endifequal %}
|
||||||
|
{% ifequal timer.structure "Cyno Jammer" %}
|
||||||
|
<div class="label label-warning">
|
||||||
|
Cyno Jammer
|
||||||
|
</div>
|
||||||
|
{% endifequal %}
|
||||||
|
{% ifequal timer.structure "Jump Gate" %}
|
||||||
|
<div class="label label-warning">
|
||||||
|
Jump Gate
|
||||||
|
</div>
|
||||||
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Moon Mining Cycle" %}
|
{% ifequal timer.structure "Moon Mining Cycle" %}
|
||||||
<div class="label label-success">
|
<div class="label label-success">
|
||||||
Moon Mining Cycle
|
Moon Mining Cycle
|
||||||
@@ -213,91 +223,101 @@
|
|||||||
<a href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }}</a>
|
<a href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }}</a>
|
||||||
</td>
|
</td>
|
||||||
<td class="text-center">
|
<td class="text-center">
|
||||||
{% ifequal timer.structure "I-HUB" %}
|
{% ifequal timer.structure "POCO" %}
|
||||||
<div class="label label-warning">
|
<div class="label label-info">
|
||||||
I-HUB
|
POCO
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "POCO" %}
|
{% ifequal timer.structure "I-HUB" %}
|
||||||
<div class="label label-success">
|
<div class="label label-warning">
|
||||||
POCO
|
I-HUB
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "POS[S]" %}
|
{% ifequal timer.structure "TCU" %}
|
||||||
<div class="label label-info">
|
<div class="label label-danger">
|
||||||
POS [S]
|
TCU
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "POS[M]" %}
|
{% ifequal timer.structure "POS[S]" %}
|
||||||
<div class="label label-info">
|
<div class="label label-info">
|
||||||
POS [M]
|
POS [S]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "POS[L]" %}
|
{% ifequal timer.structure "POS[M]" %}
|
||||||
<div class="label label-info">
|
<div class="label label-info">
|
||||||
POS [L]
|
POS [M]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Citadel[M]" %}
|
{% ifequal timer.structure "POS[L]" %}
|
||||||
<div class="label label-danger">
|
<div class="label label-info">
|
||||||
Citadel [M]
|
POS [L]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Citadel[L]" %}
|
{% ifequal timer.structure "Citadel[M]" %}
|
||||||
<div class="label label-danger">
|
<div class="label label-danger">
|
||||||
Citadel [L]
|
Citadel [M]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Citadel[XL]" %}
|
{% ifequal timer.structure "Citadel[L]" %}
|
||||||
<div class="label label-danger">
|
<div class="label label-danger">
|
||||||
Citadel [XL]
|
Citadel [L]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Engineering Complex[M]" %}
|
{% ifequal timer.structure "Citadel[XL]" %}
|
||||||
<div class="label label-warning">
|
<div class="label label-danger">
|
||||||
Engineering Complex [M]
|
Citadel [XL]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Engineering Complex[L]" %}
|
{% ifequal timer.structure "Engineering Complex[M]" %}
|
||||||
<div class="label label-warning">
|
<div class="label label-warning">
|
||||||
Engineering Complex [L]
|
Engineering Complex [M]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Engineering Complex[XL]" %}
|
{% ifequal timer.structure "Engineering Complex[L]" %}
|
||||||
<div class="label label-warning">
|
<div class="label label-warning">
|
||||||
Engineering Complex [XL]
|
Engineering Complex [L]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Station" %}
|
{% ifequal timer.structure "Engineering Complex[XL]" %}
|
||||||
<div class="label label-danger">
|
<div class="label label-warning">
|
||||||
Station
|
Engineering Complex [XL]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "TCU" %}
|
{% ifequal timer.structure "Refinery[M]" %}
|
||||||
<div class="label label-danger">
|
<div class="label label-warning">
|
||||||
TCU
|
Refinery [M]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Refinery[M]" %}
|
{% ifequal timer.structure "Refinery[L]" %}
|
||||||
<div class="label label-warning">
|
<div class="label label-warning">
|
||||||
Refinery [M]
|
Refinery [L]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Refinery[L]" %}
|
{% ifequal timer.structure "Cyno Beacon" %}
|
||||||
<div class="label label-warning">
|
<div class="label label-warning">
|
||||||
Refinery [L]
|
Cyno Beacon
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Moon Mining Cycle" %}
|
{% ifequal timer.structure "Cyno Jammer" %}
|
||||||
<div class="label label-success">
|
<div class="label label-warning">
|
||||||
Moon Mining Cycle
|
Cyno Jammer
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Other" %}
|
{% ifequal timer.structure "Jump Gate" %}
|
||||||
<div class="label label-default">
|
<div class="label label-warning">
|
||||||
Other
|
Jump Gate
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
|
{% ifequal timer.structure "Moon Mining Cycle" %}
|
||||||
|
<div class="label label-success">
|
||||||
|
Moon Mining Cycle
|
||||||
|
</div>
|
||||||
|
{% endifequal %}
|
||||||
|
{% ifequal timer.structure "Other" %}
|
||||||
|
<div class="label label-default">
|
||||||
|
Other
|
||||||
|
</div>
|
||||||
|
{% endifequal %}
|
||||||
</td>
|
</td>
|
||||||
<td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
|
<td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
|
||||||
<td class="text-center" nowrap>
|
<td class="text-center" nowrap>
|
||||||
@@ -364,91 +384,101 @@
|
|||||||
<a href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }}</a>
|
<a href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }}</a>
|
||||||
</td>
|
</td>
|
||||||
<td class="text-center">
|
<td class="text-center">
|
||||||
{% ifequal timer.structure "I-HUB" %}
|
{% ifequal timer.structure "POCO" %}
|
||||||
<div class="label label-warning">
|
<div class="label label-info">
|
||||||
I-HUB
|
POCO
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "POCO" %}
|
{% ifequal timer.structure "I-HUB" %}
|
||||||
<div class="label label-success">
|
<div class="label label-warning">
|
||||||
POCO
|
I-HUB
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "POS[S]" %}
|
{% ifequal timer.structure "TCU" %}
|
||||||
<div class="label label-info">
|
<div class="label label-danger">
|
||||||
POS [S]
|
TCU
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "POS[M]" %}
|
{% ifequal timer.structure "POS[S]" %}
|
||||||
<div class="label label-info">
|
<div class="label label-info">
|
||||||
POS [M]
|
POS [S]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "POS[L]" %}
|
{% ifequal timer.structure "POS[M]" %}
|
||||||
<div class="label label-info">
|
<div class="label label-info">
|
||||||
POS [L]
|
POS [M]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Citadel[M]" %}
|
{% ifequal timer.structure "POS[L]" %}
|
||||||
<div class="label label-danger">
|
<div class="label label-info">
|
||||||
Citadel [M]
|
POS [L]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Citadel[L]" %}
|
{% ifequal timer.structure "Citadel[M]" %}
|
||||||
<div class="label label-danger">
|
<div class="label label-danger">
|
||||||
Citadel [L]
|
Citadel [M]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Citadel[XL]" %}
|
{% ifequal timer.structure "Citadel[L]" %}
|
||||||
<div class="label label-danger">
|
<div class="label label-danger">
|
||||||
Citadel [XL]
|
Citadel [L]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Engineering Complex[M]" %}
|
{% ifequal timer.structure "Citadel[XL]" %}
|
||||||
<div class="label label-warning">
|
<div class="label label-danger">
|
||||||
Engineering Complex [M]
|
Citadel [XL]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Engineering Complex[L]" %}
|
{% ifequal timer.structure "Engineering Complex[M]" %}
|
||||||
<div class="label label-warning">
|
<div class="label label-warning">
|
||||||
Engineering Complex [L]
|
Engineering Complex [M]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Engineering Complex[XL]" %}
|
{% ifequal timer.structure "Engineering Complex[L]" %}
|
||||||
<div class="label label-warning">
|
<div class="label label-warning">
|
||||||
Engineering Complex [XL]
|
Engineering Complex [L]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Station" %}
|
{% ifequal timer.structure "Engineering Complex[XL]" %}
|
||||||
<div class="label label-danger">
|
<div class="label label-warning">
|
||||||
Station
|
Engineering Complex [XL]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "TCU" %}
|
{% ifequal timer.structure "Refinery[M]" %}
|
||||||
<div class="label label-danger">
|
<div class="label label-warning">
|
||||||
TCU
|
Refinery [M]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Refinery[M]" %}
|
{% ifequal timer.structure "Refinery[L]" %}
|
||||||
<div class="label label-warning">
|
<div class="label label-warning">
|
||||||
Refinery [M]
|
Refinery [L]
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Refinery[L]" %}
|
{% ifequal timer.structure "Cyno Beacon" %}
|
||||||
<div class="label label-warning">
|
<div class="label label-warning">
|
||||||
Refinery [L]
|
Cyno Beacon
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Moon Mining Cycle" %}
|
{% ifequal timer.structure "Cyno Jammer" %}
|
||||||
<div class="label label-success">
|
<div class="label label-warning">
|
||||||
Moon Mining Cycle
|
Cyno Jammer
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal timer.structure "Other" %}
|
{% ifequal timer.structure "Jump Gate" %}
|
||||||
<div class="label label-default">
|
<div class="label label-warning">
|
||||||
Other
|
Jump Gate
|
||||||
</div>
|
</div>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
|
{% ifequal timer.structure "Moon Mining Cycle" %}
|
||||||
|
<div class="label label-success">
|
||||||
|
Moon Mining Cycle
|
||||||
|
</div>
|
||||||
|
{% endifequal %}
|
||||||
|
{% ifequal timer.structure "Other" %}
|
||||||
|
<div class="label label-default">
|
||||||
|
Other
|
||||||
|
</div>
|
||||||
|
{% endifequal %}
|
||||||
</td>
|
</td>
|
||||||
<td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
|
<td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
|
||||||
<td class="text-center" nowrap>
|
<td class="text-center" nowrap>
|
||||||
|
|||||||
Reference in New Issue
Block a user