|
|
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 |
|
|
|
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 |
|
|
|
1028f0907d
|
Merge remote-tracking branch 'origin/develop' into fork
|
2024-05-25 12:35:59 +02:00 |
|
|
|
618b77071a
|
Update pleroma_api.md
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-05-25 09:12:37 +02:00 |
|
|
|
cd86965cde
|
Add hint to rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-04-06 12:01:04 +02:00 |
|
|
|
5cc2f89707
|
Update Admin API docs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-04-06 11:59:53 +02:00 |
|
|
|
ccc3ac241f
|
Add hint to rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-04-06 11:45:19 +02:00 |
|
|
|
01a5f839c5
|
Merge remote-tracking branch 'origin/develop' into instance_rules
|
2024-04-06 10:42:23 +02:00 |
|
|
|
8b92459345
|
Merge remote-tracking branch 'origin/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-18 22:00:35 +01:00 |
|
|
|
918c406a91
|
Merge remote-tracking branch 'origin/develop' into instance_rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-18 13:50:25 +01:00 |
|
lain
|
2b71f4897f
|
Merge branch 'develop' into 'bookmark-folders'
# Conflicts:
# docs/development/API/differences_in_mastoapi_responses.md
|
2024-03-18 10:35:02 +00:00 |
|
|
|
51edd70319
|
Merge branch 'bookmark-folders' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-14 23:32:16 +01:00 |
|
|
|
53a73aada2
|
Merge branch 'multitenancy' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-14 23:29:24 +01:00 |
|
|
|
6e6d07d9d4
|
Update Pleroma API docs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-14 23:13:20 +01:00 |
|
|
|
d7209efcba
|
Update MastoAPI docs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-14 23:12:54 +01:00 |
|
|
|
e9e2b18650
|
Merge branch 'webhooks_' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-14 23:06:25 +01:00 |
|
|
|
0f33698747
|
Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-12 23:08:40 +01:00 |
|
|
|
d415686bb9
|
Allow to group bookmarks in folders
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-01 11:04:01 +01:00 |
|
|
|
913465f3d2
|
Merge remote-tracking branch 'origin/develop' into multitenancy-v2
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-01-24 16:59:21 +01:00 |
|
Haelwenn
|
ab3f03a04a
|
Merge branch 'develop' into 'public-polls'
# Conflicts:
# docs/development/API/differences_in_mastoapi_responses.md
|
2024-01-21 12:03:29 +00:00 |
|
|
|
fa02a1e634
|
Update MastoAPI responses docs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-01-19 18:05:50 +01:00 |
|
|
|
90b442727e
|
Update Admin API docs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-01-19 17:53:37 +01:00 |
|
|
|
b39403a48f
|
Update API docs for my changes
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-01-17 17:13:21 +01:00 |
|
|
|
017e35fbf1
|
Fix some more typos
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-12-28 00:17:04 +01:00 |
|
|
|
3ed4ae17bb
|
Merge remote-tracking branch 'origin/develop' into webhooks_
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-12-22 13:58:25 +01:00 |
|
Mark Felder
|
bf57fd82bb
|
Clarify location of test.secret.exs file
|
2023-12-20 14:12:06 -05:00 |
|
|
|
45e70ca6ab
|
Update docs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-11-21 23:06:04 +01:00 |
|
marcin mikołajczak
|
fdbcf99836
|
Merge branch 'merge-pleroma' into 'develop'
Merge pleroma
See merge request soapbox-pub/rebased!268
|
2023-11-21 21:23:21 +00:00 |
|
|
|
0ebbe8d9d7
|
Merge remote-tracking branch 'pleroma/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-10-28 00:30:08 +02:00 |
|
|
|
1e7e9b77d8
|
Undeprecate audio scrobbling
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-10-28 00:27:57 +02:00 |
|
tusooa
|
7f12ad6dcc
|
Fix docs wording
|
2023-10-15 17:20:25 -04:00 |
|
tusooa
|
2d43067946
|
Document the streaming endpoint
|
2023-10-15 17:20:25 -04:00 |
|
|
|
e79b26a3b4
|
Add documentation for webhooks API
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-08-15 00:13:57 +02:00 |
|
|
|
f1592b2947
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-07-26 22:32:27 +02:00 |
|
Haelwenn (lanodan) Monnier
|
3d79ceb23a
|
Deprecate audio scrobbling
|
2023-07-04 03:40:11 +02:00 |
|
|
|
94cdedc6c9
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-05-09 22:27:06 +02:00 |
|
Ekaterina Vaartis
|
d3b27d45a9
|
List installed frontend refs in admin API
|
2023-03-29 23:23:06 +03:00 |
|
Alex Gleason
|
ab2d8817a9
|
Merge remote-tracking branch 'pleroma/2061-chat-deletion' into delete-chat
|
2022-12-08 11:06:12 -06:00 |
|
|
|
1d6b91c071
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-11-23 15:33:54 +01:00 |
|
Mark Felder
|
c7a0df8006
|
Remove Quack from docs and cheatsheet
|
2022-11-18 10:09:52 -05:00 |
|
Alex Gleason
|
39d7093ff5
|
Remove Shout feature
|
2022-11-03 13:29:52 -05:00 |
|
Haelwenn
|
e40c221c31
|
Merge branch 'from/upstream-develop/tusooa/edits' into 'develop'
Editing
Closes #1429, #2859, and #2288
See merge request pleroma/pleroma!3678
|
2022-09-03 02:16:42 +00:00 |
|
Haelwenn
|
93f12c0d0d
|
Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'
Synchronized settings for apps (frontends)
See merge request pleroma/pleroma!3698
|
2022-08-12 01:34:36 +00:00 |
|
