Commit graph

1674 commits

Author SHA1 Message Date
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
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
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
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
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
6d5ae4d2e9 Include list id in StatusView
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-03 15:17:45 +02:00
327671a906 Include pl-fe in available frontends
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-02 00:41:19 +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
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
Oneric
23b2e044a5 Add ability to auto-approve followbacks
Resolves: https://akkoma.dev/AkkomaGang/akkoma/issues/148
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-29 18:27:34 +02:00
3419e2cbdd Correct response in AdminAPI docs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-28 18:28:22 +02:00
cc6121a948 fix docs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-28 17:57:12 +02:00
1ba53dc2f0 Merge branch 'profile-image-descriptions' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-17 23:29:59 +02:00
3498662712 Move new fields to pleroma object
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-17 19:59:39 +02:00
855c5a234f Update docs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-17 17:06:39 +02:00
0a4fece245 Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-14 18:16:28 +02:00
feld
f87aa8b83c Merge branch 'deprecate-subscribe' into 'develop'
Mark `/api/v1/pleroma/accounts/:id/subscribe`/`unsubscribe` as deprecated

See merge request pleroma/pleroma!4216
2024-08-12 21:27:12 +00:00
c1c0f0b144 Mark /api/v1/pleroma/accounts/:id/subscribe/unsubscribe as deprecated
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-12 12:38:51 +02:00
6e53e94bda Remove stub for /api/v1/accounts/:id/identity_proofs (deprecated by Mastodon 3.5.0)
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-12 12:23:38 +02:00
6f957c94a7 Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-08-02 14:46:20 +02:00
Mark Felder
775f45cfe2 Merge remote-tracking branch 'origin/develop' into oban/backup 2024-07-25 14:43:40 -04:00
aa2597e2f6 Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-07-25 13:19:17 +02:00
Mark Felder
6598919213 Document the new timeout setting 2024-07-24 16:16:37 -04:00
Mark Felder
187897874b Make backup timeout configurable 2024-07-23 10:30:57 -04:00
e0d0992e10 Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-07-21 12:36:25 +02:00
Mark Felder
6cd3f9042f Add docs for fix_mrf_policies 2024-07-17 13:51:56 -04:00
5d1cb904ac Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-24 11:37:28 +02:00
feld
93eb458c24 Merge branch 'netbsd-wip' into 'develop'
update docs for NetBSD

See merge request pleroma/pleroma!4150
2024-06-21 15:35:48 +00:00
pleromian
b33b1b7253 docs: update nginx and rcscript path for NetBSD 2024-06-20 23:52:25 +02:00
pleromian
af53efa9e3 docs: update docs for NetBSD 2024-06-20 01:40:02 +02:00
Haelwenn (lanodan) Monnier
6774ff15db docs: Bump elixir requirement up to 1.16 2024-06-12 15:20:04 -04:00
Haelwenn (lanodan) Monnier
8757c5e35a Logger.warn → Logger.warning
Note: Logger.warning got added in Elixir 1.11.0
2024-06-12 15:18:47 -04:00
d7468558b8 Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-06-04 18:36:25 +02:00
a0eff7cc94 Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-28 16:35:22 +02:00
Lain Soykaf
cc42b50c5b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-feature/akkoma-prune-old-posts 2024-05-28 16:51:19 +04:00
Lain Soykaf
3b4be5daa2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-secure-mode 2024-05-28 12:31:12 +04:00
Lain Soykaf
687ac4a850 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into auth-fetch-exception 2024-05-27 23:09:17 +04:00
lain
121791882f Merge branch 'explicitly-allow-unsafe-2' into 'develop'
Explicitly allow unsafe 2

See merge request pleroma/pleroma!4125
2024-05-27 18:43:05 +00:00
lain
3316a7ab70 Merge branch 'qdrant-search-2' into 'develop'
Search: Basic Qdrant/Ollama search

See merge request pleroma/pleroma!4109
2024-05-27 18:41:20 +00:00
Lain Soykaf
fc7ce339ed Cheatsheet: Add allow_unsafe_eval 2024-05-27 21:28:20 +04:00
a3ea7c9f06 Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-27 18:49:49 +02:00
Mark Felder
f4693dc671 Update Prometheus/Grafana docs for PromEx 2024-05-27 12:18:51 -04:00
Lain Soykaf
d3e85da0fd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into auth-fetch-exception 2024-05-27 19:27:02 +04:00
Lain Soykaf
825b4122a5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-ipfs_uploader 2024-05-27 16:23:40 +04:00
Lain Soykaf
08e9d995f8 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into qdrant-search-2 2024-05-27 13:50:22 +04:00
1028f0907d Merge remote-tracking branch 'origin/develop' into fork 2024-05-25 12:35:59 +02:00