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

Release 2.3.0 #44

Merged
MrPetovan merged 7 commits from release/2.3.0 into stable 2020-06-17 19:50:30 +02:00
Conversation 6 Commits 7 Files changed 8 +1730 -1893
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);
tobiasd commented 2020-06-17 16:40:10 +02:00 (Migrated from github.com)
Review
Copy link

Should I create a stable branch, branced off from the current master branch, for this to work already or is this only preparation?

Should I create a stable branch, branced off from the current master branch, for this to work already or is this only preparation?
MrPetovan commented 2020-06-17 17:03:34 +02:00 (Migrated from github.com)
Review
Copy link

The stable branch forked from master already exists on my local fork, it just needs to be created on the main repo

The stable branch forked from master already exists on my local fork, it just needs to be created on the main repo
tobiasd commented 2020-06-17 18:09:54 +02:00 (Migrated from github.com)
Review
Copy link

But it should be pushed to the repositories so that the directory can find the information right?

But it should be pushed to the repositories so that the directory can find the information right?
MrPetovan commented 2020-06-17 18:50:51 +02:00 (Migrated from github.com)
Review
Copy link

Yes.

Yes.
MrPetovan commented 2020-06-17 18:51:54 +02:00 (Migrated from github.com)
Review
Copy link

Never mind, it already exists: https://github.com/friendica/friendica-directory/tree/stable

I thought you checked and that I just created it on my own fork.

Never mind, it already exists: https://github.com/friendica/friendica-directory/tree/stable I thought you checked and that I just created it on my own fork.
tobiasd commented 2020-06-17 19:03:32 +02:00 (Migrated from github.com)
Review
Copy link

But the code references the Friendica repository, not the directory repository.

But the code references the Friendica repository, not the directory repository.
MrPetovan commented 2020-06-17 19:20:00 +02:00 (Migrated from github.com)
Review
Copy link

Right, sorry I misread, let me fork it from master. Aaand done.

Right, sorry I misread, let me fork it from master. Aaand done.
}

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