friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
26,737 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

26737 Commits

Author SHA1 Message Date
Tobias Diekershoff 841f461312 some updates for the work over the wekend 2020-03-23 06:56:30 +01:00
Tobias Diekershoff 103769f4c2
Merge pull request #8447 from annando/issue-7771-funkwhale 
Funkwhale support added, Peertube support improved
 2020-03-23 06:44:18 +01:00
Michael Vogel d0a022c1f9
Merge pull request #8446 from MrPetovan/bug/notices 
Skip Contact::getDetailsByURL when url is empty in GContact::searchByName
 2020-03-23 06:04:22 +01:00
Michael 50e0ea5b3e Funkwhale support added, Peertube support improved 2020-03-23 04:43:06 +00:00
Hypolite Petovan 1187742c14 Skip Contact::getDetailsByURL when url is empty in GContact::searchByName 
- Address https://github.com/friendica/friendica/issues/8000#issuecomment-602169147
 2020-03-22 22:46:22 -04:00
Hypolite Petovan 3b3085369c
Merge pull request #8443 from annando/loops 
Prevent endless loops and long running feed processing
 2020-03-22 11:26:13 -04:00
Michael 771fe881ef Use 20 maximum feed items as default 2020-03-22 15:22:48 +00:00
Michael 04eef79be0 Merge remote-tracking branch 'upstream/2020.03-rc' into loops 2020-03-22 15:00:14 +00:00
Michael Vogel 3a2082b840
Merge pull request #8444 from MrPetovan/bug/7134-remove-item-activity-relation 
Remove extraneous relation on item-activity.id
 2020-03-22 15:31:49 +01:00
Hypolite Petovan f2638ca65b Remove extraneous relation on item-content.id 2020-03-22 10:28:13 -04:00
Hypolite Petovan bfa598bb77
Merge pull request #8445 from annando/issue-8371-again 
Issue 8371: Use correct user id for photo upload
 2020-03-22 10:24:51 -04:00
Michael 8bde222fca Issue 8371: Use correct user id for photo upload 2020-03-22 14:07:34 +00:00
Hypolite Petovan f50a39d19d Remove extraneous relation on item-activity.id 2020-03-22 10:04:30 -04:00
Michael b68a16e07a "repair diaspora" fixed some problem long time ago. It is not needed anymore 2020-03-22 13:12:48 +00:00
Michael bc069c8ebf Prevent endless loops and long running feed processing 2020-03-22 13:05:35 +00:00
Tobias Diekershoff 7bc4427c09
Merge pull request #8442 from annando/issue-8371-logging2 
Issue 8371: More enhanced logging
 2020-03-22 14:02:07 +01:00
Michael fc7ac75ba4 Issue 8371: More enhanced logging 2020-03-22 12:51:37 +00:00
Tobias Diekershoff 9f8ca846eb
Merge pull request #8441 from annando/issue-8371-logging 
Issue 8371: Enhanced logging for picture problem
 2020-03-22 11:48:25 +01:00
Michael 505aa95c3d Fixed wrong contact permisssion 2020-03-22 10:05:52 +00:00
Michael f8d20b365f We should use "self" 2020-03-22 09:59:06 +00:00
Michael 2c6c6579af Issue 8371: Enhanced logging for picture problem 2020-03-22 09:57:46 +00:00
Michael Vogel 5d045ccbc4
Merge pull request #8439 from tobiasd/20200322-notifications 
a l10n call too much
 2020-03-22 10:12:12 +01:00
Tobias Diekershoff a16dba2941 a l10n call too much 2020-03-22 08:43:06 +01:00
Hypolite Petovan 7d1e0a72c1
Merge pull request #8435 from annando/issue-8371-a 
Issue 8371: Alternate Solution
 2020-03-21 17:28:13 -04:00
Michael Vogel 70e125dde5
Merge pull request #8437 from tobiasd/20200321-pl 
PL translation update THX waldis
 2020-03-21 20:26:15 +01:00
Tobias Diekershoff b191c437bb PL translation update THX waldis 2020-03-21 20:08:22 +01:00
Michael 6de2b0f6d4 Reworked permission stuff 2020-03-21 18:30:40 +00:00
Michael d04c9b4930 Merge remote-tracking branch 'upstream/2020.03-rc' into issue-8371-a 2020-03-21 18:08:33 +00:00
Michael 4f61af2f5f Issue 8371: Alternate Solution 2020-03-21 16:36:40 +00:00
Hypolite Petovan 1833bee00d
Merge pull request #8434 from tobiasd/20200321-msg 
regen messages.po
 2020-03-21 11:38:10 -04:00
Tobias Diekershoff ec6c338257 regen messages.po 2020-03-21 15:23:42 +01:00
Hypolite Petovan efb90f5a9c
Merge pull request #8433 from annando/issue-8432-translations 
Issue 8432: Make notifications translatable
 2020-03-21 07:54:05 -04:00
Michael 83a9970891 Issue 8432: Make notifications translatable 2020-03-21 11:48:20 +00:00
Hypolite Petovan 3cc90f9503
Merge pull request #8428 from annando/issue-8371 
Issue 8371 again: Fallback for item permissions
 2020-03-20 10:18:58 -04:00
Tobias Diekershoff 6168c8be1d and another one 2020-03-20 09:22:25 +01:00
Tobias Diekershoff b1eb1c9e91 removed a duplicate 2020-03-20 09:21:12 +01:00
Tobias Diekershoff 7d38a45ba3 updated the credits for 2020.03 2020-03-20 09:19:19 +01:00
Michael 2234a095c6 Issue 8371 again: Fallback for item permissions 2020-03-20 04:52:04 +00:00
Hypolite Petovan 6b5e983d9a
Merge pull request #8427 from annando/issue-8371 
Issue 8371: Ensure to always have permissions
 2020-03-19 18:52:29 -04:00
Michael 29bd37cda2 Issue 8371: Ensure to always have permissions 2020-03-19 21:55:31 +00:00
Tobias Diekershoff e567e49df6 First batch of notes for the 2020.03 CHANGELOG 2020-03-18 08:20:18 +01:00
Hypolite Petovan ba33b453ea
Merge pull request #8424 from tobiasd/20200316-ru 
RU translations THX Alexander An
 2020-03-16 10:27:50 -04:00
Tobias Diekershoff 88d0a12a83 RU translations THX Alexander An 2020-03-16 10:21:40 +01:00
Hypolite Petovan aab1320304
Merge pull request #8419 from tobiasd/20200314-de 
DE translation update
 2020-03-14 08:45:37 -04:00
Tobias Diekershoff 730be894c8 DE translation update 2020-03-14 13:07:35 +01:00
Hypolite Petovan 4a5f1735c7
Merge pull request #8418 from tobiasd/20200313-ru 
Issue #8417 RU translation
 2020-03-13 09:52:28 -04:00
Tobias Diekershoff 8e0b91b64d Issue #8417 RU translation 2020-03-13 13:40:25 +01:00
Hypolite Petovan d92b9a79e2
Merge pull request #8413 from annando/fix-warning 
Avoid notice in gcontact.php
 2020-03-12 17:16:59 -04:00
Michael 505cca942b Fix wrong variable name 2020-03-12 18:58:48 +00:00
Michael e1786b6747 Avoid warning in gcontact.php 2020-03-12 17:31:28 +00:00