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
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
Mint
1de5208a9e
Cheatsheet: add Mua mail adapter config
2024-09-17 22:03:43 +03: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
Mark Felder
5539fea3bb
LDAP: permit overriding the CA root
2024-09-14 20:36:24 -04: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
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
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
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
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
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
c67506ba68
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into auth-fetch-exception
2024-05-20 18:21:46 +04:00
Lain Soykaf
dbaab6f54e
Docs: Mention running the Qdrant server
2024-05-19 13:38:31 +04:00
Lain Soykaf
6ec306d068
Docs: Add more information about index memory consumption.
2024-05-19 13:24:24 +04:00
Lain Soykaf
6a3a0cc0f5
Docs: Write docs for the QdrantSearch
2024-05-19 13:20:37 +04:00
Lain Soykaf
e142ea400a
Docs: Switch docs from Ollama to OpenAI.
2024-05-19 12:42:08 +04:00
8c3f306c62
Revert to pleroma' card parser
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-14 17:54:13 +02:00
Lain Soykaf
c50f0f31f4
Docs/Search: Add basic documentation of the qdrant search
2024-05-14 16:56:58 +04: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
53a73aada2
Merge branch 'multitenancy' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:29:24 +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
9cfa4e67b1
Add ForceMention mrf
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-01 18:16:09 +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
017e35fbf1
Fix some more typos
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-12-28 00:17:04 +01:00
Haelwenn (lanodan) Monnier
086ba59d03
HTTPSignaturePlug: Add :authorized_fetch_mode_exceptions
2023-12-16 19:25:51 +01: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
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
Lain Soykaf
0c5cc51983
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-meilisearch
2023-11-12 13:53:18 +04: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
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
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
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
Alex Gleason
944fd73b36
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
2023-06-05 15:38:19 -05:00
Sean King
c9cb90ff4f
Media proxy base URL doesn't need /proxy
2023-05-31 17:49:06 -06:00
Sean King
a2bbd7c9da
Fix base media and proxy URL in instructions to serve media on another domain
2023-05-31 12:22:13 -06:00
