friendica

tobias/friendica

Fork 0

Commit graph

ce06f7d783

Merge pull request #13690 from annando/channel-settings Hypolite Petovan 2023-12-03 19:11:35 -05:00
cb91800088 "worker_fetch_limit" is moved as well Michael 2023-12-03 22:49:35 +00:00
8386768708 Merge remote-tracking branch 'upstream/2023.09-rc' into channel-settings Michael 2023-12-03 14:41:58 +00:00
3b96690d0c

Merge pull request #13689 from MrPetovan/bug/warnings Michael Vogel 2023-12-03 15:37:40 +01:00
c4c3976c8c Updated messages.po Michael 2023-12-03 14:31:09 +00:00
5cd85d9bb7 "items per page" is now in the site settings as well Michael 2023-12-03 14:30:40 +00:00
f2e90e91e0

Merge pull request #13691 from annando/always-enable-no-sharer Hypolite Petovan 2023-12-03 09:14:43 -05:00
5971334ec7 Check for $profile emptiness before calling getReceiverForActor() in ActivityPub->getReceivers Hypolite Petovan 2023-12-02 16:57:40 -05:00
6c7dee4bcd Check media_attributes keys before using them in Mastodon\Statuses Hypolite Petovan 2023-12-02 16:51:35 -05:00
a3bfaf6336 Updated messages.po Michael 2023-12-03 13:55:11 +00:00
e99c916df1 Some more settings moved to the admin frontend Michael 2023-12-03 13:43:48 +00:00
c09d794ed8 Merge remote-tracking branch 'upstream/2023.09-rc' into channel-settings Michael 2023-12-03 11:22:26 +00:00
05ffc8b0d7

Merge pull request #13692 from nupplaphil/phpunit Michael Vogel 2023-12-03 12:21:17 +01:00
7bf7744efb The "cron_interval" is now reachable via the admin site settings Michael 2023-12-03 11:20:37 +00:00
e87c79780a "min_poll_interval" moved as well Michael 2023-12-03 11:08:21 +00:00
cfff24518e

Add "memory_limit" parameter to phpunit Philipp 2023-12-03 11:45:55 +01:00
6e523beec3 The option "community_no_sharer" is now always enabled Michael 2023-12-03 10:26:58 +00:00
f93192bc28 The channel settings are now available on the site settings Michael 2023-12-03 09:45:13 +00:00
e0fb149466

Merge pull request #13687 from annando/followers Hypolite Petovan 2023-12-02 03:42:55 -05:00
46bd4d71d0 Don't insert non public comments on not existing thread parents Michael 2023-12-02 06:19:30 +00:00
32651f7811 Legacy code removed Michael 2023-12-01 20:20:00 +00:00
c666cebe60 Distribute incoming posts according to the parent followers collection Michael 2023-12-01 09:55:48 +00:00
f3e47bd899

Merge pull request #13684 from annando/post-distribution Hypolite Petovan 2023-11-30 13:36:08 -05:00
09d72ffb16 Parameter is now optional Michael 2023-11-30 17:58:28 +00:00
120b60c5ee Function is changed to "private" Michael 2023-11-30 17:26:29 +00:00
f5337904e4 Improved distribution of non public messages Michael 2023-11-30 05:51:38 +00:00
9fb493bf18

Merge pull request #13677 from annando/site-settings Hypolite Petovan 2023-11-28 12:01:58 -05:00
c6221872e2 Changes after review Michael 2023-11-28 16:11:02 +00:00
752172ab54 Merge remote-tracking branch 'upstream/2023.09-rc' into site-settings Michael 2023-11-28 16:08:22 +00:00
d52d6a9e41

Merge pull request #13680 from annando/relation-queries Hypolite Petovan 2023-11-28 10:55:28 -05:00
61035d5007

Merge pull request #13681 from annando/no-events-on-raw Hypolite Petovan 2023-11-28 10:46:30 -05:00
405db86750 Don't display additional content when the output mode is "raw" Michael 2023-11-28 15:21:20 +00:00
b8b1b7bb84 Revert interlace stuff Michael 2023-11-28 14:57:11 +00:00
c56b915dee Hopefully fix "Interlace handling should be turned on when using png_read_image" Michael 2023-11-28 13:50:09 +00:00
43fa4b457d Updated messages.po Michael 2023-11-28 12:55:20 +00:00
1ca7118027 Improve performance on the contact relation queries Michael 2023-11-28 10:00:11 +00:00
364a5e99db messages.po is updated again Michael 2023-11-28 07:00:34 +00:00
a4c36afcc2 Updated nessages.po Michael 2023-11-28 01:17:13 +00:00
62f3598c25 Merge remote-tracking branch 'upstream/2023.09-rc' into site-settings Michael 2023-11-28 01:12:40 +00:00
bb97539a28

Merge pull request #13676 from MrPetovan/bug/13673-markers-json-output Michael Vogel 2023-11-28 02:10:49 +01:00
46b1b66dbf Several settings can now be reached via the site settings Michael 2023-11-28 00:57:51 +00:00
cbe4b60a90 Change return value to stdClass of Module\Api\Mastodon\Markers->fetchTimelines Hypolite Petovan 2023-11-27 16:10:15 -05:00
de807e6378

Merge pull request #13674 from annando/server-discovery Hypolite Petovan 2023-11-27 15:20:07 -05:00
67f727e3b3 Merge remote-tracking branch 'upstream/2023.09-rc' into server-discovery Michael 2023-11-27 19:28:13 +00:00
8ff54c2eba

Merge pull request #13672 from MrPetovan/bug/deprecated Michael Vogel 2023-11-27 20:22:47 +01:00
74990093fd Updated messages.po Michael 2023-11-27 19:07:24 +00:00
077c9ff0c9 Improved control about the contact/server updates Michael 2023-11-27 19:00:12 +00:00
3b3d0231bc Replace last occurrences of in_array used as a Smarty modifier Hypolite Petovan 2023-11-27 12:07:18 -05:00
fb19176201 Remove DI dependency in Object\Api\Mastodon\Instance Hypolite Petovan 2023-11-26 09:43:26 -05:00
838c73cbba Skip empty name tags in ActivityPub\Processor::acceptIncomingMessage Hypolite Petovan 2023-11-26 09:35:15 -05:00
332ab6641c Pass actual string character to ctype_space in Content\Smilies::performForEachWordMatch Hypolite Petovan 2023-11-26 09:27:59 -05:00
3c35dbcb5f

Merge pull request #13671 from annando/issue-12504 Hypolite Petovan 2023-11-25 18:20:15 -05:00
f514c2caf0 Test remark removed Michael 2023-11-25 23:19:27 +00:00
281dd91e6a Issue 12504: Additional logging for mail notifications Michael 2023-11-25 22:53:56 +00:00
045085c92c

Merge pull request #13669 from gudzpoz/non-pic-emoji-regression Hypolite Petovan 2023-11-25 17:12:42 -05:00
56cfc57641

Merge pull request #13670 from annando/exceptions Hypolite Petovan 2023-11-25 16:59:21 -05:00
3f971f6dec Fix exceptions in the channel check Michael 2023-11-25 16:17:26 +00:00
37188c76b8 Fix substituting smilies and smilies containing whitespaces gudzpoz 2023-11-25 23:29:39 +08:00
c649230982

Merge pull request #13668 from annando/issue-8542 Hypolite Petovan 2023-11-25 10:26:34 -05:00
5c6ac25945

Merge pull request #13667 from annando/issue-12743 Hypolite Petovan 2023-11-25 10:19:42 -05:00
4a5014eab5 Function is renamed Michael 2023-11-25 15:14:06 +00:00
4d7c5f5672 Fix tests Michael 2023-11-25 15:03:42 +00:00
b3d7dfb9a5 Issue 8542: User option to display the event list/birthday notification Michael 2023-11-25 14:57:24 +00:00
ca366e5437 Issue 12743: Allow editing of media in posts Michael 2023-11-25 12:22:25 +00:00
5c3227ac4c

Merge pull request #13663 from annando/issue-13607 Hypolite Petovan 2023-11-24 21:19:52 -05:00
a569068fb0

Merge pull request #13666 from HankG/mastodon-api-account-search-fixes Hypolite Petovan 2023-11-24 21:18:51 -05:00
27c8990aea Merge remote-tracking branch 'upstream/2023.09-rc' into issue-13607 Michael 2023-11-24 23:18:55 +00:00
f3f0859e0b Fix if not allowed blocked servers then server-blocked condition is false not true Hank Grabowski 2023-11-24 17:19:04 -05:00
379c84b7ab Fix call order of Mastodon Top level search on accounts Hank Grabowski 2023-11-24 17:06:41 -05:00
ce5aa016e1

Merge pull request #13664 from annando/issue-12530 Hypolite Petovan 2023-11-24 09:56:52 -05:00
199ac64202 Issue 12530: Align the instance endpoint to the latest changes Michael 2023-11-24 13:25:39 +00:00
4277b0c3aa Issue 13607: Use privacy setting for "remote self" Michael 2023-11-24 08:35:49 +00:00
02afde3eec

Merge pull request #13661 from annando/warning Hypolite Petovan 2023-11-22 22:00:56 -05:00
0279b3dee9 Fix warning: Undefined array key "mime" Michael 2023-11-22 19:16:09 +00:00
6fa7b45294

Merge pull request #13660 from annando/issue-13627-a Hypolite Petovan 2023-11-22 09:36:27 -05:00
c07ce083d1 Additional check for direct messages Michael 2023-11-22 14:20:51 +00:00
08d06064ce Issue 13627: DMs now work bidirectional again Michael 2023-11-22 11:07:18 +00:00
2b8a71231e

Merge pull request #13659 from annando/network-channel Hypolite Petovan 2023-11-21 20:16:00 -05:00
ffbab95c20 Channels can now be based on the "network" feed as well Michael 2023-11-21 23:13:26 +00:00
5479618f1c

Merge pull request #13658 from annando/issue-13627 Hypolite Petovan 2023-11-21 10:46:48 -05:00
ced14a73d7

Merge pull request #13657 from annando/activity-counter Hypolite Petovan 2023-11-21 10:45:28 -05:00
3f6760dc0d Issue 13627: Direct messages work now again Michael 2023-11-21 09:21:37 +00:00
e0d992f452 Display the total emoji activity Michael 2023-11-20 21:45:02 +00:00
676ce83dab

Merge pull request #13655 from keithhacks/escape-notification-contact-names Hypolite Petovan 2023-11-19 23:02:15 -05:00
fc00bf13bf

Merge pull request #13654 from annando/gserver-non-native Hypolite Petovan 2023-11-19 18:45:55 -05:00
777d0d45c6

HTML-escape notification contact names keithhacks 2023-11-19 23:23:29 +00:00
ba3dacdbde Simplify gserver entry creation for non native networks Michael 2023-11-19 19:11:45 +00:00
80796a87c7

Merge pull request #13652 from Raroun/Leftovers_from_Pull_Request_#13633 Hypolite Petovan 2023-11-19 12:23:26 -05:00
571f95546a

Update view/templates/shared_content.tpl Raroun 2023-11-19 13:45:32 +01:00
bcb75d65a3

Update search_item.tpl Raroun 2023-11-19 09:58:32 +01:00
118d736aa9

Update search_item.tpl Raroun 2023-11-19 09:52:40 +01:00
98f99c536e

Update shared_content.tpl Raroun 2023-11-19 09:50:30 +01:00
dcd47c391c

Merge pull request #13651 from annando/picture-upload Hypolite Petovan 2023-11-18 11:26:29 -05:00
c8a3fea091 "browser_update" is integer, not boolean Michael 2023-11-18 11:24:29 +00:00
6adf76c689 Fix the preview mode setting Michael 2023-11-17 23:30:28 +00:00
9901d82fea

Merge pull request #13648 from annando/picture-upload Hypolite Petovan 2023-11-17 18:06:36 -05:00
170998da1a Allow to upload pictures up to the allowed system upload size Michael 2023-11-17 12:19:01 +00:00
5cf71baf55

Merge pull request #13646 from annando/page-drop Hypolite Petovan 2023-11-16 07:42:43 -08:00
64e56fd97c Updated messages.po Michael 2023-11-16 15:36:54 +00:00
2db2f280d5

Merge pull request #13647 from MrPetovan/bug/10369-rss-group-ns Michael Vogel 2023-11-16 15:48:59 +01:00