2858 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ariel Rin	703c2392a9	Merge branch 'django4' into 'v3.x' ... v2.10.x Uplifts, DJ4, Py3.8 + More See merge request allianceauth/allianceauth!1387	2022-02-08 13:04:45 +00:00
Ariel Rin	18c9a66437	Merge branch 'fix-ifequal-errors' into 'django4' ... Fix ifequal errors See merge request soratidus999/allianceauth!9	2022-02-06 07:16:56 +00:00
Ariel Rin	9687d57de9	Merge branch 'update-url-configs' into 'django4' ... Switch to `path`, use `re_path` only when really needed See merge request soratidus999/allianceauth!8	2022-02-06 07:16:46 +00:00
Peter Pfeufer	60c2e57d83	Fix ifequal errors	2022-02-02 16:12:43 +01:00
Peter Pfeufer	b14bff0145	We should do this properly ..	2022-02-02 15:28:36 +01:00
Peter Pfeufer	9166886665	That one slipped through the cracks ...	2022-02-02 15:27:07 +01:00
Peter Pfeufer	c74010d441	Docs updated	2022-02-02 15:25:45 +01:00
Peter Pfeufer	640a21e4db	Switch to path, use re_path only when really needed	2022-02-02 15:09:48 +01:00
Ariel Rin	8ae4e02012	Merge branch 'docker-bump-version' into 'v2.10.x' ... Bump version for Docker deployment to v2.10.x. See merge request allianceauth/allianceauth!1396	2022-02-02 13:26:33 +00:00
Weyland	cc9a07197d	Bump version for Docker deployment to v2.10.x.	2022-02-02 13:30:05 +01:00
Ariel Rin	fd442a5735	django.conf.urls.url is deprecated	2022-02-02 21:56:01 +10:00
Ariel Rin	c7b99044bc	django.conf.urls.url is deprecated, more to fix	2022-02-02 21:39:37 +10:00
Ariel Rin	234451a7d4	temporarily use django-esi MR	2022-02-02 21:37:01 +10:00
Ariel Rin	ffff904ab1	Pull specific commit from git temporarily	2022-02-02 15:18:20 +10:00
Ariel Rin	d71a26220c	Merge branch 'v3.x' of https://gitlab.com/allianceauth/allianceauth into django4	2022-02-02 14:24:47 +10:00
Ariel Rin	beeeb8dc5d	Merge branch 'v3.x' of https://gitlab.com/allianceauth/allianceauth into v3.x	2022-02-02 14:17:15 +10:00
Ariel Rin	19244cc4c6	Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into v3.x	2022-02-02 14:16:46 +10:00
Ariel Rin	cc94ba6b5e	ensure latest django patch	2022-02-02 14:16:33 +10:00
Ariel Rin	c9926cc877	Merge tag 'v2.10.0' of https://gitlab.com/allianceauth/allianceauth into django4	2022-02-02 14:15:32 +10:00
Ariel Rin	1d14e1b0af	Merge branch 'rediscache' into 'v3.x' ... Swap the Redis Cache client See merge request allianceauth/allianceauth!1394	2022-02-02 04:12:04 +00:00
Aaron Kable	297da44a5a	Swap the Redis Cache client	2022-02-02 04:12:04 +00:00
Ariel Rin	402ff53a5c	Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into django4	2022-02-02 12:38:24 +10:00
ErikKalkoken	2d6e4a0df1	Merge branch 'master' into fix_character_names	2022-02-01 00:31:25 +01:00
Ariel Rin	f18dd1029b	Version Bump v2.10.0 v2.10.0	2022-01-31 20:58:09 +10:00
Ariel Rin	fd8d43571a	Merge branch 'analytics' into 'master' ... Analytics - Extra Ignore Path See merge request allianceauth/allianceauth!1347	2022-01-31 09:23:43 +00:00
Ariel Rin	13e88492f1	Analytics - Extra Ignore Path	2022-01-31 09:23:43 +00:00
Ariel Rin	38df580a56	Merge branch 'analytics_update' into 'master' ... Add setting to disable analytics See merge request allianceauth/allianceauth!1373	2022-01-27 05:14:12 +00:00
Erik Kalkoken	ba39318313	Add setting to disable analytics	2022-01-27 05:14:11 +00:00
Ariel Rin	d8c6035405	Merge branch 'ts3_reserved_groups' into 'master' ... Implement reserved group names in Teamspeak3 service module. See merge request allianceauth/allianceauth!1380	2022-01-27 05:10:22 +00:00
Ariel Rin	2ef3da916b	Merge branch 'datatablessavestate' into 'master' ... Add DataTables stateSave feature See merge request allianceauth/allianceauth!1374	2022-01-27 05:05:37 +00:00
Ariel Rin	d32d8b26ce	Merge branch 'delete_characters' into 'master' ... Fix: Can not update biomassed characters See merge request allianceauth/allianceauth!1381	2022-01-27 05:02:57 +00:00
Erik Kalkoken	f348b1a34c	Fix: Can not update biomassed characters	2022-01-27 05:02:57 +00:00
Ariel Rin	86aaa3edda	Merge branch 'fix-grafana-image-2' into 'master' ... fix grafana image again, thanks grafana for not tagging your new images properly See merge request allianceauth/allianceauth!1393	2022-01-27 04:57:40 +00:00
Ariel Rin	26017056c7	Merge branch 'evetime-js-update' into 'master' ... Evetime js update See merge request allianceauth/allianceauth!1395	2022-01-27 04:35:15 +00:00
Peter Pfeufer	e39a3c072b	Evetime js update	2022-01-27 04:35:15 +00:00
Kevin McKernan	827291dda4	fix grafana image again, thanks grafana for not tagging your new images properly	2022-01-07 10:48:50 -07:00
ErikKalkoken	defcfa3316	Character names are not unique	2022-01-05 19:47:15 +01:00
ErikKalkoken	3209b71b0a	Fix imports and flake8 issues	2022-01-05 19:28:44 +01:00
Ariel Rin	80b3ca0a1e	Merge branch 'v2.10.x' of https://gitlab.com/allianceauth/allianceauth into django4	2021-12-29 16:35:37 +10:00
Ariel Rin	8351bd2fa3	Forgot to remove a 3.7 test	2021-12-29 16:34:14 +10:00
Ariel Rin	255966ed3b	Secret Detection was split from SAST	2021-12-29 16:32:42 +10:00
Ariel Rin	8d6ebf4770	Merge branch 'v2.10.x' of https://gitlab.com/allianceauth/allianceauth into django4	2021-12-29 15:52:39 +10:00
Ariel Rin	2ca752bf78	Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into django4	2021-12-29 15:52:01 +10:00
Ariel Rin	79e1192f67	Update Pre-Commit	2021-12-29 15:45:33 +10:00
Ariel Rin	ff610efc84	Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into v2.10.x	2021-12-28 21:58:38 +10:00
Ariel Rin	ea8958ccc3	Version Bump v2.9.4 v2.9.4	2021-12-28 21:56:46 +10:00
Ariel Rin	20554df857	Merge branch 'jqueryui' into 'master' ... Missing jQuery-UI Images See merge request allianceauth/allianceauth!1391	2021-12-28 11:55:37 +00:00
Ariel Rin	750f43eaf0	Missing jQuery-UI Images	2021-12-28 11:55:37 +00:00
Ariel Rin	09cf28ec9f	Merge branch 'jqueryui' into 'master' ... Removing Themeing from jQuery UI See merge request allianceauth/allianceauth!1386	2021-12-28 11:30:05 +00:00
Ariel Rin	b61746b3cb	Removing Themeing from jQuery UI	2021-12-28 11:30:05 +00:00