Commit graph

38685 commits

Author SHA1 Message Date
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
Michael
ba3dacdbde Simplify gserver entry creation for non native networks 2023-11-19 19:11:45 +00:00
Hypolite Petovan
80796a87c7
Merge pull request #13652 from Raroun/Leftovers_from_Pull_Request_#13633
Leftovers from pull request #13633
2023-11-19 12:23:26 -05:00
Raroun
571f95546a
Update view/templates/shared_content.tpl
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-11-19 13:45:32 +01:00
Raroun
bcb75d65a3
Update search_item.tpl
Fix indentation
2023-11-19 09:58:32 +01:00
Raroun
118d736aa9
Update search_item.tpl
Added new behavior here also
2023-11-19 09:52:40 +01:00
Raroun
98f99c536e
Update shared_content.tpl
Added new behavior here too
2023-11-19 09:50:30 +01:00
Hypolite Petovan
dcd47c391c
Merge pull request #13651 from annando/picture-upload
Fix the preview mode setting
2023-11-18 11:26:29 -05:00
Michael
c8a3fea091 "browser_update" is integer, not boolean 2023-11-18 11:24:29 +00:00
Michael
6adf76c689 Fix the preview mode setting 2023-11-17 23:30:28 +00:00
Hypolite Petovan
9901d82fea
Merge pull request #13648 from annando/picture-upload
Allow to upload pictures up to the allowed system upload size
2023-11-17 18:06:36 -05:00
Michael
170998da1a Allow to upload pictures up to the allowed system upload size 2023-11-17 12:19:01 +00:00
Hypolite Petovan
5cf71baf55
Merge pull request #13646 from annando/page-drop
New user option to hide the page drop checkbox
2023-11-16 07:42:43 -08:00
Michael
64e56fd97c Updated messages.po 2023-11-16 15:36:54 +00:00
Michael Vogel
2db2f280d5
Merge pull request #13647 from MrPetovan/bug/10369-rss-group-ns
Add expected xmlns attribute to group feed entries
2023-11-16 15:48:59 +01:00
Michael Vogel
cad4b2f7b8
Update src/Module/Settings/Display.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-11-16 15:48:25 +01:00
Hypolite Petovan
518c463761 Add expected xmlns attribute to group feed entries 2023-11-16 06:58:15 -05:00
Hypolite Petovan
21227453e5
Merge pull request #13635 from gudzpoz/emojis-please
Improve emoji federation (ActivityPub) and Mastodon API compliance
2023-11-16 03:26:34 -08:00
gudzpoz
d493946ba4 Allow using punctuation chars as smiley delimiters 2023-11-16 13:31:31 +08:00