hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
17,175 commits 1 branch 0 tags 221 MiB
Commit graph

443 commits

Author SHA1 Message Date
Pleroma User
9d6f201e5e Add tos setting 2025-06-20 21:22:27 +00:00
mkljczk
08de5f94e3 Merge remote-tracking branch 'origin/develop' into translate-posts 
Signed-off-by: mkljczk <git@mkljczk.pl>
 2025-03-19 17:59:24 +01:00
mkljczk
fa76bb66f9 Merge remote-tracking branch 'origin/develop' into language-detection 
Signed-off-by: mkljczk <git@mkljczk.pl>
 2025-03-11 20:38:56 +01:00
Lain Soykaf
b469b9d9d3 . 2025-03-10 16:48:54 +04:00
Lain Soykaf
4604f2944e Merge branch 'pleroma-ensure-authorized-fetch' into security-2.9 2025-03-01 14:07:02 +04:00
mkljczk
013c60e13a Merge remote-tracking branch 'origin/develop' into translate-posts 2025-02-22 14:07:23 +01:00
mkljczk
2b1ef1bbdf Merge remote-tracking branch 'origin/develop' into language-detection 2025-02-22 14:05:53 +01:00
mkljczk
4128ea3948 description.exs: Remove suggestion referencing a deleted module 
Signed-off-by: mkljczk <git@mkljczk.pl>
 2025-01-21 18:24:42 +01:00
mkljczk
d818a3d762 Merge remote-tracking branch 'origin/develop' into translate-posts 2024-12-30 18:17:50 +01:00
Mark Felder
1d123832da Formatting 2024-09-17 13:46:49 -04:00
Mark Felder
363b462c54 Make the email attribute configurable 
While here, fix the System.get_env usage to use the normal fallback value method and improve the UID label description
 2024-09-17 13:40:15 -04:00
Mark Felder
14a9663f1a Remove cacertfile as child of SSL and TLS options 
We need to pass the cacerts (list of charlist encoded certs) not cacertfile, so our new cacertfile setting handles this for us.
 2024-09-17 13:40:15 -04:00
Mark Felder
d82abf925d Ensure :cacertfile is configurable in ConfigDB 2024-09-17 13:40:15 -04:00
marcin mikołajczak
309d22aca2 Allow disabling C2S ActivityPub API 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-16 13:44:36 +02:00
marcin mikołajczak
3ee8d0eeaf Merge branch 'post-languages' into translate-posts 2024-08-22 13:07:49 +02:00
marcin mikołajczak
f7a7517296 Merge remote-tracking branch 'origin/develop' into translate-posts 2024-08-02 09:42:17 +02:00
Mark Felder
1d3a92be11 Remove :workers config from ConfigDB 2024-07-30 11:34:53 -04:00
Mark Felder
775f45cfe2 Merge remote-tracking branch 'origin/develop' into oban/backup 2024-07-25 14:43:40 -04: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
Mark Felder
85b81cc933 Remove Logger from ConfigDB descriptions 2024-06-19 10:32:15 -04:00
Haelwenn (lanodan) Monnier
c389ea0f42 Fix compatibility with Loggers in Elixir 1.15+ 2024-06-12 15:18:47 -04:00
marcin mikołajczak
b07fd324fb Merge remote-tracking branch 'origin/develop' into translate-posts 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-06-12 17:13:23 +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
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
marcin mikołajczak
d667049ca9 Merge remote-tracking branch 'origin/develop' into translate-posts 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-05-18 11:15:03 +02:00
marcin mikołajczak
799dc1773d Merge remote-tracking branch 'origin/develop' into language-detection 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-05-18 11:13:09 +02:00
marcin mikołajczak
637f5bc431 Fix type in description 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-04-27 20:29:23 +02:00
marcin mikołajczak
3893311bd2 Merge remote-tracking branch 'origin/develop' into translate-posts 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-04-27 13:48:10 +02:00
marcin mikołajczak
fedae008c8 Deepl: use :base_url 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-04-25 23:47:40 +02:00
marcin mikołajczak
2b739faa7e Rename 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-04-25 23:45:33 +02:00
marcin mikołajczak
066ec8fe95 Update description.exs 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-04-25 23:44:50 +02:00
marcin mikołajczak
90f91168f7 Expose translation service availability 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-04-25 23:43:37 +02:00
marcin mikołajczak
32994bb9c3 Language detection 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-04-25 12:33:40 +02:00
marcin mikołajczak
c0c4a9ed0d Merge remote-tracking branch 'origin/develop' into instance-contact-account 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-03-08 12:12:55 +01:00
marcin mikołajczak
acb9e46074 Add some missing fields to instanceV2 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-02-27 13:25:26 +01:00
marcin mikołajczak
017e35fbf1 Fix some more typos 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-12-28 00:17:04 +01:00
marcin mikołajczak
9fc6676d8c Merge remote-tracking branch 'origin/develop' into instance-contact-account 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-12-22 13:54:44 +01:00
Haelwenn (lanodan) Monnier
1fc53c3077 config/description.exs: Remove quack 
Was already removed in f40ccce7e9
 2023-12-20 16:24:42 -05:00
Mark Felder
cd3abe0b4c Fix more Logger warn -> warning 2023-12-20 16:23:57 -05:00
Haelwenn (lanodan) Monnier
086ba59d03 HTTPSignaturePlug: Add :authorized_fetch_mode_exceptions 2023-12-16 19:25:51 +01:00
Henry Jameson
a5aa8ea796 Add support for configuring a favicon and embed PWA manifest in server-generated-meta 2023-11-14 11:05:23 +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
marcin mikołajczak
6b8c5e12df Add contact account to InstanceView 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2023-10-26 23:32:08 +02:00
Haelwenn
41f2ee69a8 Merge branch 'from/upstream-develop/tusooa/backup-status' into 'develop' 
Detail backup states

Closes #3024

See merge request pleroma/pleroma!3809
 2023-06-27 12:08:11 +00:00
duponin
0231a09310 Remove SSH/BBS feature from core 
And link to sshocial, the replacement client for this removed feature
 2023-04-23 10:47:07 +02:00
tusooa
bc7ec43179
 		Allow customizing instance languages 2023-01-26 20:17:13 -05:00
marcin mikołajczak
6e51845d44 Merge remote-tracking branch 'pleroma/develop' into secure-mode 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-12-27 16:41:16 +01:00