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

5511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kaufmann
94d9c3eedf regenerate session-id after login / su-action 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-11 12:05:33 +02:00
Michael Kaufmann
f9f1048477 corrected Backups.listingCount() for admins/reseller/customers accordingly to listing(); minor fixes 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-08 17:30:12 +02:00
Michael Kaufmann
a2fca3fe69 Merge branch '2.1.x' of github.com:Froxlor/Froxlor into 2.1.x 2023-06-08 17:18:24 +02:00
Maurice Preuß (envoyr)
105213fd3f update backup cron 
Signed-off-by: Maurice Preuß (envoyr) <envoyr@froxlor.org>
 2023-06-08 17:17:25 +02:00
Michael Kaufmann
07f4491db6 Merge remote-tracking branch 'origin/main' into 2.1.x 2023-06-08 12:34:29 +02:00
Michael Kaufmann
e0fa64f897 fix update-check unit-tests now that the current testing version is at 2.1.0-dev1 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-08 12:33:48 +02:00
Michael Kaufmann
ed72fd1766 exclude password fields from being filtered/escaped by AntiXSS, fixes #1150 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-08 12:14:13 +02:00
Michael Kaufmann
8a30bc07f5 exclude password fields from being filtered/escaped by AntiXSS, fixes #1150 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-08 12:13:24 +02:00
Michael Kaufmann
ddcd55a83d more work on backup-storages 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-08 11:56:58 +02:00
Maurice Preuß (envoyr)
c3205d3672 update backup storage api 
Signed-off-by: Maurice Preuß (envoyr) <envoyr@froxlor.org>
 2023-06-07 21:22:04 +02:00
Michael Kaufmann
c668c180d5 fix access_backup*s* paramter name 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-07 21:14:01 +02:00
Michael Kaufmann
1cf5865bba minor fixes in customer-backup-flags integration 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-07 21:08:04 +02:00
Michael Kaufmann
6f5e49de79 integrate backup/access_backup fields into Customers 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-07 20:57:58 +02:00
Maurice Preuß (envoyr)
a9c613e71c update backups 
Signed-off-by: Maurice Preuß (envoyr) <envoyr@froxlor.org>
 2023-06-07 20:51:53 +02:00
Michael Kaufmann
981d7f3d9a dblayout enhancements for backup-feature; added preconfig and updates for 2.1.x 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-07 17:58:29 +02:00
Michael Kaufmann
3445472049 combine change-password, change-theme and change-language into 'my profile' 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-07 16:18:05 +02:00
Michael Kaufmann
bfc816a51e add php-configuration to domain-listing, fixes #1141; move backup-menu to 'System' instead of 'Resources' 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-07 15:08:36 +02:00
Michael Kaufmann
5afe5a8c46 minor bugfixes for data export / UI 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-07 11:49:57 +02:00
Michael Kaufmann
eb9dded947 forgot to save one parameter change in the unit-test 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-07 11:40:42 +02:00
Michael Kaufmann
e958cfed84 big renaming of CustomerBackup to DataDump / export for the real backup-feature to shine :P 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-07 11:37:00 +02:00
Michael Kaufmann
5181602921 fix cronjobs test 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-06 17:51:07 +02:00
Michael Kaufmann
4bfed71ac9 fix install sql 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-06 17:47:59 +02:00
Michael Kaufmann
69c58d21be correctly fork export cron action with new Forkable-trait 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
 2023-06-06 17:45:14 +02:00
Maurice Preuß (envoyr)
94051dc9eb add backup settings and update cron fork 
Signed-off-by: Maurice Preuß (envoyr) <envoyr@froxlor.org>
 2023-06-06 17:30:12 +02:00
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