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

Merge branch 'master' into logformat

Browse Source
This commit is contained in:
Patrik Kernstock
2020-01-03 22:32:45 +01:00
committed by GitHub
parent 28fd88e53e dd2782771a
commit b393c7d6e6
6 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
README.md
View File

@@ -53,14 +53,21 @@ https://files.froxlor.org/releases/froxlor-latest.tar.gz [MD5](https://files.fro
[HowTo](https://github.com/Froxlor/Froxlor/wiki/Install-froxlor-on-debian) [HowTo](https://github.com/Froxlor/Froxlor/wiki/Install-froxlor-on-debian)
/etc/apt/sources.list.d/froxlor.list ```
> deb http://debian.froxlor.org {stretch|buster} main apt-get -y install apt-transport-https lsb-release ca-certificates
wget -O - https://deb.froxlor.org/froxlor.gpg | apt-key add -
echo "deb https://deb.froxlor.org/debian $(lsb_release -sc) main" > /etc/apt/sources.list.d/froxlor.list
```
### Gentoo repository ### Ubuntu repository
[HowTo](https://github.com/Froxlor/Froxlor/wiki/Install-froxlor-on-gentoo) [HowTo](https://github.com/Froxlor/Froxlor/wiki/Install-froxlor-on-ubuntu)
https://files.froxlor.org/gentoo/repositories.xml ```
apt-get -y install apt-transport-https lsb-release ca-certificates
wget -O - https://deb.froxlor.org/froxlor.gpg | apt-key add -
echo "deb https://deb.froxlor.org/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/froxlor.list
```
## Contributing ## Contributing

2
composer.json
View File

@@ -46,7 +46,7 @@
"phpmailer/phpmailer": "~6.0", "phpmailer/phpmailer": "~6.0",
"monolog/monolog": "^1.24", "monolog/monolog": "^1.24",
"robthree/twofactorauth": "^1.6", "robthree/twofactorauth": "^1.6",
"algo26-matthias/idna-convert": "^2.1" "froxlor/idna-convert-legacy": "^2.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "8.4.1", "phpunit/phpunit": "8.4.1",

21
composer.lock generated
View File

@@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "5699c65bbdcd2a61a9ced0ac7be84d64", "content-hash": "a7ba15333ffb4a758ea65039b589545b",
"packages": [ "packages": [
{ {
"name": "algo26-matthias/idna-convert", "name": "froxlor/idna-convert-legacy",
"version": "v2.1.0", "version": "v2.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/algo26-matthias/idna-convert.git", "url": "https://github.com/Froxlor/idna-convert-legacy.git",
"reference": "2717d05713454991936bc581d068c6cea0d84e3b" "reference": "09c1db623ba19e1ed8f2f9dabc15eeda9dc713b7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/algo26-matthias/idna-convert/zipball/2717d05713454991936bc581d068c6cea0d84e3b", "url": "https://api.github.com/repos/Froxlor/idna-convert-legacy/zipball/09c1db623ba19e1ed8f2f9dabc15eeda9dc713b7",
"reference": "2717d05713454991936bc581d068c6cea0d84e3b", "reference": "09c1db623ba19e1ed8f2f9dabc15eeda9dc713b7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -43,6 +43,11 @@
"name": "Matthias Sommerfeld", "name": "Matthias Sommerfeld",
"email": "matthias.sommerfeld@algo26.de", "email": "matthias.sommerfeld@algo26.de",
"role": "Developer" "role": "Developer"
},
{
"name": "Michael Kaufmann (d00p)",
"email": "d00p@froxlor.org",
"role": "Developer"
} }
], ],
"description": "A library for encoding and decoding internationalized domain names", "description": "A library for encoding and decoding internationalized domain names",
@@ -52,7 +57,7 @@
"idna", "idna",
"php" "php"
], ],
"time": "2019-03-04T17:07:46+00:00" "time": "2019-12-31T12:16:30+00:00"
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",

2
install/froxlor.sql
View File

@@ -702,7 +702,7 @@ opcache.interned_strings_buffer'),
('panel', 'password_special_char', '!?<>§$%+#=@'), ('panel', 'password_special_char', '!?<>§$%+#=@'),
('panel', 'customer_hide_options', ''), ('panel', 'customer_hide_options', ''),
('panel', 'is_configured', '0'), ('panel', 'is_configured', '0'),
('panel', 'version', '0.10.10'), ('panel', 'version', '0.10.11'),
('panel', 'db_version', '201912312'); ('panel', 'db_version', '201912312');

5
install/updates/froxlor/0.10/update_0.10.inc.php
View File

@@ -538,6 +538,11 @@ if (\Froxlor\Froxlor::isDatabaseVersion('201912310')) {
\Froxlor\Froxlor::updateToDbVersion('201912311'); \Froxlor\Froxlor::updateToDbVersion('201912311');
} }
if (\Froxlor\Froxlor::isFroxlorVersion('0.10.10')) {
showUpdateStep("Updating from 0.10.10 to 0.10.11", false);
\Froxlor\Froxlor::updateToVersion('0.10.11');
}
if (\Froxlor\Froxlor::isDatabaseVersion('201912311')) { if (\Froxlor\Froxlor::isDatabaseVersion('201912311')) {
showUpdateStep("Migrate logfiles_format setting"); showUpdateStep("Migrate logfiles_format setting");
Settings::Set('system.logfiles_format', '"' . Settings::Get('system.logfiles_format') . '"'); Settings::Set('system.logfiles_format', '"' . Settings::Get('system.logfiles_format') . '"');

2
lib/Froxlor/Froxlor.php
View File

@@ -7,7 +7,7 @@ final class Froxlor
{ {
// Main version variable // Main version variable
const VERSION = '0.10.10'; const VERSION = '0.10.11';
// Database version (YYYYMMDDC where C is a daily counter) // Database version (YYYYMMDDC where C is a daily counter)
const DBVERSION = '201912312'; const DBVERSION = '201912312';