Commit graph

9,943 commits

Author SHA1 Message Date
Henry Jameson
702e6b231c Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-13 15:32:50 +02:00
Henry Jameson
c7501f21a9 lint 2026-03-13 15:32:21 +02:00
Henry Jameson
fb10ee54ed Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-13 13:21:23 +02:00
Henry Jameson
e77e8431c6 fix not synching 2026-03-13 13:21:02 +02:00
Henry Jameson
6e55622963 Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-13 13:15:10 +02:00
Henry Jameson
e610361217 debug 2026-03-13 13:15:05 +02:00
Henry Jameson
71c7bb86f9 Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-13 13:11:55 +02:00
Henry Jameson
1785546120 better logging + needUpload 2026-03-13 13:11:42 +02:00
Henry Jameson
b564fc2d66 remove console logs 2026-03-13 13:09:39 +02:00
Henry Jameson
b29b573b9d Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-13 12:52:43 +02:00
Henry Jameson
2290816e8b fix error 2026-03-13 12:49:34 +02:00
Henry Jameson
756a931ea5 Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-13 12:44:28 +02:00
Henry Jameson
314dc3888c rename prefs to highlight, fix highlight journal replay 2026-03-13 12:18:09 +02:00
Henry Jameson
9ddbd625f6 fix console error 2026-03-13 12:13:32 +02:00
Henry Jameson
3b850ae223 fix 2026-03-13 12:11:43 +02:00
Henry Jameson
3a136f6c11 Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-13 12:10:00 +02:00
Henry Jameson
fda58058a3 debug 2026-03-13 12:09:52 +02:00
Henry Jameson
826e726391 Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-13 12:07:58 +02:00
Henry Jameson
13d9a281c9 debug 2026-03-13 12:07:50 +02:00
Henry Jameson
ca4604602d Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-13 12:01:29 +02:00
Henry Jameson
da49b0d009 highlight sync 2026-03-13 11:52:15 +02:00
Henry Jameson
4e44af04b7 fix pleroma-tan being stabbed by panel-footer 2026-03-13 11:16:45 +02:00
Henry Jameson
a7b2a9a823 please bear with us 2026-03-13 10:54:16 +02:00
Henry Jameson
914df47a35 migration 2026-03-13 10:47:31 +02:00
Henry Jameson
7f42d33f67 Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-12 00:33:05 +02:00
Henry Jameson
d358b8370f update theme loading upon login 2026-03-12 00:32:46 +02:00
Henry Jameson
3a9ff0797b fix palette selectors not working 2026-03-11 23:53:03 +02:00
Henry Jameson
884b47845d Merge branch 'setttingssync' into shigusegubu-themes3 2026-03-11 23:48:44 +02:00
Henry Jameson
d4f8f60475 theme sync attempt 2026-03-11 23:48:23 +02:00
Henry Jameson
53a3c8bcd6 Merge remote-tracking branch 'origin/develop' into setttingssync 2026-03-11 23:33:50 +02:00
HJ
aa8c9fec3b Merge pull request 'Fix emojis breaking user bio editing' (#3483) from shibao/pleroma-fe:fix-emojis into develop
Reviewed-on: https://git.pleroma.social/pleroma/pleroma-fe/pulls/3483
2026-03-09 00:17:47 +00:00
shibao
a1f4dd2142 add changelog note for emojis breaking user bio editing 2026-03-08 16:42:47 +00:00
shibao
6eceac4723 fix emojis breaking user bio editing 2026-03-08 16:41:13 +00:00
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