Commit graph

38503 commits

Author SHA1 Message Date
Michael
364a5e99db messages.po is updated again 2023-11-28 07:00:34 +00:00
Michael
a4c36afcc2 Updated nessages.po 2023-11-28 01:17:13 +00:00
Michael
62f3598c25 Merge remote-tracking branch 'upstream/2023.09-rc' into site-settings 2023-11-28 01:12:40 +00:00
Michael Vogel
bb97539a28
Merge pull request #13676 from MrPetovan/bug/13673-markers-json-output
Change return value to stdClass of Module\Api\Mastodon\Markers->fetchTimelines
2023-11-28 02:10:49 +01:00
Michael
46b1b66dbf Several settings can now be reached via the site settings 2023-11-28 00:57:51 +00:00
Hypolite Petovan
cbe4b60a90 Change return value to stdClass of Module\Api\Mastodon\Markers->fetchTimelines
- This ensures the JSON serialization of timeline markers is an object even when no markers are set
2023-11-27 16:10:15 -05:00
Hypolite Petovan
de807e6378
Merge pull request #13674 from annando/server-discovery
Improved control about the contact/server updates
2023-11-27 15:20:07 -05:00
Michael
67f727e3b3 Merge remote-tracking branch 'upstream/2023.09-rc' into server-discovery 2023-11-27 19:28:13 +00:00
Michael Vogel
8ff54c2eba
Merge pull request #13672 from MrPetovan/bug/deprecated
Address several deprecation notices
2023-11-27 20:22:47 +01:00
Michael
74990093fd Updated messages.po 2023-11-27 19:07:24 +00:00
Michael
077c9ff0c9 Improved control about the contact/server updates 2023-11-27 19:00:12 +00:00
Hypolite Petovan
3b3d0231bc Replace last occurrences of in_array used as a Smarty modifier
- Address https://github.com/friendica/friendica/issues/13158#issuecomment-1826266366
2023-11-27 12:07:18 -05:00
Hypolite Petovan
fb19176201 Remove DI dependency in Object\Api\Mastodon\Instance
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1826792949
2023-11-26 09:48:46 -05:00
Hypolite Petovan
838c73cbba Skip empty name tags in ActivityPub\Processor::acceptIncomingMessage
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1826792949
2023-11-26 09:35:15 -05:00
Hypolite Petovan
332ab6641c Pass actual string character to ctype_space in Content\Smilies::performForEachWordMatch
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1826792949
2023-11-26 09:27:59 -05:00
Hypolite Petovan
3c35dbcb5f
Merge pull request #13671 from annando/issue-12504
Issue 12504: Additional logging for mail notifications
2023-11-25 18:20:15 -05:00
Michael
f514c2caf0 Test remark removed 2023-11-25 23:19:27 +00:00
Michael
281dd91e6a Issue 12504: Additional logging for mail notifications 2023-11-25 22:53:56 +00:00
Hypolite Petovan
045085c92c
Merge pull request #13669 from gudzpoz/non-pic-emoji-regression
Fix substituting smilies and smilies containing whitespaces
2023-11-25 17:12:42 -05:00
Hypolite Petovan
56cfc57641
Merge pull request #13670 from annando/exceptions
Fix exceptions in the channel check
2023-11-25 16:59:21 -05:00
Michael
3f971f6dec Fix exceptions in the channel check 2023-11-25 16:17:26 +00:00
gudzpoz
37188c76b8 Fix substituting smilies and smilies containing whitespaces 2023-11-25 23:29:39 +08:00
Hypolite Petovan
c649230982
Merge pull request #13668 from annando/issue-8542
Issue 8542: User option to display the event list/birthday notification
2023-11-25 10:26:34 -05:00
Hypolite Petovan
5c6ac25945
Merge pull request #13667 from annando/issue-12743
Issue 12743: Allow editing of media in posts
2023-11-25 10:19:42 -05:00
Michael
4a5014eab5 Function is renamed 2023-11-25 15:14:06 +00:00
Michael
4d7c5f5672 Fix tests 2023-11-25 15:03:42 +00:00
Michael
b3d7dfb9a5 Issue 8542: User option to display the event list/birthday notification 2023-11-25 14:57:24 +00:00
Michael
ca366e5437 Issue 12743: Allow editing of media in posts 2023-11-25 12:22:25 +00:00
Hypolite Petovan
5c3227ac4c
Merge pull request #13663 from annando/issue-13607
Issue 13607: Use privacy setting for "remote self"
2023-11-24 21:19:52 -05:00
Hypolite Petovan
a569068fb0
Merge pull request #13666 from HankG/mastodon-api-account-search-fixes
Mastodon api account search fixes
2023-11-24 21:18:51 -05:00
Michael
27c8990aea Merge remote-tracking branch 'upstream/2023.09-rc' into issue-13607 2023-11-24 23:18:55 +00:00
Hank Grabowski
f3f0859e0b Fix if not allowed blocked servers then server-blocked condition is false not true 2023-11-24 17:19:04 -05:00
Hank Grabowski
379c84b7ab Fix call order of Mastodon Top level search on accounts 2023-11-24 17:06:41 -05:00
Hypolite Petovan
ce5aa016e1
Merge pull request #13664 from annando/issue-12530
Issue 12530: Align the instance endpoint to the latest changes
2023-11-24 09:56:52 -05:00
Michael
199ac64202 Issue 12530: Align the instance endpoint to the latest changes 2023-11-24 13:25:39 +00:00
Michael
4277b0c3aa Issue 13607: Use privacy setting for "remote self" 2023-11-24 08:35:49 +00:00
Hypolite Petovan
02afde3eec
Merge pull request #13661 from annando/warning
Fix warning: Undefined array key "mime"
2023-11-22 22:00:56 -05:00
Michael
0279b3dee9 Fix warning: Undefined array key "mime" 2023-11-22 19:16:09 +00:00
Hypolite Petovan
6fa7b45294
Merge pull request #13660 from annando/issue-13627-a
Issue 13627: DMs now work bidirectional again
2023-11-22 09:36:27 -05:00
Michael
c07ce083d1 Additional check for direct messages 2023-11-22 14:20:51 +00:00
Michael
08d06064ce Issue 13627: DMs now work bidirectional again 2023-11-22 11:07:18 +00:00
Hypolite Petovan
2b8a71231e
Merge pull request #13659 from annando/network-channel
Channels can now be based on the "network" feed as well
2023-11-21 20:16:00 -05:00
Michael
ffbab95c20 Channels can now be based on the "network" feed as well 2023-11-21 23:13:26 +00:00
Hypolite Petovan
5479618f1c
Merge pull request #13658 from annando/issue-13627
Issue 13627: Direct messages work now again
2023-11-21 10:46:48 -05:00
Hypolite Petovan
ced14a73d7
Merge pull request #13657 from annando/activity-counter
Display the total emoji activity
2023-11-21 10:45:28 -05:00
Michael
3f6760dc0d Issue 13627: Direct messages work now again 2023-11-21 09:21:37 +00:00
Michael
e0d992f452 Display the total emoji activity 2023-11-20 21:45:02 +00:00
Hypolite Petovan
676ce83dab
Merge pull request #13655 from keithhacks/escape-notification-contact-names
(Security) HTML-escape notification contact names
2023-11-19 23:02:15 -05:00
Hypolite Petovan
fc00bf13bf
Merge pull request #13654 from annando/gserver-non-native
Simplify gserver entry creation for non native networks
2023-11-19 18:45:55 -05:00
keithhacks
777d0d45c6
HTML-escape notification contact names 2023-11-19 23:23:29 +00:00