Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-06 15:16:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 23ad9d02d3 Merge branch 'cherry-pick-7fa76d6d' into 'v2.11.x' Ariel Rin 2022-05-12 04:30:07 +00:00
  • f99878cc29 Update .gitlab-ci.yml Ariel Rin 2022-05-12 04:07:43 +00:00
  • e64431b06c Merge branch 'update-gitlab-ci' into 'v3.x' Ariel Rin 2022-05-12 04:00:34 +00:00
  • 0b2993c1c3 Merge branch 'improve_notifications_2' into 'v2.11.x' Ariel Rin 2022-05-12 04:02:17 +00:00
  • 75bccf1b0f Improve notifications Erik Kalkoken 2022-05-12 04:02:17 +00:00
  • 7fa76d6d37 Merge branch 'update-gitlab-ci' into 'v3.x' Ariel Rin 2022-05-12 04:00:34 +00:00
  • 945bc92898 Merge branch 'admin-dash-improvement' into 'v2.11.x' Ariel Rin 2022-05-12 03:57:02 +00:00
  • ec7d14a839 Merge branch 'fix_issue_1222' into 'v2.11.x' Ariel Rin 2022-05-12 03:56:22 +00:00
  • dd1a368ff6 Close security loopholes to make non-superuser admins usable Erik Kalkoken 2022-05-12 03:56:22 +00:00
  • a3cce35881 Update GitLab CI to conform with the changes to artifacts collection Peter Pfeufer 2022-05-11 17:51:43 +02:00
  • 54085617dc Add a few pixels of margin-top to bar labels to better center them. colcrunch 2022-04-16 15:46:01 -04:00
  • 8cdc5af453 Improve celery bar by using decimalized width values (2 decimal places) to reduce likelyhood of an empty portion of the bar. colcrunch 2022-04-16 15:44:53 -04:00
  • da93940e13 Just an empty Tag Commit, because 2.11.2 bump went wonky v2.11.2 Ariel Rin 2022-03-29 14:48:39 +10:00
  • f53b43d9dc Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into v2.11.x Ariel Rin 2022-03-29 14:47:40 +10:00
  • 497a167ca7 Version Bump v2.11.2 Ariel Rin 2022-03-29 14:46:59 +10:00
  • 852c5a3037 Bump Django-ESI to 4.x, inc breaking CCP change in 4.0.1 Ariel Rin 2022-03-29 14:40:30 +10:00
  • 90f6777a7a Version Bump 2.11.1 v2.11.1 Ariel Rin 2022-03-20 14:42:39 +10:00
  • ed4f71a283 Merge branch 'remove-manifest-file' into 'v3.x' Ariel Rin 2022-03-20 04:36:09 +00:00
  • 13e2f4e27d Remove MANIFEST.in, it's redundant the way we use it Peter Pfeufer 2022-03-13 09:42:22 +01:00
  • 17343dfeae Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into v3.x Ariel Rin 2022-03-09 20:57:07 +10:00
  • 4b5978fb58 Merge branch 'version-links' into 'v3.x' Ariel Rin 2022-03-09 10:05:05 +00:00
  • a8d890abaf Merge branch 'improve_task_statistics' into 'master' Ariel Rin 2022-03-09 10:04:14 +00:00
  • 79379b444c Improve task statistics Erik Kalkoken 2022-03-09 10:04:13 +00:00
  • ace1de5c68 Merge branch 'fix-docker-new-redis' into 'master' Ariel Rin 2022-03-09 10:02:01 +00:00
  • 0a30eea3b4 Merge branch 'deprecated-settings' into 'v3.x' Ariel Rin 2022-03-09 09:53:15 +00:00
  • a15d281c40 Merge branch 'switch-to-setup.cfg' into 'v3.x' Ariel Rin 2022-03-09 09:50:40 +00:00
  • 6846bb7cdc Switch to setup.cfg due to deprecation of setup.py Peter Pfeufer 2022-03-09 09:50:40 +00:00
  • 1d240a40dd Remove deprecated settings Peter Pfeufer 2022-03-03 12:06:16 +01:00
  • 5d6128e9ea remove collectstatic command from dockerfile Kevin McKernan 2022-03-01 13:23:49 -07:00
  • c377bcec5f add redis to readthedocs container Ariel Rin 2022-03-01 07:40:15 +00:00
  • 9b74fb4dbd Attempted Docs Fixes Ariel Rin 2022-03-01 03:33:12 +00:00
  • 6744c0c143 Link Latest stable and Latest pre-release versions to their tags on git Peter Pfeufer 2022-02-28 21:19:33 +01:00
  • 131cc5ed0a Version Bump 2.11.0 v2.11.0 Ariel Rin 2022-02-26 17:26:55 +10:00
  • 9297bed43f Version Bump 2.10.2 Ariel Rin 2022-02-26 16:37:20 +10:00
  • b2fddc683a Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into v2.10.x Ariel Rin 2022-02-26 16:32:45 +10:00
  • 1e9f5e6430 Version Bump 3.0.0a1 v3.0.0a1 Ariel Rin 2022-02-26 06:26:36 +00:00
  • ceaa064e62 Merge branch 'usersettings' into 'v3.x' Ariel Rin 2022-02-26 06:19:38 +00:00
  • 1aad3e4512 Persistent User Settings Ariel Rin 2022-02-26 06:19:38 +00:00
  • f83c3c2811 Merge branch 'ErikKalkoken/allianceauth-fix_character_names' into v3.x Ariel Rin 2022-02-26 15:53:46 +10:00
  • a23ec6d318 switch new task module to new redis method Ariel Rin 2022-02-26 15:52:15 +10:00
  • ecc53888bc Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into v3.x Ariel Rin 2022-02-26 15:23:01 +10:00
  • 9af634d16a Merge branch 'fix_show_available_groups_for_user_only' into 'master' Ariel Rin 2022-02-26 05:19:45 +00:00
  • a68163caa3 Fix: Users can be assigned to groups depite not matching state restrictions Erik Kalkoken 2022-02-26 05:19:45 +00:00
  • 00770fd034 Merge branch 'improve_celery_info_on_dashboard' into 'master' Ariel Rin 2022-02-26 05:15:30 +00:00
  • 01164777ed Improve celery infos on Dashboard Erik Kalkoken 2022-02-26 05:15:30 +00:00
  • e54f72091f specific known working dependency commit Ariel Rin 2022-02-26 14:27:00 +10:00
  • 00f5e3e1e0 Version Bump 2.10.1 v2.10.1 Ariel Rin 2022-02-21 00:02:12 +10:00
  • 8b2527f408 Merge branch 'capsleekxmpp' into 'master' Ariel Rin 2022-02-20 13:44:27 +00:00
  • b7500e4e4e Cap sleekxmpp to 1.3.2 Ariel Rin 2022-02-20 13:44:27 +00:00
  • 4f4bd0c419 add note to docker README about Apple M1 support Kevin McKernan 2022-02-02 12:46:34 -07:00
  • 75b5b28804 use Django-ESI 4.0.0a1, instead of Ariels branch Ariel Rin 2022-02-20 23:24:26 +10:00
  • f81a2ed237 Merge branch 'django4' into 'v3.x' Ariel Rin 2022-02-20 13:19:19 +00:00
  • 49e01157e7 dropin replace sleeksmpp with slixmpp, alter test Ariel Rin 2022-02-20 13:19:19 +00:00
  • 28420a729e Merge branch 'html5-fixes' into 'v3.x' Ariel Rin 2022-02-11 02:10:48 +00:00
  • 52a4cf8d52 [FIX] Use proper HTML5 tags instead of self-closing XML/XHTML tags Peter Pfeufer 2022-02-08 20:21:09 +01:00
  • 703c2392a9 Merge branch 'django4' into 'v3.x' Ariel Rin 2022-02-08 13:04:45 +00:00
  • 18c9a66437 Merge branch 'fix-ifequal-errors' into 'django4' Ariel Rin 2022-02-06 07:16:56 +00:00
  • 9687d57de9 Merge branch 'update-url-configs' into 'django4' Ariel Rin 2022-02-06 07:16:46 +00:00
  • 60c2e57d83 Fix ifequal errors Peter Pfeufer 2022-02-02 16:12:43 +01:00
  • b14bff0145 We should do this properly .. Peter Pfeufer 2022-02-02 15:28:36 +01:00
  • 9166886665 That one slipped through the cracks ... Peter Pfeufer 2022-02-02 15:27:07 +01:00
  • c74010d441 Docs updated Peter Pfeufer 2022-02-02 15:25:45 +01:00
  • 640a21e4db Switch to path, use re_path only when really needed Peter Pfeufer 2022-02-02 15:09:48 +01:00
  • 8ae4e02012 Merge branch 'docker-bump-version' into 'v2.10.x' Ariel Rin 2022-02-02 13:26:33 +00:00
  • cc9a07197d Bump version for Docker deployment to v2.10.x. Weyland 2022-02-02 13:30:05 +01:00
  • fd442a5735 django.conf.urls.url is deprecated Ariel Rin 2022-02-02 21:56:01 +10:00
  • c7b99044bc django.conf.urls.url is deprecated, more to fix Ariel Rin 2022-02-02 21:39:37 +10:00
  • 234451a7d4 temporarily use django-esi MR Ariel Rin 2022-02-02 21:37:01 +10:00
  • ffff904ab1 Pull specific commit from git temporarily Ariel Rin 2022-02-02 15:18:20 +10:00
  • d71a26220c Merge branch 'v3.x' of https://gitlab.com/allianceauth/allianceauth into django4 Ariel Rin 2022-02-02 14:24:47 +10:00
  • beeeb8dc5d Merge branch 'v3.x' of https://gitlab.com/allianceauth/allianceauth into v3.x Ariel Rin 2022-02-02 14:17:15 +10:00
  • 19244cc4c6 Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into v3.x Ariel Rin 2022-02-02 14:16:46 +10:00
  • cc94ba6b5e ensure latest django patch Ariel Rin 2022-02-02 14:16:33 +10:00
  • c9926cc877 Merge tag 'v2.10.0' of https://gitlab.com/allianceauth/allianceauth into django4 Ariel Rin 2022-02-02 14:15:32 +10:00
  • 1d14e1b0af Merge branch 'rediscache' into 'v3.x' Ariel Rin 2022-02-02 04:12:04 +00:00
  • 297da44a5a Swap the Redis Cache client Aaron Kable 2022-02-02 04:12:04 +00:00
  • 402ff53a5c Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into django4 Ariel Rin 2022-02-02 12:38:24 +10:00
  • 2d6e4a0df1 Merge branch 'master' into fix_character_names ErikKalkoken 2022-02-01 00:31:25 +01:00
  • f18dd1029b Version Bump v2.10.0 v2.10.0 Ariel Rin 2022-01-31 20:58:09 +10:00
  • fd8d43571a Merge branch 'analytics' into 'master' Ariel Rin 2022-01-31 09:23:43 +00:00
  • 13e88492f1 Analytics - Extra Ignore Path Ariel Rin 2022-01-31 09:23:43 +00:00
  • 38df580a56 Merge branch 'analytics_update' into 'master' Ariel Rin 2022-01-27 05:14:12 +00:00
  • ba39318313 Add setting to disable analytics Erik Kalkoken 2022-01-27 05:14:11 +00:00
  • d8c6035405 Merge branch 'ts3_reserved_groups' into 'master' Ariel Rin 2022-01-27 05:10:22 +00:00
  • 2ef3da916b Merge branch 'datatablessavestate' into 'master' Ariel Rin 2022-01-27 05:05:37 +00:00
  • d32d8b26ce Merge branch 'delete_characters' into 'master' Ariel Rin 2022-01-27 05:02:57 +00:00
  • f348b1a34c Fix: Can not update biomassed characters Erik Kalkoken 2022-01-27 05:02:57 +00:00
  • 86aaa3edda Merge branch 'fix-grafana-image-2' into 'master' Ariel Rin 2022-01-27 04:57:40 +00:00
  • 26017056c7 Merge branch 'evetime-js-update' into 'master' Ariel Rin 2022-01-27 04:35:15 +00:00
  • e39a3c072b Evetime js update Peter Pfeufer 2022-01-27 04:35:15 +00:00
  • 827291dda4 fix grafana image again, thanks grafana for not tagging your new images properly Kevin McKernan 2022-01-07 10:48:50 -07:00
  • defcfa3316 Character names are not unique ErikKalkoken 2022-01-05 19:47:15 +01:00
  • 3209b71b0a Fix imports and flake8 issues ErikKalkoken 2022-01-05 19:28:44 +01:00
  • 80b3ca0a1e Merge branch 'v2.10.x' of https://gitlab.com/allianceauth/allianceauth into django4 Ariel Rin 2021-12-29 16:35:37 +10:00
  • 8351bd2fa3 Forgot to remove a 3.7 test Ariel Rin 2021-12-29 16:34:14 +10:00
  • 255966ed3b Secret Detection was split from SAST Ariel Rin 2021-12-29 16:32:42 +10:00
  • 8d6ebf4770 Merge branch 'v2.10.x' of https://gitlab.com/allianceauth/allianceauth into django4 Ariel Rin 2021-12-29 15:52:39 +10:00
  • 2ca752bf78 Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into django4 Ariel Rin 2021-12-29 15:52:01 +10:00
  • 79e1192f67 Update Pre-Commit Ariel Rin 2021-12-29 15:45:33 +10:00
  • ff610efc84 Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into v2.10.x Ariel Rin 2021-12-28 21:58:38 +10:00