f01663fe6c
Merge branch 'admin-report-notification-type' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-15 12:10:30 +02:00
00e253d3db
Merge branch 'profile-image-descriptions' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-15 12:09:18 +02:00
8c35794961
Merge remote-tracking branch 'origin/develop' into fork
2024-09-15 12:08:20 +02:00
marcin mikołajczak
8250a9764e
Merge branch 'notifications-group-key' into 'develop'
...
Add `group_key` to notifications
See merge request pleroma/pleroma!4262
2024-09-15 10:07:52 +00:00
1a120d0130
Federate avatar/header descriptions
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-14 21:32:32 +02:00
455e3dea2e
Use admin.report for report notification type
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-14 21:30:51 +02:00
8e8ec6bda9
Merge branch 'profile-image-descriptions' into fork
2024-09-14 20:17:17 +02:00
26fc74835f
federate avatar/header descriptions
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-14 20:17:08 +02:00
marcin mikołajczak
c1a1150888
Merge branch 'profile-image-descriptions' into 'develop'
...
Allow providing avatar/header descriptions
See merge request pleroma/pleroma!4227
2024-09-14 17:46:33 +00:00
marcin mikołajczak
0111659a1f
Merge branch 'list-id-visibility' into 'develop'
...
Include list id in StatusView
See merge request pleroma/pleroma!4246
2024-09-14 17:46:09 +00:00
marcin mikołajczak
abf38b405d
Merge branch 'manifest-icon-size' into 'develop'
...
Manifest: declare /static/logo.svg as 512x512 to match one bundled with pleroma
See merge request pleroma/pleroma!4260
2024-09-14 17:27:49 +00:00
f813da39ce
fix typo
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 15:45:56 +02:00
17b69c43d5
Add group_key to notifications
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 14:37:37 +02:00
a6ec71873a
Manifest: prefer theme color provided by pl fe configuration
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 11:30:37 +02:00
e4539f014c
Merge branch 'manifest-icon-size' into fork
2024-09-12 11:30:07 +02:00
affdcdb68d
Manifest: declare /static/logo.svg as 512x512 to match one provided by pleroma-fe
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 11:27:29 +02:00
106abc34b1
declare support for window controls overlay
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 11:26:26 +02:00
7a2200faa8
Include Pleroma logo in .svg
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 11:19:54 +02:00
291061032c
update test
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 00:11:15 +02:00
d74b5800e7
Merge remote-tracking branch 'mkljczk-pleroma/akkoma-migration' into fork
2024-09-11 22:09:24 +02:00
4cee86756c
Merge remote-tracking branch 'origin/develop' into fork
2024-09-11 22:09:18 +02:00
feld
360dd34f19
Merge branch 'ldap-tls' into 'develop'
...
LDAP Auth: fix TLS certificate verification
See merge request pleroma/pleroma!4259
2024-09-11 18:00:22 +00:00
Mark Felder
7def11d7c3
LDAP Auth: fix TLS certificate verification
...
Currently we only support STARTTLS and it was not verifying certificate and hostname correctly. We must pass a custom fqdn_fun/1 function so it knows what value to compare against.
2024-09-11 12:47:46 -04:00
23f548dc61
Akkoma migration: Move mastofe settings to settings store
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-10 22:30:47 +02:00
91f0861449
yes, i'm not a big fan of this api_versions thing, how did you know?
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-10 13:05:49 +02:00
509d5ef74a
we're not soapbox actually
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-09 16:15:45 +02:00
Haelwenn
20e82c7456
Merge branch 'argon2' into 'develop'
...
Support and convert argon2 passwords
See merge request pleroma/pleroma!4257
2024-09-08 20:48:21 +00:00
63a0288885
expose bubble timeline availability
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-08 16:22:02 +02:00
8e12a2ca25
Allow installing akkoma-fe
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-08 16:07:24 +02:00
efbd25d0b5
Support Akkoma translation routes
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-08 15:40:42 +02:00
b09152801a
Add localBubbleInstances to nodeinfo
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-08 13:22:16 +02:00
1853055508
Merge remote-tracking branch 'mint/argon2' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-08 10:20:09 +02:00
Mint
7e91c3a306
Changelog
2024-09-08 05:41:48 +03:00
Mint
9de522ce50
Authentication: convert argon2 passwords, add tests
2024-09-08 05:32:40 +03:00
c9b28eaf9a
Argon2 password support
2024-09-08 05:23:46 +03:00
8213d35792
update akkoma migration docs
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-07 19:33:52 +02:00
c86d132cb7
Merge branch 'akkoma-migration' into fork
2024-09-07 19:33:23 +02:00
687e67b711
Update docs
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-07 19:33:10 +02:00
ecf2c06e35
Akkoma rollbacks: Remove migrations used by pl
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-07 19:12:09 +02:00
da75554dec
Merge remote-tracking branch 'mkljczk-pleroma/akkoma-migration' into fork
2024-09-07 19:11:14 +02:00
b0b674f47e
Support migration from Akkoma
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-07 19:07:16 +02:00
1463eccf93
StatusView: Fall back to attachment type if no mimetype present
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-07 14:16:20 +02:00
d1daa9a0c8
Merge remote-tracking branch 'origin/develop' into fork
2024-09-06 23:21:43 +02:00
feld
bb0cb06d8a
Merge branch 'well-known' into 'develop'
...
NodeInfo: Accept application/activity+json requests
See merge request pleroma/pleroma!4242
2024-09-06 16:30:07 +00:00
feld
80f3e507d4
Merge branch 'dialyzer' into 'develop'
...
Dialyzer fixes
See merge request pleroma/pleroma!4254
2024-09-06 16:12:28 +00:00
feld
b871551d97
Merge branch 'oban-uniques' into 'develop'
...
Oban: more unique job constraints
See merge request pleroma/pleroma!4253
2024-09-06 16:02:06 +00:00
feld
7f3600fddd
Merge branch 'scrubber-mention-hashtag' into 'develop'
...
Add tests for Mastodon mention hashtag class
See merge request pleroma/pleroma!4255
2024-09-06 15:52:06 +00:00
Mark Felder
1afcfd4845
Add tests for Mastodon mention hashtag class
2024-09-06 11:51:16 -04:00
Mark Felder
5b26c56624
Changelog
2024-09-06 11:34:06 -04:00
Mark Felder
06ce5e3b43
Dialyzer: pattern_match The pattern can never match the type {:diff, false}.
2024-09-06 11:27:07 -04:00
