Ariel Rin
39a40a8c43
Limit Django-Celery-Beat to 2.2.0 for Celery 4.x
2021-07-02 16:42:07 +00:00
Ariel Rin
31123f7e97
Merge branch 'v2.9.x' of https://gitlab.com/allianceauth/allianceauth into v2.9.x
2021-06-29 14:02:00 +10:00
Ariel Rin
96300a012a
Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into v2.9.x
2021-06-29 14:01:52 +10:00
Ariel Rin
5f98b5350e
Version Bump v2.8.5
2021-06-29 03:27:30 +00:00
Ariel Rin
8874eceb5f
Merge branch 'name-formatting' into 'v2.9.x'
...
Name formatter fixes
See merge request allianceauth/allianceauth!1321
2021-06-29 03:15:02 +00:00
Ariel Rin
9de4d557e3
Merge branch 'discord-existing' into 'master'
...
Update member when they are already in Discord server.
See merge request allianceauth/allianceauth!1322
2021-06-29 03:10:23 +00:00
Aaron Kable
1d5f2634f1
Update member when they are already in Discord server.
2021-06-29 03:10:23 +00:00
Ariel Rin
710d26d36d
Merge branch 'message-icons-fix' into 'master'
...
[FIX] icons in alert messages
See merge request allianceauth/allianceauth!1323
2021-06-29 03:10:01 +00:00
Peter Pfeufer
47793e6198
[FIX] icons in alert messages
...
This way they don't interfere with possible HTML in the message itself.
2021-06-28 21:20:59 +02:00
Peter Pfeufer
3c799eb40b
None is neither an allince, a corp or a character
2021-06-23 12:29:33 +02:00
Ariel Rin
0d7b8e315f
tidy up missed pre-commits from master merge
2021-06-23 10:03:57 +10:00
Ariel Rin
ae7cfbff35
Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into v2.9.x
2021-06-23 09:58:25 +10:00
Ariel Rin
a0a497ab33
Merge branch 'sanity-checks-and-editorconfig' into 'v2.9.x'
...
Basic code sanity checks and editorconfig
See merge request allianceauth/allianceauth!1316
2021-06-22 23:38:54 +00:00
Peter Pfeufer
fd86471a0f
exluded .po, .mo and swagger.json from checks
...
For demonstration, the last empty line has been removed from swagger.json. Usually it would have been added again through pre-commit, but not with the exclusion here.
2021-06-22 16:42:10 +02:00
Ariel Rin
5fcb56a087
Merge branch 'notification_with_icons' into 'master'
...
Improve messages
See merge request allianceauth/allianceauth!1320
2021-06-21 10:39:56 +00:00
Erik Kalkoken
808080d5ee
Improve messages
2021-06-21 10:39:56 +00:00
Ariel Rin
e6037f1680
Typo (Allince<Alliance) Credit @Thalimet
2021-06-21 10:23:40 +00:00
Ariel Rin
5c3ded6b07
Merge branch 'admin_performance_tuning' into 'master'
...
Admin performance tuning for group and state
See merge request allianceauth/allianceauth!1318
2021-06-01 11:40:32 +00:00
Erik Kalkoken
0c14e35d15
Admin performance tuning for group and state
2021-06-01 11:40:32 +00:00
Ariel Rin
c13be5d39a
Merge branch 'ts3_update_button' into 'master'
...
Add button to update TS3 groups to admin page
See merge request allianceauth/allianceauth!1313
2021-06-01 11:38:24 +00:00
Erik Kalkoken
e4b515c1d5
Add button to update TS3 groups to admin page
2021-06-01 11:38:24 +00:00
Ariel Rin
65e2c87e8f
Merge branch 'improve_eveonline_manager' into 'master'
...
Improve performance in EveCharacter manager
See merge request allianceauth/allianceauth!1314
2021-06-01 11:36:29 +00:00
Ariel Rin
68ce25854a
Merge branch 'quick-syntax-fix-in-docu' into 'master'
...
quick fix in documentation
See merge request allianceauth/allianceauth!1317
2021-06-01 11:35:20 +00:00
Peter Pfeufer
1f80a02be9
version updated
2021-05-17 23:27:17 +02:00
Peter Pfeufer
3df6643513
this is a shell command ...
2021-05-17 17:41:28 +02:00
Peter Pfeufer
e6a4cea4de
editorconfig applied
2021-05-17 11:42:28 +02:00
Peter Pfeufer
bad36a69e8
added editorconfig
2021-05-17 09:52:29 +02:00
Peter Pfeufer
2697fb5317
remove coding pragma. it's not needed since python 3.x
2021-05-17 09:51:09 +02:00
Peter Pfeufer
b47392ba7f
check for LF as line ending
2021-05-17 09:49:58 +02:00
Peter Pfeufer
a99a375375
one and only one empty line at the end of the file
2021-05-17 09:48:57 +02:00
Peter Pfeufer
8c3df89d52
remove trailing whitespaces
2021-05-17 09:46:11 +02:00
Ariel Rin
6ea0ebc9f9
Merge branch 'db-install-docs-update' into 'master'
...
Added a quick hint that it's ok to leave the SQL shell, and some commas
See merge request allianceauth/allianceauth!1315
2021-05-16 02:38:43 +00:00
Peter Pfeufer
26236f5886
Added a quick hint that it's ok to leave the SQL shell, and some commas
2021-05-15 15:27:50 +02:00
ErikKalkoken
1420c71ec5
Improve get_character_by_id()
2021-05-15 13:58:23 +02:00
Ariel Rin
10bd77d761
Version Bump v2.9.0a2
2021-05-13 21:43:24 +10:00
Ariel Rin
192d286cf2
Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into v2.9.x
2021-05-13 21:38:22 +10:00
Ariel Rin
8ab9d2d5ad
Merge branch 'revert-to-autofield' into 'v2.9.x'
...
revert migrations & set DEFAULT_AUTO_FIELD to django.db.models.AutoField
See merge request allianceauth/allianceauth!1312
2021-05-10 11:53:47 +00:00
Peter Pfeufer
3630812b92
revert migrations & set DEFAULT_AUTO_FIELD to django.db.models.AutoField
2021-05-10 13:35:40 +02:00
Ariel Rin
2f320bc256
Version Bump 2.9.0a1
2021-05-09 06:45:17 +00:00
Ariel Rin
45b8d42b8e
Merge branch 'javascript-modernization' into 'v2.9.x'
...
Cleanup and modernize JS
See merge request allianceauth/allianceauth!1305
2021-05-09 06:43:58 +00:00
Peter Pfeufer
bd2d19f867
Cleanup and modernize JS
2021-05-09 06:43:58 +00:00
Ariel Rin
0be404baca
Merge branch 'py36remove' into 'v2.9.x'
...
Remove Python36 Testing and Support
See merge request allianceauth/allianceauth!1301
2021-05-09 06:42:56 +00:00
Ariel Rin
e6cee9ac83
Remove Python36 Testing and Support
2021-05-09 06:42:56 +00:00
Ariel Rin
5a2c9243c4
Version Bump v2.8.4
2021-05-09 05:52:20 +00:00
Ariel Rin
fecd748198
Merge branch 'mumble-version' into 'master'
...
Model updates for Mumble Authenticator 1.1
See merge request allianceauth/allianceauth!1303
2021-05-09 05:41:05 +00:00
Ariel Rin
85351b2c66
Model updates for Mumble Authenticator 1.1
2021-05-09 05:41:05 +00:00
Ariel Rin
8b3e5b6462
Merge branch 'improve_eveonline_admin' into 'master'
...
Improve admin pages for eveonline models
See merge request allianceauth/allianceauth!1306
2021-05-09 05:39:46 +00:00
Erik Kalkoken
93af920b8f
Improve admin pages for eveonline models
2021-05-09 05:39:46 +00:00
Ariel Rin
b1248d9845
Merge branch 'improve_groups_admin' into 'master'
...
Improve group management admin pages
See merge request allianceauth/allianceauth!1308
2021-05-09 05:38:28 +00:00
Erik Kalkoken
c86abef07d
Improve group management admin pages
2021-05-09 05:38:28 +00:00
