pleroma

github-mirrors/pleroma

Fork 0

mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2025-04-19 19:37:41 -04:00

Commit graph

b3dccb2c1c Merge branch 'replies-collection' into 'develop' mkljczk 2025-04-17 00:30:37 +00:00
c9499fae87 Merge branch 'feat/vips-heif-upload-filter' into 'develop' feld 2025-04-16 23:43:09 +00:00
94989d6ada Merge branch 'instance-markup-info' into 'develop' mkljczk 2025-04-16 01:43:12 +00:00
d64cb8dc19 Merge branch 'emoji-pack-upload' into 'develop' vaartis 2025-04-15 10:12:05 +00:00
867d69ec70 Add a way to upload emoji pack from zip/url easily emoji-pack-upload Ekaterina Vaartis 2025-01-14 02:02:46 +03:00
9aa8f80d59 Merge branch 'expiring-blocks' into 'develop' vaartis 2025-04-15 09:57:04 +00:00
51a0cee405 Add expiring blocks expiring-blocks Ekaterina Vaartis 2025-04-09 22:50:28 +03:00
d59fada071 Merge branch 'question-validator' into 'develop' feld 2025-04-15 03:00:07 +00:00
e4815ac9e4 Merge branch 'exif' into 'develop' lain 2025-04-14 20:48:58 +00:00
66b0ba82ad Merge branch 'admin-report-notification-type' into 'develop' mkljczk 2025-04-14 18:54:59 +00:00
98a41250eb Merge branch 'jason-native' into 'develop' feld 2025-04-14 03:30:06 +00:00
62d31ab924 Merge branch 'develop' into 'develop' alemi 2025-04-14 02:30:45 +00:00
cf8dd8a767 Merge branch 'fix/streaming-with-irreversible-filter' into 'develop' kPherox 2025-04-13 22:50:25 +00:00
4ba69dd8f0 Merge branch 'docs/client_link_update' into 'develop' NPL 2025-04-13 21:07:55 +00:00
fb5f7bc17d Merge branch 'previewcard-void-fill' into 'develop' Haelwenn 2025-04-13 13:45:20 +00:00
e647d8fc47 Merge branch 'previewcard-get.remove' into 'develop' Haelwenn 2025-04-13 12:25:14 +00:00
360d897e71 Merge branch 'relay-actor-type' into 'develop' mkljczk 2025-04-13 12:07:06 +00:00
7504948d0b Merge branch 'lazarus' into 'develop' feld 2025-04-13 03:27:32 +00:00
62d4aeef86 Merge branch 'defuse-binary' into 'develop' feld 2025-04-13 00:12:07 +00:00
a829949443 Merge branch 'rebased-migration' into 'develop' mkljczk 2025-04-12 23:54:03 +00:00
128afe53c4 Merge branch 'bump-captcha-posix-make' into 'develop' Haelwenn 2025-04-12 23:53:46 +00:00
ec5714c07f Merge branch 'bugfix/lexbor-lm' into 'develop' Haelwenn 2025-04-12 23:53:30 +00:00
1f3e4433e8 Merge branch 'opt-init.d-migrations' into 'develop' Haelwenn 2025-04-12 23:52:43 +00:00
0a337449f4 Merge branch 'fix-386' into 'develop' Duponin 2025-04-12 23:24:08 +00:00
b55ef43d8f Merge branch 'webhooks_' into 'develop' mkljczk 2025-04-12 21:07:35 +00:00
611c8799c5 Merge branch 'outgoing_follow_requests' into 'develop' mkljczk 2025-04-12 15:59:53 +00:00
15690b5158 Merge branch 'scrobbles' into 'develop' mkljczk 2025-04-12 15:15:39 +00:00
2baf1541d0 Merge branch 'fix/user-visibility' into 'develop' feld 2025-04-12 14:00:22 +00:00
f2917eecd1 Merge branch 'tusooa/assign-app-user-oom' into 'develop' tusooa 2025-04-12 13:28:18 +00:00
f7be42ff1d Merge branch 'openbsd-docs' into 'develop' Phantasm 2025-04-12 13:02:53 +00:00
a1a04fd2a0 Merge branch 'pin-chats' into 'develop' mkljczk 2025-04-12 13:01:27 +00:00
252b500603 Merge branch 'akkoma-migration' into 'develop' mkljczk 2025-04-12 10:03:02 +00:00
f9270a28e5 Merge branch 'mastodon-admin' into 'develop' mkljczk 2025-04-12 07:58:51 +00:00
758fef4042 Merge branch 'nginx-config-update' into 'develop' feld 2025-04-12 00:10:55 +00:00
51f90dbe12 Merge branch 'tusooa/more-translatable' into 'develop' tusooa 2025-04-12 00:06:17 +00:00
4bfd41edb1 Merge branch 'events' into 'develop' mkljczk 2025-04-11 21:23:26 +00:00
d109cf691d Merge branch 'user-search-rank' into 'develop' feld 2025-04-11 18:08:00 +00:00
29a797cd1d Merge branch 'rich-media-authors' into 'develop' feld 2025-04-11 18:06:07 +00:00
3ea2378485 Merge branch 'add-tos-setting' into 'develop' Pleroma User 2025-04-11 15:17:29 +00:00
7c686c2132 Merge branch 'user-exports-api' into 'develop' feld 2025-04-11 14:53:16 +00:00
7e2b8f33fc Merge branch 'new_users_digest' into 'develop' feld 2025-04-11 13:44:34 +00:00
db879d555e Merge branch 'REUSE' into 'develop' Lina Ceballos 2025-04-11 13:12:09 +00:00
ddddb67338 Merge branch 'assign-users' into 'develop' mkljczk 2025-04-11 12:48:59 +00:00
1325c34c9b Merge branch 'multitenancy' into 'develop' mkljczk 2025-04-11 12:34:12 +00:00
389cdfc326 Merge branch 'feat/fix-preferred-nickname-task' into 'develop' kPherox 2025-04-11 11:45:13 +00:00
6945000a94 Merge branch 'telemetry' into 'develop' feld 2025-04-11 11:18:34 +00:00
83c28b020c Merge branch 'emoji-404' into 'develop' Haelwenn 2025-04-11 10:49:33 +00:00
17ba826a51 Merge branch 'backups-chats' into 'develop' mkljczk 2025-04-11 10:28:31 +00:00
32dd1ea501 Merge branch 'permissive-webfinger' into 'develop' Moon Man 2025-04-11 05:46:27 +00:00
26aa09866f Merge branch 'no-cachex' into 'develop' feld 2025-04-11 03:02:42 +00:00
fd95263c42 Merge branch 'pipeline-local-create' into 'develop' Haelwenn 2025-04-11 02:28:54 +00:00
c896e0643f Merge branch 'redo/strip-object-actor' into 'develop' feld 2025-04-11 02:28:23 +00:00
7911c4a4ed Translated using Weblate (French) weblate Irrlicht 2025-04-09 23:59:32 +00:00
0fb871c70f Merge branch 'optimize-followed-hashtags' into 'develop' mkljczk 2025-04-11 00:16:48 +00:00
99fbe0418a Merge branch 'gins-tonic' into 'develop' develop feld 2025-04-10 22:01:25 +00:00
e796c334bb Merge branch 'gins-tonic' into 'develop' feld 2025-04-10 21:32:51 +00:00
1266b180b9 Improved performance of status search queries using the default GIN index Mark Felder 2025-04-10 14:32:31 -07:00
30ab95487b Fix formatting Pleromian 2025-02-04 18:05:45 +00:00
00e68bf918 Move ToS settings to the FE section Pleromian 2025-02-04 17:51:46 +00:00
e4251486aa Changelog Pleromian 2025-02-04 16:23:05 +00:00
7a0ad8f29c Allow ToS panel to be configurable Pleromian 2025-02-04 16:18:08 +00:00
1f89bc6a57 Merge remote-tracking branch 'origin/develop' into multitenancy Nicole Mikołajczyk 2025-04-03 10:34:30 +02:00
7faad7f49a Replace Cachex with Nebulex: Object no-cachex Mark Felder 2025-04-04 19:11:48 -07:00
e94d597506 Fix warning about missing parens Mark Felder 2025-04-04 18:57:13 -07:00
20c80b2765 Replace Cachex with Nebulex: RichMediaCards Mark Felder 2025-04-04 17:05:21 -07:00
4b2af11e67 Add Nebulex Mark Felder 2025-04-04 15:14:14 -07:00
7234aa8c18 Merge remote-tracking branch 'origin/develop' into instance-markup-info Nicole Mikołajczyk 2025-04-03 10:32:25 +02:00
1775a4db08 Merge branch 'siteinfo-baseurls' into 'develop' lain 2025-04-02 13:00:42 +00:00
8322134a21 Edit siteinfo-baseurls.add lain 2025-04-02 12:30:32 +00:00
93aa563cfe implemented Moon Man 2025-04-02 07:00:45 -04:00
4f78a9142a Merge branch 'typo' into 'develop' mkljczk 2025-04-02 10:48:07 +00:00
2651058fa4 Merge branch 'fix-freebsd-rc' into 'develop' feld 2025-04-01 03:21:30 +00:00
f60a1e7d44 Set PATH in the FreeBSD rc script to avoid failures starting the service Mark Felder 2025-03-31 20:17:18 -07:00
d1b9d03302 update changelog Nicole Mikołajczyk 2025-03-28 17:00:36 +01:00
4d4174c339 fix a few typos Nicole Mikołajczyk 2025-03-28 18:47:00 +01:00
890ac8ff86 Expose markup configuration in InstanceView marcin mikołajczak 2023-04-30 17:33:11 +02:00
26dcb4f964 Merge remote-tracking branch 'origin/develop' into events mkljczk 2025-03-23 15:05:08 +01:00
43a124bb14 formatting Moon Man 2025-03-20 12:51:43 -04:00
7624af92cf tests for webfinger Moon Man 2025-03-20 16:42:46 +00:00
edfa372fdb changelog update Moon Man 2025-03-20 15:30:41 +00:00
3af9692352 return json if no accept is specified Moon Man 2025-03-20 15:25:00 +00:00
254b31bf1c Merge branch 'more-emoji-likes' into 'develop' lain 2025-03-20 09:12:09 +00:00
81960dccf2 Merge branch 'translate-posts' into 'develop' lain 2025-03-20 09:11:57 +00:00
3e802240b1 Merge branch 'fix-releases' into 'develop' feld 2025-03-19 18:01:18 +00:00
638d047a5c Fix releases by not relying on Mix Mark Felder 2025-03-19 10:47:32 -07:00
7107901f60 Merge branch 'truncate-rich-media' into 'develop' feld 2025-03-19 17:42:11 +00:00
7763b9a87f Truncate the length of Rich Media title and description fields Mark Felder 2025-03-19 10:29:45 -07:00
25a3ee2256 InstanceView: do not repeat information mkljczk 2025-03-19 17:59:42 +01:00
08de5f94e3 Merge remote-tracking branch 'origin/develop' into translate-posts mkljczk 2025-03-19 17:59:24 +01:00
923997fccf Merge remote-tracking branch 'origin/develop' into events mkljczk 2025-03-19 17:56:46 +01:00
d3bc941c0a update test mkljczk 2025-03-19 16:32:48 +01:00
b9c4e6033c cleanup mkljczk 2025-03-19 16:02:36 +01:00
6e1223a1ed Merge branch 'language-detection' into 'develop' lain 2025-03-19 14:40:46 +00:00
f9bff8f5e5 Transmogrifier: Keep likes as likes if the content is obviously wrong Lain Soykaf 2025-03-19 16:00:27 +04:00
950bf60765 LikeHandlingTest: Add test for invalid content Lain Soykaf 2025-03-19 15:57:08 +04:00
23adec42fd maybe keep naming it Collection mkljczk 2025-03-19 10:43:34 +01:00
d0289bdb1b credo mkljczk 2025-03-18 10:23:00 +01:00
ef216c922f Add changelog Lain Soykaf 2025-03-18 15:54:33 +04:00
e19ca7606d Transmogrifier: Also accept mitra emoji likes. Lain Soykaf 2025-03-18 15:53:27 +04:00
fc7ca2ccf4 Federator: More specific logging for rejections Lain Soykaf 2025-03-18 15:25:54 +04:00