• Joined on 2024-04-08
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-13 13:12:06 +02:00
71c7bb86f9 Merge branch 'setttingssync' into shigusegubu-themes3
1785546120 better logging + needUpload
b564fc2d66 remove console logs
Compare 3 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-13 12:52:50 +02:00
b29b573b9d Merge branch 'setttingssync' into shigusegubu-themes3
2290816e8b fix error
Compare 2 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-13 12:44:34 +02:00
756a931ea5 Merge branch 'setttingssync' into shigusegubu-themes3
314dc3888c rename prefs to highlight, fix highlight journal replay
9ddbd625f6 fix console error
Compare 4 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-13 12:10:05 +02:00
3a136f6c11 Merge branch 'setttingssync' into shigusegubu-themes3
Compare 2 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-13 12:08:03 +02:00
826e726391 Merge branch 'setttingssync' into shigusegubu-themes3
Compare 2 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-13 12:01:36 +02:00
ca4604602d Merge branch 'setttingssync' into shigusegubu-themes3
da49b0d009 highlight sync
4e44af04b7 fix pleroma-tan being stabbed by panel-footer
a7b2a9a823 please bear with us
914df47a35 migration
Compare 5 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-12 00:33:11 +02:00
7f42d33f67 Merge branch 'setttingssync' into shigusegubu-themes3
d358b8370f update theme loading upon login
3a9ff0797b fix palette selectors not working
Compare 3 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-11 23:48:50 +02:00
884b47845d Merge branch 'setttingssync' into shigusegubu-themes3
d4f8f60475 theme sync attempt
53a3c8bcd6 Merge remote-tracking branch 'origin/develop' into setttingssync
aa8c9fec3b Merge pull request 'Fix emojis breaking user bio editing' (#3483) from shibao/pleroma-fe:fix-emojis into develop
a1f4dd2142 add changelog note for emojis breaking user bio editing
Compare 6 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-06 17:55:46 +02:00
11045fd81c Merge branch 'setttingssync' into shigusegubu-themes3
773c56f69d fix build
Compare 4 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-06 17:15:42 +02:00
ab7fb1ba51 Merge branch 'setttingssync' into shigusegubu-themes3
e582b23ad7 fix test from another MR
b09efcb5f3 more test fixes
7505c94986 test fix
Compare 4 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-06 16:35:17 +02:00
bb24349c68 Merge branch 'setttingssync' into shigusegubu-themes3
Compare 2 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-06 15:44:27 +02:00
98b2e1e829 Merge branch 'setttingssync' into shigusegubu-themes3
97a50cba7e fix notifications
Compare 2 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-06 15:35:05 +02:00
183bd73af0 Merge branch 'setttingssync' into shigusegubu-themes3
65cb78eef8 user_highlight
Compare 2 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-06 15:31:30 +02:00
9bb9192f0f Merge branch 'setttingssync' into shigusegubu-themes3
adfe233250 oops forgot a file
Compare 2 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-06 15:26:10 +02:00
8edee4bd9d Merge branch 'setttingssync' into shigusegubu-themes3
Compare 2 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-06 15:22:11 +02:00
e84fb2acad Merge branch 'setttingssync' into shigusegubu-themes3
bc97016ea3 user highlight
Compare 2 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-03-06 13:33:51 +02:00
fbfd62d98a Merge branch 'setttingssync' into shigusegubu-themes3
eb7cff467e more settings made local-only
44ae68b025 Merge remote-tracking branch 'origin/develop' into setttingssync
e3234226a3 Merge pull request 'fix bio being interpreted as html for editing' (#3482) from fix-bio-18 into develop
Compare 25 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-02-27 17:55:50 +02:00
e804a6aa06 Merge branch 'setttingssync' into shigusegubu-themes3
f1b6e8417d fix uninitialized badly-stored local config
Compare 2 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-02-27 17:41:47 +02:00
0ed54185b4 Merge branch 'setttingssync' into shigusegubu-themes3
85ac9a21fe use merged config for dontShowUpdateNotifs
Compare 2 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2026-02-27 17:13:08 +02:00
5655875e16 Merge branch 'setttingssync' into shigusegubu-themes3
Compare 2 commits »