maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity
5,837 Commits 6 Branches 188 Tags
2.2.2
Commit Graph

5837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann
8c48c5a840 Merge remote-tracking branch 'origin/main' into v2.2 2.2.2 2024-10-09 10:57:40 +02:00
Michael Kaufmann
4f4abada6f set version to 2.2.2 for upcoming release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-10-09 10:55:31 +02:00
Michael Kaufmann
289d59f531 Merge remote-tracking branch 'origin/main' into v2.2 2024-10-07 14:40:26 +02:00
Lukas Bableck
f652017c1a fix APCu memory usage (#1284) 2024-10-07 14:39:56 +02:00
Michael Kaufmann
2a50eb43b3 Merge remote-tracking branch 'origin/main' into v2.2 2024-10-02 15:40:42 +02:00
Michael Kaufmann
f31c032508 add possibility to ask for potential update question in CLI updater and also pass them as options to override them; check whether mysql-user exists prior to DROP USER for mysql < 5.7 (as it is missing IF EXISTS options) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-10-02 15:27:42 +02:00
Lukas Bableck
228eb244fa Fix incorrect width of APCu Hit/Miss bar (#1283) 2024-10-01 15:57:00 +02:00
Michael Kaufmann
143d8d42b3 Merge remote-tracking branch 'origin/main' into v2.2 2024-09-28 14:51:55 +02:00
Michael Kaufmann
4ce739667d add rewrite-subject flag to email-edit form; hide spam-related settings if 'bypass_spam' is activated; add possibility to disable rejection of spam-mails, refs #1282 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-09-28 14:49:32 +02:00
Michael Kaufmann
eb3568fca2 Merge remote-tracking branch 'origin/main' into v2.2 2024-09-27 09:10:18 +02:00
dependabot[bot]
dda4c7a846 Bump rollup from 3.29.4 to 3.29.5 (#1280) 
Bumps [rollup](https://github.com/rollup/rollup) from 3.29.4 to 3.29.5.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v3.29.4...v3.29.5)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-09-27 09:05:37 +02:00
Michael Kaufmann
53b7c501bc Merge remote-tracking branch 'origin/main' into v2.2 2024-09-27 09:04:29 +02:00
Michael Kaufmann
c9e15bf897 do not issue let's encrypt for email_only domains (in case they were web-enabled prior, we do not unset former settings to ease reverting back when disabling email_only) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-09-27 09:04:01 +02:00
Michael Kaufmann
140c6c9549 store IDN email-usernames in ACE, as dovecot/postfix need them this way 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-09-26 09:22:11 +02:00
Michael Kaufmann
ddc439d32f Merge remote-tracking branch 'origin/main' into v2.2 2024-09-18 09:24:47 +02:00
Michael Kaufmann
40aa48a6d4 exchange toggler-links with checkboxes in email edit form to be able to adjust all parameters at once, fixes #1277 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-09-18 09:10:29 +02:00
Michael Kaufmann
c69b38bc42 [config-services] add validation for empty or non-existing configuration template xml files; [php-fpm] remove 'date.timezone' from php_admin_values (superfluous as it is in php_values); [antispam] set rewrite_subject to a slighty higher score then used for add_header, fixes #1275 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-09-10 14:11:26 +02:00
Michael Kaufmann
1fd8b88ed8 fix language replacement and fix 'sending messages' after successfully sending prior, thx to Davidd 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-09-01 13:49:27 +02:00
Michael Kaufmann
0318223fec Merge remote-tracking branch 'origin/main' into v2.2 2024-08-31 16:47:55 +02:00
Michael Kaufmann
53c414be6d fix timestamp matching regex, add lmtp to receving service regex and skip lines not including the main target service name in maillog parser 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-31 08:42:09 +02:00
Michael Kaufmann
2f7a2a32ba do not overwrite needed userinfo to avoid successful login when using email 2fa 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-31 08:41:59 +02:00
Michael Kaufmann
16d77a03cb fix timestamp matching regex, add lmtp to receving service regex and skip lines not including the main target service name in maillog parser 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-31 08:41:09 +02:00
Michael Kaufmann
05ca08c5c3 do not overwrite needed userinfo to avoid successful login when using email 2fa 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-30 16:26:55 +02:00
Michael Kaufmann
d3ec02f258 set version to 2.2.1 for upcoming release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.2.1 		2024-08-30 10:10:11 +02:00
Michael Kaufmann
4ea7e10304 set version to 2.2.1 for upcoming release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-30 10:06:26 +02:00
Michael Kaufmann
f31ee2e360 add condition to the remember-me checkbox for updaters when the token-table does not exist yet 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-29 08:21:25 +02:00
Michael Kaufmann
57206b2f72 dont generate dhparam file as fallback but use defined FFDHE4096 group; fixes #1270 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-29 08:21:16 +02:00
Florian Moker
73906f252b Fix missing proftpd-mod-wrap installation (#1272) 
Missing Package Installation on Ubuntu Noble 24.04 - proftpd-mod-wrap, fixes #1271
 2024-08-29 08:21:10 +02:00
Michael Kaufmann
3367f6dbd8 add condition to the remember-me checkbox for updaters when the token-table does not exist yet 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-29 08:19:45 +02:00
Michael Kaufmann
197eb7954a dont generate dhparam file as fallback but use defined FFDHE4096 group; fixes #1270 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-29 08:17:54 +02:00
Florian Moker
a1b6125c14 Fix missing proftpd-mod-wrap installation (#1272) 
Missing Package Installation on Ubuntu Noble 24.04 - proftpd-mod-wrap, fixes #1271
 2024-08-29 08:10:59 +02:00
Michael Kaufmann
7206f5fee2 show antispam options for email-editing only if enabled 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-24 20:18:38 +02:00
Michael Kaufmann
d18a9c9d87 show antispam options for email-editing only if enabled 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-24 19:08:24 +02:00
Michael Kaufmann
94046ae6c7 fix storing multiple-choice-select values, thx to 21MILEX on Discord, fixes #1269 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-24 13:03:47 +02:00
Michael Kaufmann
55212607e0 fix storing multiple-choice-select values, thx to 21MILEX on Discord, fixes #1269 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-24 10:23:54 +02:00
Lukas Bableck
bacc6fe073 Add |raw to h5 in formfields template (#1268) 2024-08-23 11:04:30 +02:00
Lukas Bableck
e6bfe205c5 Add |raw to h5 in formfields template (#1268) 2024-08-23 11:03:33 +02:00
Michael Kaufmann
596075d141 set version to 2.2.0 for upcoming release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.2.0 		2024-08-23 09:22:35 +02:00
Michael Kaufmann
15d3dd4234 set version to 2.2.0 for upcoming release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-23 09:21:54 +02:00
Michael Kaufmann
a58a5fd972 correctly get target filename for jqSpeciallogfileNote action call via ajax, fixes #1267 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-16 09:22:46 +02:00
Michael Kaufmann
54cda098c1 correctly get target filename for jqSpeciallogfileNote action call via ajax, fixes #1267 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-15 20:11:28 +02:00
Michael Kaufmann
bcbfcb34e8 fix typo in varchar length of selector field of new panel_2fa_tokens table, thx to Davidd 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-14 20:26:18 +02:00
Michael Kaufmann
19995f4345 fix typo in varchar length of selector field of new panel_2fa_tokens table, thx to Davidd 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-14 20:24:24 +02:00
Michael Kaufmann
56d8a565b4 Merge remote-tracking branch 'origin/main' into v2.2 2024-08-14 12:39:03 +02:00
dependabot[bot]
a60c21218c Bump axios from 1.6.0 to 1.7.4 (#1266) 
Bumps [axios](https://github.com/axios/axios) from 1.6.0 to 1.7.4.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.6.0...v1.7.4)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-08-14 12:38:33 +02:00
Michael Kaufmann
cd2a08e731 Merge remote-tracking branch 'origin/main' into v2.2 2024-08-14 12:29:27 +02:00
Michael Kaufmann
5d2ce4ecfb allow 60sec discrepancy for email based 2fa; fix dbms version compare issue when removing user; adjust pure-ftpd mysql.conf file permissions 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-12 18:37:38 +02:00
rex2630
869b01204a Add new missing strings + fix typo (#1264) 2024-08-11 21:45:11 +02:00
Michael Kaufmann
d357bded60 Merge remote-tracking branch 'origin/main' into v2.2 2.2.0-rc3 2024-08-08 09:28:05 +02:00
Michael Kaufmann
292741516a set version to 2.2.0-rc3 for upcoming release-candidate 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2024-08-08 09:25:02 +02:00