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
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
106abc34b1
declare support for window controls overlay
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 11:26:26 +02:00
4cee86756c
Merge remote-tracking branch 'origin/develop' into fork
2024-09-11 22:09:18 +02: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
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
63a0288885
expose bubble timeline availability
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-08 16:22:02 +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
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
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
Mark Felder
06ce5e3b43
Dialyzer: pattern_match The pattern can never match the type {:diff, false}.
2024-09-06 11:27:07 -04:00
Mark Felder
1d0e3b1355
Dialyzer: The pattern variable _ can never match the type, because it is covered by previous clauses.
2024-09-06 11:24:37 -04:00
Mark Felder
06d6febff9
Dialyzer: The pattern variable _e@1 can never match the type, because it is covered by previous clauses.
2024-09-06 11:19:24 -04:00
Mark Felder
7eb579c191
Dialyzer: invalid contract
2024-09-06 11:18:12 -04:00
Mark Felder
bc16f09d7b
Dialyzer: the pattern can never match the type
...
The original error was for the chat controller:
lib/pleroma/web/pleroma_api/controllers/chat_controller.ex:104:pattern_match The pattern can never match the type {:error, :content_too_long | :forbidden | :no_content | :not_found} | {:user, nil}.
Improve typespecs for the Pipeline and apply them where it could be encountered
2024-09-06 11:12:15 -04:00
Mark Felder
fc3ea94a1c
Dialyzer: the pattern can never match the type
2024-09-06 09:58:03 -04:00
Mark Felder
a887188890
Oban: more unique job constraints
2024-09-06 09:42:53 -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
1797f5958a
App orphans should only be removed if they are older than 15 mins
2024-09-05 20:55:28 +00:00
Mark Felder
4d76692db3
Fix Following status bug
2024-09-05 16:14:13 -04:00
Mark Felder
53744bf146
Limit the number of orphaned to delete at 100 every 10 mins due to the cascading queries that have to check oauth_authorizations and oauth_tokens tables.
...
This should keep ahead of most app registration spam and not overwhelm lower powered servers.
2024-09-04 11:45:05 -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
Mark Felder
427da7a99a
Rate Limit the OAuth App spam
2024-09-04 09:22:58 -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
74c5e5f97d
fix instance replacement
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-03 20:16:50 +02:00
6d5ae4d2e9
Include list id in StatusView
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-03 15:17:45 +02:00
c5f18dfac4
$INSTANCE$host$ replacement
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-02 17:15:07 +02:00
9330d30240
Don't use the Soapbox scope
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-02 00:29:18 +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