Commit graph

9,910 commits

Author SHA1 Message Date
Henry Jameson
11045fd81c Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-06 17:55:38 +02:00
Henry Jameson
773c56f69d fix build 2026-03-06 17:53:40 +02:00
Henry Jameson
f0aa25059b lint 2026-03-06 17:48:56 +02:00
Henry Jameson
35a1dec8a5 lint 2026-03-06 17:31:34 +02:00
Henry Jameson
ab7fb1ba51 Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-06 17:15:35 +02:00
Henry Jameson
e582b23ad7 fix test from another MR 2026-03-06 17:14:29 +02:00
Henry Jameson
b09efcb5f3 more test fixes 2026-03-06 17:10:56 +02:00
Henry Jameson
7505c94986 test fix 2026-03-06 16:53:25 +02:00
Henry Jameson
bb24349c68 Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-06 16:35:13 +02:00
Henry Jameson
bcb13f3a49 tests 2026-03-06 16:35:02 +02:00
Henry Jameson
98b2e1e829 Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-06 15:44:20 +02:00
Henry Jameson
97a50cba7e fix notifications 2026-03-06 15:44:13 +02:00
Henry Jameson
183bd73af0 Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-06 15:35:00 +02:00
Henry Jameson
65cb78eef8 user_highlight 2026-03-06 15:34:52 +02:00
Henry Jameson
9bb9192f0f Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-06 15:31:23 +02:00
Henry Jameson
adfe233250 oops forgot a file 2026-03-06 15:31:07 +02:00
Henry Jameson
8edee4bd9d Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-06 15:26:04 +02:00
Henry Jameson
18a3bbbd49 lint 2026-03-06 15:25:30 +02:00
Henry Jameson
e84fb2acad Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-06 15:22:05 +02:00
Henry Jameson
bc97016ea3 user highlight 2026-03-06 15:21:38 +02:00
Henry Jameson
fbfd62d98a Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-06 13:33:42 +02:00
Henry Jameson
eb7cff467e more settings made local-only 2026-03-06 13:33:28 +02:00
Henry Jameson
44ae68b025 Merge remote-tracking branch 'origin/develop' into setttingssync 2026-03-06 13:14:24 +02:00
HJ
e3234226a3 Merge pull request 'fix bio being interpreted as html for editing' (#3482) from fix-bio-18 into develop
Reviewed-on: https://git.pleroma.social/pleroma/pleroma-fe/pulls/3482
2026-03-06 11:08:39 +00:00
Henry Jameson
8a43624f2e lint 2026-03-06 13:07:28 +02:00
Henry Jameson
98e2a60948 fix bio being interpreted as html for editing 2026-03-06 13:04:33 +02:00
Henry Jameson
a605e4c337 fix error with themes index 2026-03-06 12:56:59 +02:00
Henry Jameson
bc70905d96 fix crash when editing profile 2026-03-06 12:56:59 +02:00
Henry Jameson
42cd240347 cleanup warnings 2026-03-06 12:53:48 +02:00
HJ
9967f453e7 Merge pull request 'attachment: fix over reliance on fileType()' (#3479) from Yonle/pleroma-fe:filetypeservice-1 into develop
Reviewed-on: https://git.pleroma.social/pleroma/pleroma-fe/pulls/3479
2026-03-04 18:41:30 +00:00
Yonle
f40fdf1240
attachment&gallery: code: use === instead of == 2026-03-03 12:52:17 +07:00
HJ
fa53bd2ebe Merge pull request 'Readd issue and PR templates' (#3471) from phnt/pleroma-fe:forgejo-templates into develop
Reviewed-on: https://git.pleroma.social/pleroma/pleroma-fe/pulls/3471
2026-03-02 21:20:05 +00:00
HJ
a9172acd35 Merge pull request 'Fix HTML attribute parsing for escaped quotes' (#3476) from mkljczk/pleroma-fe:attrs-parsing-fix into develop
Reviewed-on: https://git.pleroma.social/pleroma/pleroma-fe/pulls/3476
2026-03-02 21:18:27 +00:00
HJ
edaff65ce6 Merge pull request 'Update git links in docs, remove /api/statusnet/config.json mention' (#3480) from mkljczk/pleroma-fe:docs-updates into develop
Reviewed-on: https://git.pleroma.social/pleroma/pleroma-fe/pulls/3480
2026-03-02 21:12:35 +00:00
HJ
a9a86bdbdc Merge pull request 'list_edit: setListAccounts() is never an Promise<>, So don't need to use .then()' (#3481) from Yonle/pleroma-fe:list_edit_fix-1 into develop
Reviewed-on: https://git.pleroma.social/pleroma/pleroma-fe/pulls/3481
2026-03-02 21:11:56 +00:00
Yonle
4faf6d8b0d
list_edit: setListAccounts() is never an Promise<>, So don't need to use .then() 2026-02-28 16:13:17 +07:00
nicole mikołajczyk
1727a7e266 Update git links in docs, remove /api/statusnet/config.json mention
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
2026-02-27 19:19:09 +01:00
Henry Jameson
e804a6aa06 Merge branch 'setttingssync' into shigusegubu-themes3 2026-02-27 17:55:43 +02:00
Henry Jameson
f1b6e8417d fix uninitialized badly-stored local config 2026-02-27 17:55:27 +02:00
Henry Jameson
0ed54185b4 Merge branch 'setttingssync' into shigusegubu-themes3 2026-02-27 17:41:41 +02:00
Henry Jameson
85ac9a21fe use merged config for dontShowUpdateNotifs 2026-02-27 17:41:22 +02:00
Yonle
68eab91db8
gallery: use Set on displaytypes instead 2026-02-27 22:14:01 +07:00
Yonle
0c3d81d0a0
user_card: fix avatar not clickable 2026-02-27 22:13:44 +07:00
Henry Jameson
5655875e16 Merge branch 'setttingssync' into shigusegubu-themes3 2026-02-27 17:13:00 +02:00
Henry Jameson
d5222ff212 typo 2026-02-27 17:12:51 +02:00
Henry Jameson
e127895568 Merge branch 'setttingssync' into shigusegubu-themes3 2026-02-27 16:21:18 +02:00
Henry Jameson
463cc2ef5c local indicator 2026-02-27 16:19:54 +02:00
Henry Jameson
449c244d11 work on local-only settings 2026-02-27 15:49:44 +02:00
Henry Jameson
24be3da17e take local config into account for mergedConfig 2026-02-27 15:08:41 +02:00
Henry Jameson
dbdec60110 fix emoji size setting not working 2026-02-27 14:46:01 +02:00