|
|
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 |
|
|
|
bd33a7ac8f
|
Remove stuff I don't need to stay closer to upstream
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-03-12 16:07:29 +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 |
|
|
|
b39403a48f
|
Update API docs for my changes
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-01-17 17:13:21 +01:00 |
|
Haelwenn
|
355487041a
|
We are unsure if OTP27 will bring more breaking changes
|
2024-01-16 11:22:34 -05:00 |
|
Mark Felder
|
63a74f7b6d
|
Support for Erlang OTP 26
|
2023-12-29 23:22:31 -05: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 |
|
lain
|
bc7fcc2dba
|
Merge branch 'vips' into 'develop'
Docs: Remove rust references
See merge request pleroma/pleroma!3983
|
2023-11-29 15:43:09 +00:00 |
|
lain
|
1955b3c557
|
Merge branch 'vips' into 'develop'
Replace ImageMagick with Vips
See merge request pleroma/pleroma!3771
|
2023-11-29 06:03:37 +00:00 |
|
|
|
96747ece8d
|
Merge remote-tracking branch 'origin/develop' into multitenancy
|
2023-11-28 13:50:56 +01:00 |
|
Lain Soykaf
|
10525ac7f8
|
Docs: Remove rust references
|
2023-11-28 15:21:34 +04:00 |
|
HJ
|
9c57f17af3
|
Merge branch 'frontends-docs' into 'develop'
Front-ends management docs
See merge request pleroma/pleroma!3974
|
2023-11-27 14:00:12 +00: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 |
|
Henry Jameson
|
2112e8b5e4
|
update, add images
|
2023-11-19 10:30:49 +02:00 |
|
|
|
c78495900e
|
Merge remote-tracking branch 'origin/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-11-17 22:53:06 +01:00 |
|
feld
|
906b121a10
|
Merge branch 'develop' into 'vips'
# Conflicts:
# mix.exs
|
2023-11-17 16:50:36 +00:00 |
|
Mark Felder
|
be39146ecc
|
Update docs to include dependencies on rust and vips where appropriate
|
2023-11-17 11:44:33 -05:00 |
|
|
|
a1a6abf6c6
|
Merge remote-tracking branch 'origin/develop' into multitenancy
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-11-14 13:56:33 +01:00 |
|
Haelwenn (lanodan) Monnier
|
19519d6c96
|
docs: clang is also supported
|
2023-11-14 10:47:34 +01:00 |
|
Haelwenn (lanodan) Monnier
|
3831d31009
|
docs: Put a max version on erlang and elixir
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3194
|
2023-11-14 10:47:33 +01:00 |
|
Lain Soykaf
|
0c5cc51983
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-meilisearch
|
2023-11-12 13:53:18 +04:00 |
|
Henry Jameson
|
637926dcbb
|
Initial draft on frontends management
|
2023-11-10 13:58:25 +02:00 |
|
|
|
182e0b58da
|
Add initial docs page, improve adding domains
Signed-off-by: Marcin Mikołajczak <git@mkljczk.pl>
|
2023-11-10 00:53:17 +01: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 |
|
tusooa
|
e349e92a44
|
Add mrf to force link tag of quoting posts
|
2023-09-13 19:20:30 -04:00 |
|
tusooa
|
163e563733
|
Allow more flexibility in InlineQuotePolicy
|
2023-09-13 19:19:05 -04:00 |
|
Alex Gleason
|
57ef1d1211
|
Add InlineQuotePolicy to force quote URLs inline
|
2023-09-13 19:19:04 -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 |
|
|
|
cc5053fb92
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
|
2023-08-05 15:26:32 +02:00 |
|
Haelwenn (lanodan) Monnier
|
0e321698d2
|
gentoo_otp_en.md: Indicate which install method it covers
|
2023-08-04 17:11:20 +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 |
|
tusooa
|
ef8a6c539a
|
Make EmojiPolicy aware of custom emoji reactions
|
2023-07-07 06:58:31 -04:00 |
|
tusooa
|
18a8378beb
|
Update config cheatsheet
|
2023-07-07 06:58:31 -04:00 |
|
tusooa
|
7da6a82dbd
|
Merge branch 'deprecate-scrobbles' into 'develop'
Deprecate audio scrobbling
See merge request pleroma/pleroma!3919
|
2023-07-04 02:46:10 +00:00 |
|
Haelwenn (lanodan) Monnier
|
0c3709173f
|
docs: Fix broken links
|
2023-07-04 04:23:48 +02:00 |
|
Haelwenn (lanodan) Monnier
|
3d79ceb23a
|
Deprecate audio scrobbling
|
2023-07-04 03:40:11 +02:00 |
|
Haelwenn
|
6fbbf80800
|
Merge branch 'gentoo_otp' into 'develop'
Packaged installation guide for gentoo
See merge request pleroma/pleroma!3906
|
2023-07-03 21:04:23 +00:00 |
|
Haelwenn
|
2b9cd25cf4
|
Merge branch 'tusooa/media-altdomain' into 'develop'
Add instructions to serve media on another domain
See merge request pleroma/pleroma!3892
|
2023-07-02 21:30:16 +00:00 |
|
