friendica
/
friendica-directory
7
3
Fork 3
Code Issues 22 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
MrPetovan commented 2020-06-15 15:23:47 +02:00 (Migrated from github.com)
Copy Link

Thanks @tobiasd for the translation update!

Thanks @tobiasd for the translation update!
tobiasd commented 2020-06-17 12:34:33 +02:00 (Migrated from github.com)
Copy Link

You have this already in production and it is working well?

You have this already in production and it is working well?
MrPetovan commented 2020-06-17 15:26:18 +02:00 (Migrated from github.com)
Copy Link

Thanks for the reminder, I took every step but the last (running composer install) on https://dir.friendica.mrpetovan.com and I found a bug related to the move from container-interop/container-interop to psr/container.

Thanks for the reminder, I took every step but the last (running `composer install`) on https://dir.friendica.mrpetovan.com and I found a bug related to the move from `container-interop/container-interop` to `psr/container`.
👍 1
tobiasd commented 2020-06-17 15:30:52 +02:00 (Migrated from github.com)
Copy Link

So, it is working now as expected?

So, it is working now as expected?
MrPetovan commented 2020-06-17 15:33:10 +02:00 (Migrated from github.com)
Copy Link

Now, yes.

Now, yes.
tobiasd (Migrated from github.com) reviewed 2020-06-17 16:40:10 +02:00
src/classes/Controllers/Web/Servers.php
@ -48,3 +48,3 @@
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 (Migrated from github.com) commented 2020-06-17 16:40:10 +02:00
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 (Migrated from github.com) reviewed 2020-06-17 17:03:34 +02:00
src/classes/Controllers/Web/Servers.php
@ -48,3 +48,3 @@
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);
MrPetovan (Migrated from github.com) commented 2020-06-17 17:03:34 +02:00
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 (Migrated from github.com) reviewed 2020-06-17 18:09:54 +02:00
src/classes/Controllers/Web/Servers.php
@ -48,3 +48,3 @@
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 (Migrated from github.com) commented 2020-06-17 18:09:54 +02:00
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 (Migrated from github.com) reviewed 2020-06-17 18:50:51 +02:00
src/classes/Controllers/Web/Servers.php
@ -48,3 +48,3 @@
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);
MrPetovan (Migrated from github.com) commented 2020-06-17 18:50:51 +02:00
Copy Link

Yes.

Yes.
MrPetovan (Migrated from github.com) reviewed 2020-06-17 18:51:54 +02:00
src/classes/Controllers/Web/Servers.php
@ -48,3 +48,3 @@
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);
MrPetovan (Migrated from github.com) commented 2020-06-17 18:51:54 +02:00
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 (Migrated from github.com) reviewed 2020-06-17 19:03:32 +02:00
src/classes/Controllers/Web/Servers.php
@ -48,3 +48,3 @@
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 (Migrated from github.com) commented 2020-06-17 19:03:32 +02:00
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 (Migrated from github.com) reviewed 2020-06-17 19:20:01 +02:00
src/classes/Controllers/Web/Servers.php
@ -48,3 +48,3 @@
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);
MrPetovan (Migrated from github.com) commented 2020-06-17 19:20:00 +02:00
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.
AlfredSK commented 2020-06-17 20:37:54 +02:00 (Migrated from github.com)
Copy Link

So... to run the released version I need to git-checkout the stable branch, right?

So... to run the released version I need to git-checkout the stable branch, right?
MrPetovan commented 2020-06-17 21:09:47 +02:00 (Migrated from github.com)
Copy Link

Yes, although I'll bring master to the same release commit one last time.

Yes, although I'll bring `master` to the same release commit one last time.
👍 1
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something isn't working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature or request

  
good first issue

Good for newcomers

  
help wanted

Extra attention is needed

  
invalid

This doesn't seem right

  
question

Further information is requested

  
wontfix

This will not be worked on

No Label
bug
duplicate
enhancement
good first issue
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: friendica/friendica-directory#44
No description provided.
Delete Branch "release/2.3.0"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?