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

5487 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurice Preuß (envoyr)
2ec039372d Merge remote-tracking branch 'origin/2.1.x' into feature-backup 2023-06-06 14:41:41 +02:00
Maurice Preuß (envoyr)
0c3ac31231 initial backup feature 
Signed-off-by: Maurice Preuß (envoyr) <envoyr@froxlor.org>
 2023-06-06 14:38:08 +02:00
Michael Kaufmann
03257f04cb more integration of domain deactivated flag 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-06 14:10:07 +02:00
Michael Kaufmann
6e37b55ac6 more integration of domain deactivated flag 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-06 10:23:47 +02:00
Michael Kaufmann
196ef9378a deactivate/reactivate email-accounts for deactivated/reactivated domain; set deactivated-docroot by default to not have deactivated domains point to froxlor login but rather show a message 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-06 10:10:32 +02:00
Michael Kaufmann
9ed45ea7f8 make alpha to dev, version check does not know about 'alpha' 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-06 09:46:31 +02:00
Michael Kaufmann
20755bcead set version in 2.1.x branch to 2.1.0-alpha1 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-06 09:35:12 +02:00
Michael Kaufmann
bde19997ba Merge remote-tracking branch 'origin/main' into 2.1.x 2023-06-06 09:05:59 +02:00
Michael Kaufmann
981d819fd7 display notice if customer has no domains assigned yet to add subdomains; corrected subdomains-usage-check to exclude std-subdomain 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-06 09:05:49 +02:00
Michael Kaufmann
826ae36647 adjust log-levels in API methods 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-05 12:13:38 +02:00
Michael Kaufmann
9ddf24539e remove hidden fields from login/passwd-reset; refs #1102 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-05 12:10:39 +02:00
Michael Kaufmann
c079047180 Merge remote-tracking branch 'origin/main' into 2.1.x 2023-06-05 09:05:13 +02:00
Michael Kaufmann
e1e7bc7b42 set fastcgi_ipcdir according to webserver after installation (regardless of using phpfpm) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-05 09:01:41 +02:00
Grigory Morozov
3940c1429d Correcting Nginx location match, fixes #1153 2023-06-05 08:06:44 +02:00
Michael Kaufmann
c236d9eaab set version to 2.0.20 for upcoming release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.0.20 		2023-06-02 20:13:36 +02:00
Michael Kaufmann
512a544dd1 Merge remote-tracking branch 'origin/main' into 2.1.x 2023-05-29 20:53:17 +02:00
Michael Kaufmann
688994e40c idna encode umlaut-emailaddresses when adding email-forwarder 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-29 20:52:57 +02:00
Michael Kaufmann
0fb338b32d Merge remote-tracking branch 'origin/main' into 2.1.x 2023-05-28 15:49:58 +02:00
Michael Kaufmann
9facaee809 re-enable fcgid/php-fpm activation-validate-check 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-28 15:49:06 +02:00
Michael Kaufmann
e90dae186b Merge remote-tracking branch 'origin/main' into 2.1.x 2023-05-28 10:48:30 +02:00
Michael Kaufmann
a7dd5f4685 show 0 value of resource-fields if value is empty, fixes #1149 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-28 10:46:28 +02:00
Michael Kaufmann
ca5f36d912 corrected language index in system-settings, fixes #1145 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-26 21:24:08 +02:00
Michael Kaufmann
63d81201de fix typo 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-26 14:02:09 +02:00
Michael Kaufmann
0b685d569f start to integrate domain-deactivated flag in UI 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-26 13:58:41 +02:00
Michael Kaufmann
426f204473 specify default search-field for on-page listing-search/filter 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-26 13:15:01 +02:00
Michael Kaufmann
84599011cf Allow editing/viewing of standard subdomain for customer, fixes #1121 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-26 12:53:27 +02:00
Michael Kaufmann
6202e24b77 Merge remote-tracking branch 'origin/domain-duplicate' into 2.1.x 2023-05-25 12:35:10 +02:00
Michael Kaufmann
8deaf6a013 frontend implementation of Domains.duplicate() 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-25 12:33:43 +02:00
Michael Kaufmann
a491667ce5 Merge remote-tracking branch 'origin/main' into 2.1.x 2023-05-25 09:54:34 +02:00
Michael Kaufmann
da810ea953 secure filename of local-archive in webupdate 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-25 09:51:55 +02:00
Michael Kaufmann
d51556f918 Merge remote-tracking branch 'origin/main' into 2.1.x 2023-05-25 08:27:39 +02:00
Michael Kaufmann
51b6e067e8 idna encode umlaut-emailaddresses when adding/editing email-account; use correct password-suggestion-layout in change-email-account formfield 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-25 08:26:39 +02:00
Michael Kaufmann
233bf27afe add Froxlor.generateLoginLink() API call to allow generation of one-time-login links for customers, thx to INWX for supporting and sponsoring this feature 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-24 16:02:07 +02:00
Michael Kaufmann
09b3c1c45a implement Domains.duplicate() API call, refs #807 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-24 09:05:50 +02:00
Michael Kaufmann
2e6b939ec6 set dbversion 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-23 15:21:25 +02:00
Michael Kaufmann
c1f03c1683 remove 'main but subdomain' as we now automatically create the correct order of vhost configs and dns zones 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-23 14:36:45 +02:00
Maurice Preuß (envoyr)
5731f5ffff add pgp public key encryption for backup 
Signed-off-by: Maurice Preuß (envoyr) <envoyr@froxlor.org>
 2023-05-21 20:51:18 +02:00
Michael Kaufmann
34cf6698bc remove superfluous try_files in nginx config if php-backend (non-fastcgi) is used 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-15 20:14:26 +02:00
Michael Kaufmann
4642160724 add same loginfail restrictions for entering 2fa code as for user/pwd login 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-12 10:36:27 +02:00
Nicolas Thumann
78a259ef3b Fix IPv6 address in cookie domain (#1137) 
* Implement getCookieHost to extract cookie host from HTTP_HOST
 2023-05-10 08:26:08 +02:00
Nicolas Thumann
68cf4ab69a Fix typo in English privileged_passwd (#1136) 2023-05-09 18:52:43 +02:00
Michael Kaufmann
d5661d492d set version to 2.0.19 for bugfix release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.0.19 		2023-05-07 11:07:31 +02:00
Michael Kaufmann
6900898ae1 typo in updater 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-07 11:03:21 +02:00
Michael Kaufmann
d90fb7fa68 fix mysql-pdo check on installation, set version to 2.0.18 for bugfix release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.0.18 		2023-05-07 10:54:47 +02:00
Michael Kaufmann
4ea8629fcc set version to 2.0.17 for bugfix release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.0.17 		2023-05-06 22:08:43 +02:00
Michael Kaufmann
9d4ff8698d fix ratelimiting when settings do not exist (yet) 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-06 22:00:19 +02:00
Michael Kaufmann
b164038846 set version to 2.0.16 for upcoming maintenance release 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
2.0.16 		2023-05-05 21:10:01 +02:00
Michael Kaufmann
5c46960734 fix language mixup for rate-limit-interval setting 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-05 13:21:12 +02:00
Michael Kaufmann
a7f4f0c737 output nicer message when hitting rate limit 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-04 10:55:34 +02:00
Michael Kaufmann
b64dd501dd fix missing use-statement 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-05-02 10:27:28 +02:00