friendica
/
friendica-directory
7
3
Fork 3
Code Issues 22 Pull Requests Releases 17 Wiki Activity

Merge pull request #44 from MrPetovan/release/2.3.0 

Release 2.3.0
This commit is contained in:
Tobias Diekershoff 2020-06-17 19:50:29 +02:00 committed by GitHub
parent d509dfbbfd 9ee72bb382
commit 83aa5152aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 1730 additions and 1893 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/CONTRIBUTING.md vendored
View File

@ -4,7 +4,7 @@
1. Fork the repository
2. Create a new branch for each feature or improvement
3. Send a pull request from each feature branch to the master branch
3. Send a pull request from each feature branch to the stable branch
It is very important to separate new features or improvements into separate feature branches, and to send a
pull request for each branch. This allows us to review and pull in new features or improvements individually.

2
VERSION
View File

@ -1 +1 @@
2.2.1
2.3.0

9
composer.json
View File

@ -24,6 +24,7 @@
"byjg/webrequest": "^1.0",
"gettext/gettext": "^4.6",
"gofabian/negotiation-middleware": "^0.1.3",
"laminas/laminas-escaper": "^2.6",
"masterminds/html5": "^2.3",
"monolog/monolog": "^1.17",
"mrpetovan/net_ping": "^1.0",
@ -31,7 +32,6 @@
"seld/cli-prompt": "^1.0",
"slim/slim": "^3.1",
"slim/php-view": "^2.0",
"zendframework/zend-escaper": "^2.6",
"fxp/composer-asset-plugin": "^1.4",
"bower-asset/bootstrap.native": "^2.0",
"bower-asset/fontawesome": "^5.5"
@ -39,8 +39,8 @@
"require-dev": {
"bower-asset/bootstrap": "^4.1",
"phpunit/phpunit": ">=4.8 < 6.0",
"vimeo/psalm": "^2.0",
"leafo/scssphp": "^0.7.7"
"scssphp/scssphp": "^1.1",
"vimeo/psalm": "^2.0"
},
"autoload": {
"psr-4": {
@ -53,6 +53,9 @@
}
},
"config": {
"platform": {
"php": "7.1.0"
},
"process-timeout" : 0,
"autoloader-suffix": "FriendicaDirectory",
"optimize-autoloader": true,

3602
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
src/classes/Controllers/Web/Servers.php
View File

@ -46,7 +46,7 @@ class Servers extends BaseController
{
$stable_version = $this->simplecache->get('stable_version');
if (!$stable_version) {
$stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/master/VERSION'));
$stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/stable/VERSION'));
$this->simplecache->set('stable_version', $stable_version);
}

2
src/classes/Controllers/Web/Statistics.php
View File

@ -55,7 +55,7 @@ class Statistics extends BaseController
$stable_version = $this->simplecache->get('stable_version');
if (!$stable_version) {
$stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/master/VERSION'));
$stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/stable/VERSION'));
$this->simplecache->set('stable_version', $stable_version);
}

2
src/classes/Pollers/Server.php
View File

@ -355,7 +355,7 @@ class Server
} else {
$stable_version = $this->simplecache->get('stable_version');
if (!$stable_version) {
$stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/master/VERSION'));
$stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/stable/VERSION'));
$this->simplecache->set('stable_version', $stable_version);
}

2
src/dependencies.php
View File

@ -1,6 +1,6 @@
<?php
use Interop\Container\ContainerInterface;
use Psr\Container\ContainerInterface;
// DIC configuration