95edffdb19
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-12 18:10:15 +02:00
feld
639016bdee
Merge branch 'refactor-change-password' into 'develop'
...
LDAP: permit password changing
See merge request pleroma/pleroma!4285
2024-10-11 20:48:20 +00:00
feld
4557cd960e
Merge branch 'remote-report-policy' into 'develop'
...
Remote report policy
See merge request pleroma/pleroma!4280
2024-10-11 20:23:46 +00:00
feld
dd7f699d4a
Merge branch 'tusooa/3331-fix-incoming-block' into 'develop'
...
Fix incoming Blocks being rejected
Closes #3331
See merge request pleroma/pleroma!4282
2024-10-11 20:22:21 +00:00
Mark Felder
b6a951cfb5
LDAP password changing changelog
2024-10-11 16:20:38 -04:00
feld
3f3f8bc57a
Merge branch 'poll-refresh' into 'develop'
...
Refactor Poll Refreshing
See merge request pleroma/pleroma!4278
2024-10-10 00:46:28 +00:00
marcin mikołajczak
ddedc575e7
Merge branch 'hashtag-feeds-restricted' into 'develop'
...
Repesct :restrict_unauthenticated for hashtag rss/atom feeds
See merge request pleroma/pleroma!4266
2024-10-09 09:42:53 +00:00
tusooa
f758b6e37c
Fix incoming Blocks being rejected
2024-10-08 23:09:59 -04:00
marcin mikołajczak
07cfbe4ae8
Merge branch 'profile-image-descriptions' into 'develop'
...
Federate avatar/header descriptions
See merge request pleroma/pleroma!4264
2024-10-06 20:05:36 +00:00
84b4368211
Metadata: Do not include .atom feed links for remote accounts
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-10-06 17:02:17 +02:00
3c78a4509e
Merge remote-tracking branch 'origin/poll-refresh' into fork
2024-10-03 21:03:17 +02:00
34293e1780
Merge remote-tracking branch 'origin/develop' into fork
2024-10-03 20:25:18 +02:00
Mint
eb971aa022
Changelog
2024-10-03 20:03:52 +03:00
Mark Felder
2ab4049508
Poll refreshing changelog
2024-09-30 14:47:30 -04:00
Haelwenn
d2eb4992e2
Merge branch 'elixir-1.14-docker' into 'develop'
...
Dockerfile: Elixir 1.14
See merge request pleroma/pleroma!4274
2024-09-21 13:44:17 +00:00
Haelwenn (lanodan) Monnier
a1e3fb506b
Dockerfile: Elixir 1.14
2024-09-21 15:40:04 +02:00
Haelwenn (lanodan) Monnier
03e14e759d
MRF: Add filtering against AP id
2024-09-21 14:06:24 +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
d6a364dad4
Merge remote-tracking branch 'origin/develop' into oban-bump
2024-09-19 16:23:38 -04:00
Mark Felder
f00545d85b
Elixir 1.14 and Erlang/OTP 23 is now the minimum supported release
2024-09-18 13:14:17 -04:00
Mark Felder
ecd1b8393b
Oban: update to 2.18.3
...
This release includes the fix which should prevent the scenario where Postgrex crashes can cause Oban to get into a state where it will stop processing jobs.
2024-09-18 12:09:27 -04:00
Mark Felder
73204c1bca
LDAP: fix compile warning
...
Sometimes the compile will emit the following warning, so we'll just avoid it by making it call a function in the LDAP module which will never have this problem.
warning: :GenServer.call/2 is undefined (module :GenServer is not available or is yet to be defined)
2024-09-18 11:58:52 -04:00
feld
8776d31794
Merge branch 'swoosh-mua' into 'develop'
...
Add dependencies for Swoosh's Mua mail adapter
See merge request pleroma/pleroma!4263
2024-09-17 19:45:29 +00:00
Mark Felder
35ddb1d2c8
LDAP genserver changelog
2024-09-17 13:57:10 -04:00
Mark Felder
e24e107f3d
Merge remote-tracking branch 'origin/develop' into retry-tests
2024-09-16 11:51:22 -04:00
feld
3a0d4e9837
Merge branch 'ldap-tls' into 'develop'
...
LDAP: permit overriding the CA root, improve SSL/TLS
See merge request pleroma/pleroma!4265
2024-09-16 15:50:58 +00:00
Mark Felder
e59706c201
Reapply "Custom mix task to retry failed tests once in CI pipeline"
...
This reverts commit b281ad06de
2024-09-16 11:42:55 -04:00
e74e0089bf
Repesct :restrict_unauthenticated for hashtag rss/atom feeds
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-16 17:19:21 +02:00
Mark Felder
af3bf8a462
Support implicit TLS connections
...
Update docs to clarify that the :ssl option is also for modern TLS, but the :tls option is only for STARTTLS
These options may benefit from being renamed but they match upstream terminology.
2024-09-15 14:00:19 -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
Mark Felder
5539fea3bb
LDAP: permit overriding the CA root
2024-09-14 20:36:24 -04: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
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
Mint
e10db52e0a
Add dependencies for Swoosh's Mua mail adapter
2024-09-13 02:58:59 +03:00
17b69c43d5
Add group_key to notifications
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 14:37: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
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
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
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
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
