2101 Commits

Author SHA1 Message Date
Ariel Rin
cafa7cbf17 Merge branch 'top-menu-redesign' into 'v2.9.x'
Top menu redesign

See merge request allianceauth/allianceauth!1329
2021-08-20 04:04:23 +00:00
Peter Pfeufer
641356f31d
css properly formatted 2021-08-18 07:40:47 +02:00
Peter Pfeufer
191b238a04
using "public/lang_select.html" 2021-08-18 07:39:36 +02:00
Ariel Rin
e8f8cb8aa3 Merge branch 'fix-for-the-fix' into 'v2.9.x'
(Hotfix) Missing import added

See merge request allianceauth/allianceauth!1330
2021-08-18 01:39:15 +00:00
Peter Pfeufer
96170a668f
missing import added 2021-08-17 23:47:15 +02:00
Peter Pfeufer
4a3e807066
menu item text for mobile view 2021-08-14 14:02:25 +02:00
Peter Pfeufer
ab369d9aac
[FIX] text color 2021-08-14 13:58:01 +02:00
Peter Pfeufer
742864fe6c
adding eve time to top menu 2021-08-11 16:19:13 +02:00
Peter Pfeufer
c3df1c4d1f
adding user menu 2021-08-11 16:18:59 +02:00
Ariel Rin
63d7fb80e6 Merge branch 'srp_evetools_killboard' into 'v2.9.x'
Add EveTools kill board as accepted source for srp request kill mails

See merge request allianceauth/allianceauth!1326
2021-08-11 13:06:19 +00:00
Peter Pfeufer
839232dc98
add evetools killboard as accepted source for srp requests 2021-07-04 15:04:25 +02:00
Ariel Rin
356df45583 Version Bump v2.9.0a4 v2.9.0a4 2021-07-03 04:44:17 +00:00
Ariel Rin
6b78992f07 Merge branch 'googleanalytics' into 'v2.9.x'
Analytics Module

See merge request allianceauth/allianceauth!1286
2021-07-03 04:43:17 +00:00
Ariel Rin
5af33facb6 Analytics Module 2021-07-03 04:43:16 +00:00
Ariel Rin
a7b9bcf3e8 Merge branch 'bump-celery-version' into 'v2.9.x'
allow celery 5 since it is pulled in by celery-beat>2.2.0

See merge request allianceauth/allianceauth!1325
2021-07-03 04:25:54 +00:00
Ariel Rin
eafc6074c1 Merge branch 'purge_state_cache' into 'v2.9.x'
Refresh user profile on state change to force permission changes.

See merge request allianceauth/allianceauth!1296
2021-07-03 04:25:34 +00:00
Peter Pfeufer
99383a482b
allow celery 5 since it is pulled in by celery-beat
This commit is so that celery 5 can be tested
2021-07-02 18:56:54 +02: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 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