FloatingGhost
|
5dabf69757
|
Add timeline visibility options
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-08-31 14:30:18 +02:00 |
|
floatingghost
|
df06fc44e6
|
add bubble timeline (#100)
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/100
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-08-31 14:19:24 +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 |
|
|
|
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
|
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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
7a03e49c4d
|
Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-05-14 18:10:03 +02:00 |
|
|
|
8c3f306c62
|
Revert to pleroma' card parser
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-05-14 17:54:13 +02:00 |
|
|
|
637f5bc431
|
Fix type in description
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-04-27 20:29:23 +02: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 |
|
|
|
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 |
|
|
|
acb9e46074
|
Add some missing fields to instanceV2
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-02-27 13:25:26 +01:00 |
|
|
|
eb1995d7c6
|
Add test for translateLocally
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2024-02-13 20:10:10 +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 |
|
|
|
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 |
|
|
|
96747ece8d
|
Merge remote-tracking branch 'origin/develop' into multitenancy
|
2023-11-28 13:50:56 +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 |
|
|
|
1ee3ba5fd3
|
Optionally filter local timelines according to domain
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-11-16 17:31:36 +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 |
|
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 |
|
|
|
34c142e672
|
lint
Signed-off-by: Marcin Mikołajczak <git@mkljczk.pl>
|
2023-11-11 19:13:37 +01: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 |
|
|
|
6b8c5e12df
|
Add contact account to InstanceView
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-10-26 23:32:08 +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
|
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 |
|
|
|
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 |
|
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 |
|
|
|
bda8589f16
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-03-15 19:39:24 +01:00 |
|
tusooa
|
bc7ec43179
|
Allow customizing instance languages
|
2023-01-26 20:17:13 -05:00 |
|
|
|
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 |
|
tusooa
|
179efd9467
|
Make backup parameters configurable
|
2022-12-24 00:20:25 -05:00 |
|
|
|
e3970f730c
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-12-23 19:45:55 +01:00 |
|
