Ariel Rin
527c016c72
Merge branch 'faction' into 'v2.9.x'
...
Allow assigning factions to states.
See merge request allianceauth/allianceauth!1338
2021-10-26 09:16:29 +00:00
Adarnof
23849b9f42
Allow assigning factions to states.
2021-10-26 09:16:28 +00:00
Ariel Rin
5d4277adf0
Revert "Change Permissions"
...
This reverts commit 2fe1de1c97a7f0d8446f39276f71f15fb724645e.
2021-10-26 18:46:50 +10:00
Ariel Rin
0f479d525e
Merge branch 'transifex' into 'v2.9.x'
...
Transifex
See merge request allianceauth/allianceauth!1346
2021-10-26 08:45:37 +00:00
Ariel Rin
4aae85a70f
Transifex
2021-10-26 08:45:37 +00:00
Ariel Rin
f0ec16be4e
Merge branch 'versions-versions-versions' into 'v2.9.x'
...
Fix versions shown on the dashboard
Closes #1277
See merge request allianceauth/allianceauth!1355
2021-10-26 08:24:11 +00:00
Ariel Rin
92f6d8b98d
Merge branch 'issue/1200-activation-link-shown-trunctated' into 'v2.9.x'
...
Send proper multipart email
Closes #1200
See merge request allianceauth/allianceauth!1354
2021-10-26 08:20:58 +00:00
Ariel Rin
0a48436937
Merge branch 'issue/1287-add-shieldarmorhull-toggle-to-timer' into 'v2.9.x'
...
Adding timer type to the timer board
Closes #1287
See merge request allianceauth/allianceauth!1353
2021-10-26 08:19:17 +00:00
Ariel Rin
f4c5dc77d8
Merge branch 'issue-1299' into 'v2.9.x'
...
Extend State name to 32 chars
Closes #1299
See merge request allianceauth/allianceauth!1352
2021-10-26 08:03:28 +00:00
Peter Pfeufer
8656d1c972
Let's compare what we actually want to compare
...
- "major" and "minor" is not used at all, so these can be removed
- "base_version" can be removed as well, since we are comparing full version strings, not just parts of them
2021-10-25 21:54:10 +02:00
Peter Pfeufer
1b81f5cfe8
send proper multipart email
2021-10-20 17:46:51 +02:00
Peter Pfeufer
a4723c5942
timer type should always be in its own line
2021-10-20 15:34:57 +02:00
Peter Pfeufer
b31521c758
Adding timer type to the timer board
...
See issue #1287
2021-10-20 15:30:45 +02:00
Ariel Rin
6dc96bb348
Extend State name to 32 chars
2021-10-20 15:24:54 +10:00
Ariel Rin
2da78f7793
Merge branch 'master' into 'v2.9.x'
...
Merge Chunking Updates from Master
See merge request allianceauth/allianceauth!1351
2021-10-20 05:00:57 +00:00
Ariel Rin
e8d54a1d11
Merge Chunking Updates from Master
2021-10-20 05:00:57 +00:00
Ariel Rin
f79e764439
Merge branch 'issue/1308-groups-without-assigned-group-leade' into 'v2.9.x'
...
[FIX] Pending Count for superuser for groups without group lead assigned
Closes #1308
See merge request allianceauth/allianceauth!1349
2021-10-20 05:00:10 +00:00
Peter Pfeufer
803b659fce
[FIX] Pending Count for superuser for groups without group lead assigned
2021-10-20 05:00:09 +00:00
Ariel Rin
537987398d
Merge branch 'make-SITE_NAME-great-again' into 'v2.9.x'
...
Make SITE_NAME great again
See merge request allianceauth/allianceauth!1348
2021-10-20 04:49:54 +00:00
Peter Pfeufer
cdcf65cb52
fixed old Django 2 translation template tags
2021-10-19 12:05:45 +02:00
Peter Pfeufer
5fcb092151
use SITE_NAME constant as page title
2021-10-19 11:50:42 +02:00
Ariel Rin
1fd708e765
Merge branch 'code-update-to-python-3.7' into 'v2.9.x'
...
Update codebase to reflect the new minimum python version 3.7
See merge request allianceauth/allianceauth!1345
2021-10-19 00:56:39 +00:00
Peter Pfeufer
a6b340c179
update code to reflect the new minimum python version 3.7
...
- update string format method
- remove redundant default arguments from function calls
- remove unused imports
- remove unicode identifier from strings, it's default in py3 (see: https://stackoverflow.com/a/4182635/12201331 )
2021-10-18 11:59:05 +02:00
Joel Falknau
2fe1de1c97
Change Permissions
2021-10-18 12:06:41 +10:00
Ariel Rin
0072983b4f
Merge branch 'fix-setup-classifiers' into 'v2.9.x'
...
Fix setup.py classifiers
See merge request allianceauth/allianceauth!1342
2021-10-18 01:59:25 +00:00
Ariel Rin
e1e87edc74
Merge branch 'add-missing-analytics-migration' into 'v2.9.x'
...
Adding missing analytics migration
See merge request allianceauth/allianceauth!1341
2021-10-18 01:59:15 +00:00
Peter Pfeufer
f3c28ea933
No Django 3.2 in AA 2.9.x
2021-10-18 00:32:46 +02:00
Peter Pfeufer
829f8ba0a4
missing analytics migration
2021-10-17 18:26:40 +02:00
Ariel Rin
f49ca2bccb
Version Bump 2.9.0
2021-10-17 10:15:20 +00:00
Ariel Rin
9c71a8d9a3
Merge branch 'transifex' into 'v2.9.x'
...
Update from Transifex
See merge request allianceauth/allianceauth!1319
2021-10-17 09:28:37 +00:00
Ariel Rin
0032f91525
Update from Transifex
2021-10-17 09:28:37 +00:00
Ariel Rin
7f3492f978
Merge branch 'analytics' into 'v2.9.x'
...
Analytics Improvements
See merge request allianceauth/allianceauth!1340
2021-10-17 09:26:11 +00:00
Ariel Rin
2b9110e417
Analytics Improvements
2021-10-17 09:26:11 +00:00
Joel Falknau
98619a0eb8
Require Django-ESI 3.x
2021-10-17 19:13:43 +10:00
Joel Falknau
7a4aa05c39
Merge commit '8486b95917a48d760bb6ba05795a40c19a2440d0' into v2.9.x
2021-10-17 19:11:09 +10:00
Ariel Rin
ba597cd2ad
Merge branch 'case-sensitive-filter-fix' into 'v2.9.x'
...
[FIX] This filter is case sensitive
See merge request allianceauth/allianceauth!1339
2021-10-17 07:28:55 +00:00
Peter Pfeufer
5992ddd48e
This filter is case sensitive
2021-10-15 06:06:02 +02:00
Crashtec
8486b95917
Add override to delete the user from discord itself
2021-10-10 15:19:46 -04:00
Ariel Rin
564f4fb5f9
Merge branch 'use-django-3.2' into 'v2.9.x'
...
Bumped minimum Django version to 3.2.7
See merge request allianceauth/allianceauth!1336
2021-09-22 13:43:51 +00:00
Peter Pfeufer
688c11ff18
bumped min Django version to 3.2.7
2021-09-19 18:05:39 +02:00
Ariel Rin
4a9a2a670c
Version Bump 2.9.0b1
2021-09-14 05:08:15 +00:00
Ariel Rin
5b25637de5
Debian Bullseye now Stable, libmariadbclient-dev name deprecated, now removed
2021-09-14 05:02:15 +00:00
Ariel Rin
bb15de6d1a
Version Bump v2.8.7
2021-09-14 04:32:37 +00:00
Ariel Rin
cf2e368978
Merge branch 'docs-updates' into 'v2.9.x'
...
Docs Updates
See merge request allianceauth/allianceauth!1334
2021-09-14 04:21:23 +00:00
Peter Pfeufer
0d67673542
Docs Updates
2021-09-14 04:21:22 +00:00
Ariel Rin
d7e58fb557
Merge branch 'django-admin-favicons' into 'v2.9.x'
...
Add favicon support to django admin backend
See merge request allianceauth/allianceauth!1335
2021-09-14 04:19:33 +00:00
Peter Pfeufer
f8cffb64a1
add favicon support to django admin backend
2021-08-25 22:37:37 +02:00
Joel Falknau
dc97fb1cc5
Forgot pre-commit for master > 2.9.x
2021-08-20 14:50:44 +10:00
Joel Falknau
392a0c4dcb
Merge remote-tracking branch 'upstream/master' into v2.9.x
2021-08-20 14:41:38 +10:00
Ariel Rin
970a111386
Merge branch 'analytics' into 'v2.9.x'
...
Analytics Enable migration typo
See merge request allianceauth/allianceauth!1331
2021-08-20 04:04:33 +00:00
