friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-18 13:46:43 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity
33258 commits 2 branches 63 tags 241 MiB
Commit graph

33258 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael 7959bc1e63 Updated messages.po 2022-03-20 20:21:35 +00:00
Michael 4dace46159 Fix link to post in notification 2022-03-20 19:59:35 +00:00
Tobias Diekershoff 09e55c15e4
Merge pull request #11363 from annando/api-route 
API: Adds missing route for "conversation/show/id"
 2022-03-20 13:37:14 +01:00
Michael 85fce09b1a API: Adds missing route for "conversation/show/id" 2022-03-20 12:06:39 +00:00
Philipp 75a7ff9b11
Merge pull request #11362 from tobiasd/20220320-de 
DE translation updates
 2022-03-20 08:32:22 +01:00
Tobias Diekershoff f66020e767
DE translation updates 2022-03-20 07:53:31 +01:00
Hypolite Petovan e738428876
Merge pull request #11360 from annando/announce-notification 
Don't create empty announce notifications
 2022-03-19 14:53:34 -04:00
Michael e4a5094c90 Don't show double introductions 2022-03-19 18:38:59 +00:00
Michael 91905bea89 Don't create empty announce notifications 2022-03-19 17:53:41 +00:00
Hypolite Petovan 014c7b5943
Merge pull request #11359 from annando/notification 
Avoid empty notifications / fixed link to the content
 2022-03-19 11:31:46 -04:00
Michael Vogel fcad961e57
Merge pull request #11358 from tobiasd/20220319-ru 
RU translations THX Alexander An
 2022-03-19 16:30:34 +01:00
Michael fb6a435a6a Avoid empty notifications / fixed link to the content 2022-03-19 15:25:00 +00:00
Tobias Diekershoff 111d42ce8f
RU translations THX Alexander An 2022-03-19 16:07:50 +01:00
Hypolite Petovan a4a24e06a5
Merge pull request #11357 from annando/fetch-usage 
Improve the description of the federation statistics
 2022-03-19 10:46:29 -04:00
Michael f9369141a4 Updated messages.po 2022-03-19 11:26:49 +00:00
Michael 351e9a307c Fixed placeholder 2022-03-19 11:24:09 +00:00
Michael 3f15a20e4a Updated messages.po 2022-03-19 11:21:51 +00:00
Michael 4e45987f74 Merge remote-tracking branch 'upstream/develop' into fetch-usage 2022-03-19 11:21:38 +00:00
Hypolite Petovan 4329f5381b
Merge pull request #11355 from annando/notifications 
Fixes for the notifications
 2022-03-19 06:52:04 -04:00
Michael Vogel 677cbf8aea
Merge pull request #11354 from MrPetovan/bug/notices 
Check array key existence in ActivityPub\Transmitter::createPermissionBlockForItem
 2022-03-19 10:56:25 +01:00
Michael aef9cb9992 Moved "ignore" check to a better location 2022-03-19 09:48:50 +00:00
Michael 1fe756b5b6 Fixes for the notifications 2022-03-19 09:27:49 +00:00
Hypolite Petovan 9eb6299f19 Check array key existence in ActivityPub\Transmitter::createPermissionBlockForItem 
- APContact::getByURL can return empty array
- Address https://github.com/friendica/friendica/issues/11218#issuecomment-1066753232
 2022-03-19 03:15:08 -04:00
Hypolite Petovan 61e023d448
Merge pull request #11334 from annando/guid-style 
Use a nicer GUID style format
 2022-03-18 07:30:34 -04:00
Michael 0aa229489f Improved function description 2022-03-18 07:24:45 -04:00
Michael 040abc7743 Use a nicer GUID style format 2022-03-18 07:24:44 -04:00
Michael Vogel 5c3226d88e
Merge pull request #11352 from MrPetovan/task/4639-soapbox-intro-notification 
Add support for notification visibility settings
 2022-03-17 06:33:10 +01:00
Hypolite Petovan 04ac4841f9 Add support for notification visibility settings 2022-03-16 22:03:26 -04:00
Hypolite Petovan 6818c8e69a
Merge pull request #11347 from annando/post-update 
Fix the problem that the post update never stopped on larger systems
 2022-03-16 22:02:37 -04:00
Michael 0b10806ce3 Fix the problem that the post update never stopped on larger systems 2022-03-16 22:00:34 -04:00
Hypolite Petovan 2703fd50fc
Merge pull request #11351 from tobiasd/20220316-11350 
.htaccess-dist deny access to some backup files
 2022-03-16 14:56:18 -04:00
Tobias Diekershoff 77cb9405be
only deny files ending in ~ 2022-03-16 19:54:43 +01:00
Tobias Diekershoff cd7b9177ea
.htaccess-dist deny access to some backup files 
this PR adds a filematch block to the distributed .htaccess file to deny access to backup files from emacs (~), vim (.swp) and other backup files (.bak).

addressing #11350
 2022-03-16 19:35:59 +01:00
Michael Vogel f5bcc4ad4b
Merge pull request #11346 from MrPetovan/bug/11343-memcached-bad-key 
Suppress a couple MemcachedException
 2022-03-16 15:19:40 +01:00
Michael Vogel 72c31c060d
Merge pull request #11349 from tobiasd/20220316-de 
DE translation updates
 2022-03-16 09:29:44 +01:00
Tobias Diekershoff 69dc90ffd1
DE translation updates 2022-03-16 07:34:29 +01:00
Michael Vogel ef8dce89b6
Merge pull request #11348 from tobiasd/20220316-typo 
fixing a typo
 2022-03-16 06:42:52 +01:00
Tobias Diekershoff 8d3bef8e63
regen messages.po 2022-03-16 06:27:23 +01:00
Tobias Diekershoff 8d64cf4f9b
typo 2022-03-16 06:25:21 +01:00
Hypolite Petovan 7b9e62198e Suppress a couple MemcachedException 
- Replace URL by uri-id in apcontact
- Replace date with a space and nurl by nick and Zulu time in mod/poco
 2022-03-15 10:54:00 -04:00
Tobias Diekershoff 79772214ad
Merge pull request #11342 from MrPetovan/task/4639-soapbox-intro-notification 
Add correct ordering for detailed notifications
 2022-03-15 12:28:24 +01:00
Hypolite Petovan a07f840c74 Add correct ordering for detailed notifications 2022-03-15 07:05:59 -04:00
Michael Vogel a30b553c28
Merge pull request #11341 from tobiasd/20220315-getcontactstoupdate 
PHP deprecation warning due wrong order of function parameters
 2022-03-15 09:06:43 +01:00
Tobias Diekershoff 02b6ac3ed3
limit parameter was missing from docblock 2022-03-15 08:46:26 +01:00
Tobias Diekershoff 12038d45d0
PHP deprecation warning due wrong order of function parameters 
With PHP 8.0 I got the following PHP Deprecation message

```
PHP Deprecated:  Required parameter $limit follows optional parameter $ids in src/Worker/UpdateContacts.php on line 104
```

this PR fixes the wrong order of the parameters.
 2022-03-15 08:44:17 +01:00
Michael Vogel e252b5972e
Merge pull request #11336 from MrPetovan/task/4639-soapbox-intro-notification 
Add exception when message is empty in FormatteNavNotification::createFromNotification
 2022-03-15 07:09:24 +01:00
Hypolite Petovan 634c785d4b Update main translation file after string changes 2022-03-14 22:56:46 -04:00
Hypolite Petovan 07d4cdbdde Fix misleading notification message strings 
- The mentioned title is from the top-level post, not the liked post
 2022-03-14 22:56:46 -04:00
Hypolite Petovan 36e85b01c6 Hide like notifications from menu again 2022-03-14 22:56:46 -04:00
Hypolite Petovan 73c7b88fb2 Add exception when message is empty in FormatteNavNotification::createFromNotification 
- Filter out message less notifications in Ping
 2022-03-14 22:56:44 -04:00