Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-09 08:36:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,439 Commits 8 Branches 131 Tags
71c9faaf28b76082ae4df0e4c58345374e731cba
Commit Graph

165 Commits

Author SHA1 Message Date
Ariel Rin
236c70316c Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into v3.x 2022-07-07 18:07:49 +10:00
Ariel Rin
0d0686f58a Merge branch 'allianceauth-prefix-static-files-directory' into v3.x 2022-07-07 18:01:12 +10:00
Erik Kalkoken
8dec242a93 Ensure backwards compatibility when fetching a redis client 2022-07-07 07:37:21 +00:00
Peter Pfeufer
0851a6d085 [Cleanup] Removed {% load static %} when no static files are loaded 2022-06-25 13:51:10 +02:00
Peter Pfeufer
cbdce18633 Use regex to determine the SMF version (thanks @colcrunch) 2022-06-24 23:01:16 +02:00
Peter Pfeufer
a0d14eb1d3 SQL queries need to be different depending on SMF version 
It's not a work of art, but it does the job. If anyone has a better idea, hit the comments ...
 2022-06-24 22:40:04 +02:00
Peter Pfeufer
53ce4d2453 f-strings in log messages 
Easier to read and modernized the code
 2022-06-24 21:09:32 +02:00
Peter Pfeufer
1ddb041d6d Add Exception messages to exception logging 2022-06-24 21:00:54 +02:00
Peter Pfeufer
43cbfd1c47 Stop usage of deprecated logger functions 2022-06-24 20:57:58 +02:00
Peter Pfeufer
b9a8495a43 Add exception message to log output 2022-06-24 20:56:38 +02:00
Peter Pfeufer
e296477880 Use pwhash instead of passwd 
This way we ensure that the initial password actually works and the user doesn't have to set a new one right away.
 2022-06-24 20:55:04 +02:00
Peter Pfeufer
bd5c2d8cbc Removed non existent table columns from SQL query 2022-06-24 20:54:05 +02:00
Peter Pfeufer
4c416b03b1 Override abstract and explicitly set related_name for MumbleUser 2022-06-06 10:56:42 +00:00
Peter Pfeufer
1d240a40dd Remove deprecated settings 
Examples:

RemovedInDjango50Warning: The USE_L10N setting is deprecated. Starting with Django 5.0, localized formatting of data will always be enabled. For example Django will display numbers and dates using the format of the current locale.
  warnings.warn(USE_L10N_DEPRECATED_MSG, RemovedInDjango50Warning)

RemovedInDjango41Warning: 'allianceauth' defines default_app_config = 'allianceauth.apps.AllianceAuthConfig'. Django now detects this configuration automatically. You can remove default_app_config.
  app_config = AppConfig.create(entry)
 2022-03-03 12:06:16 +01:00
Ariel Rin
49e01157e7 dropin replace sleeksmpp with slixmpp, alter test 2022-02-20 13:19:19 +00:00
Peter Pfeufer
52a4cf8d52 [FIX] Use proper HTML5 tags instead of self-closing XML/XHTML tags 2022-02-08 20:22:53 +01: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
Peter Pfeufer
60c2e57d83 Fix ifequal errors 2022-02-02 16:12:43 +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
fd442a5735 django.conf.urls.url is deprecated 2022-02-02 21:56:01 +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
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
Ariel Rin
909bd0ba15 Fix deprecations removed in dj4 2021-12-24 17:42:53 +10:00
Adarnof
6688f73565 Use integer teamspeak group IDs when filtering. 2021-12-15 23:54:53 -05:00
Adarnof
72740b9e4d Prevent assignment of reserved groups to AuthTSgroup mappings. 
Implemented in TS group updates to prevent their creation / delete once
reserved, and the admin site for when a reserved group name is created
but before the TS group sync occurs.
 2021-12-08 23:41:10 -05:00
Adarnof
d11832913d Implement reserved group names in Teamspeak3 service module. 
Closes #1302
 2021-12-01 00:50:29 -05:00
Erik Kalkoken
4c0683c484 Add blacklist for groups and ignore blacklisted roles in Discord service 2021-11-28 14:48:49 +00:00
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
4aae85a70f Transifex 2021-10-26 08:45:37 +00:00
Peter Pfeufer
cdcf65cb52 fixed old Django 2 translation template tags 2021-10-19 12:05:45 +02: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
7a4aa05c39 Merge commit '8486b95917a48d760bb6ba05795a40c19a2440d0' into v2.9.x 2021-10-17 19:11:09 +10:00
Crashtec
8486b95917 Add override to delete the user from discord itself 2021-10-10 15:19:46 -04: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
96300a012a Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into v2.9.x 2021-06-29 14:01:52 +10:00
Aaron Kable
1d5f2634f1 Update member when they are already in Discord server. 2021-06-29 03:10:23 +00: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
Erik Kalkoken
e4b515c1d5 Add button to update TS3 groups to admin page 2021-06-01 11:38:24 +00:00
Peter Pfeufer
e6a4cea4de editorconfig applied 2021-05-17 11:42:28 +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
192d286cf2 Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into v2.9.x 2021-05-13 21:38:22 +10:00
Peter Pfeufer
3630812b92 revert migrations & set DEFAULT_AUTO_FIELD to django.db.models.AutoField 2021-05-10 13:35:40 +02:00