34293e1780
Merge remote-tracking branch 'origin/develop' into fork
2024-10-03 20:25:18 +02:00
Haelwenn (lanodan) Monnier
0fa13c5535
MRF.SimplePolicy: Add id_filter/1
2024-09-21 14:07:26 +02:00
aeac257cf2
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-21 00:26:12 +02:00
Mark Felder
44b836c94c
Fix tests
...
We do not need to mock and verify connections are closed as the new Pleroma.LDAP GenServer will handle managing the connection lifetime
2024-09-17 13:40:15 -04:00
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
17b69c43d5
Add group_key to notifications
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 14:37:37 +02:00
291061032c
update test
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 00:11:15 +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
efbd25d0b5
Support Akkoma translation routes
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-08 15:40:42 +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
9de522ce50
Authentication: convert argon2 passwords, add tests
2024-09-08 05:32:40 +03: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
Mark Felder
1afcfd4845
Add tests for Mastodon mention hashtag class
2024-09-06 11:51:16 -04:00
feld
2c916ccd89
Merge branch 'following-state-bug' into 'develop'
...
Fix Following status bug
See merge request pleroma/pleroma!4251
2024-09-06 13:27:06 +00:00
a82c081ee0
Merge branch 'scrobbles' into fork
2024-09-06 09:12:41 +02:00
8fa2d73835
Merge branch 'list-id-visibility' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-06 09:12:29 +02:00
6c4d0e10c0
Merge remote-tracking branch 'origin/develop' into fork
2024-09-06 09:11:48 +02:00
Mark Felder
5f573b4095
Credo: comment line length
2024-09-05 17:11:02 -04:00
Mark Felder
1797f5958a
App orphans should only be removed if they are older than 15 mins
2024-09-05 20:55:28 +00:00
Mark Felder
fb376ce005
Test Account View does not indicate following if a FollowingRelationship is missing
2024-09-05 16:14:06 -04:00
Mark Felder
a1951f3af7
Add Cron worker to clean up orphaned apps hourly
2024-09-04 10:59:58 -04:00
Mark Felder
7bd0750787
Ensure apps are assigned to users
2024-09-04 10:40:37 -04:00
feld
92d5f0ac14
Revert "Merge branch 'oauth-app-spam' into 'develop'"
...
This reverts merge request !4244
2024-09-04 02:22:25 +00:00
6d5ae4d2e9
Include list id in StatusView
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-03 15:17:45 +02:00
4b6d0575dd
fix permit_followback test
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-02 17:33:57 +02:00
acdda8d4df
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-02 00:26:35 +02:00
feld
9077d0925b
Merge branch 'oauth-app-spam' into 'develop'
...
Fix OAuth app spam
See merge request pleroma/pleroma!4244
2024-09-01 18:24:06 +00:00
feld
61e4be396f
Merge branch 'drop-unknown-deletes' into 'develop'
...
Drop unwanted activities from unknown actors
See merge request pleroma/pleroma!4236
2024-09-01 18:08:07 +00:00
Mark Felder
751d63d4bb
Support OAuth App updating the website URL
2024-09-01 13:55:45 -04:00
Mark Felder
e3a7c1d906
Test that app scopes can be updated
2024-09-01 12:37:59 -04:00
Mark Felder
5a1144208d
Prevent OAuth App flow from creating duplicate entries
2024-09-01 12:27:16 -04:00
e35e84228d
Change scrobble external link param name to use snake case
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-01 17:42:53 +02:00
d47447afae
fix tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-31 16:03:35 +02:00
e44bcd1106
Fix tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-31 15:21:19 +02:00
floatingghost
195e46bcca
include local instance in bubble timeline ( #117 )
...
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/117
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-31 14:59:46 +02:00
FloatingGhost
5dabf69757
Add timeline visibility options
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-31 14:30:18 +02:00
FloatingGhost
95ed4de284
Add /api/v1/followed_tags
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-31 14:23:14 +02:00
floatingghost
ffb0b79f69
Remerge of hashtag following ( #341 )
...
this time with less idiot
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/341
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-31 14:22:39 +02:00
floatingghost
df06fc44e6
add bubble timeline ( #100 )
...
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/100
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-31 14:19:24 +02:00
Mark Felder
4ae17c6294
NodeInfo: Accept application/activity+json requests
2024-08-30 15:25:21 -04:00
