maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

merge current enhancements from main branch to v2.2 (#1261)

Browse Source
This commit is contained in:
Michael Kaufmann
2024-07-21 10:41:24 +02:00
committed by GitHub
parent b3dc7f9187
commit b888e920f4
21 changed files with 201 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
install/froxlor.sql.php
View File

@@ -730,8 +730,8 @@ opcache.validate_timestamps'),
('panel', 'logo_overridecustom', '0'),
('panel', 'settings_mode', '0'),
('panel', 'menu_collapsed', '1'),
('panel', 'version', '2.2.0-rc1'),
('panel', 'db_version', '202401090');
('panel', 'version', '2.2.0-rc2'),
('panel', 'db_version', '202407200');
DROP TABLE IF EXISTS `panel_tasks`;
@@ -1049,4 +1049,15 @@ CREATE TABLE `panel_loginlinks` (
`allowed_from` text NOT NULL,
UNIQUE KEY `loginname` (`loginname`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
DROP TABLE IF EXISTS `panel_2fa_tokens`;
CREATE TABLE `panel_2fa_tokens` (
`id` int(11) NOT NULL auto_increment,
`selector` varchar(20) NOT NULL,
`token` varchar(200) NOT NULL,
`userid` int(11) NOT NULL default '0',
`valid_until` int(15) NOT NULL,
PRIMARY KEY (id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
FROXLORSQL;