• Joined on 2024-04-08
hj pushed to develop at hj/pleroma-fe 2024-10-09 15:47:16 +03:00
cf7fab7103 Merge branch 'fix-mute-reasons-whitespaces' into 'develop'
bbef4e40df Fix whitespaces for multiple status mute reasons, display bot status reason
bb0a7a81c5 Merge branch 'bookmark-folders' into 'develop'
216ca52073 Merge remote-tracking branch 'origin/develop' into bookmark-folders
a1c3a7a742 Merge branch 'shadow-control-2.0' into 'develop'
Compare 483 commits »
hj pushed to shigusegubu at hj/pleroma 2024-10-08 18:39:21 +03:00
hj pushed to shigusegubu at hj/pleroma 2024-10-08 18:38:52 +03:00
hj pushed to shigusegubu at hj/pleroma 2024-10-08 18:01:10 +03:00
8b249431da Merge remote-tracking branch 'origin/develop' into shigusegubu
07cfbe4ae8 Merge branch 'profile-image-descriptions' into 'develop'
d2eb4992e2 Merge branch 'elixir-1.14-docker' into 'develop'
a1e3fb506b Dockerfile: Elixir 1.14
bc1b4f0be7 Merge branch 'features/mrf-id_filter' into 'develop'
Compare 151 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2024-10-07 12:30:30 +03:00
0da9ba1b7a Merge branch 'themes3-grand-finale-maybe' into shigusegubu-themes3
Compare 2 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2024-10-07 12:25:52 +03:00
f8b39faae7 Merge branch 'themes3-grand-finale-maybe' into shigusegubu-themes3
4d472e1d4b fix my phone
4f66731723 lookin' good
f0e5b0be1e cleanup
f75ea738ca better cValue logic in shadow-control
Compare 15 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2024-10-06 01:57:44 +03:00
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2024-10-06 01:51:53 +03:00
d647cd82d1 Merge branch 'themes3-grand-finale-maybe' into shigusegubu-themes3
bae4836349 palettes editor done
3f55c08693 work on palette editor
Compare 3 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2024-10-05 23:15:20 +03:00
e2705f57b1 Merge branch 'themes3-grand-finale-maybe' into shigusegubu-themes3
191609c662 Merge remote-tracking branch 'origin/develop' into themes3-grand-finale-maybe
2df431ea17 missing strings
Compare 4 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2024-10-05 19:32:12 +03:00
761cc52be7 palette and style for v3
f161cc4113 restore sgsgb palettes
Compare 2 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2024-10-05 19:24:40 +03:00
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2024-10-05 19:07:15 +03:00
b0b6380ea4 Merge branch 'themes3-grand-finale-maybe' into shigusegubu-themes3
Compare 2 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2024-10-05 18:55:24 +03:00
d818b47938 Merge branch 'themes3-grand-finale-maybe' into shigusegubu-themes3
16610c8a12 Merge remote-tracking branch 'origin/develop' into shigusegubu-themes3
8163366402 Merge remote-tracking branch 'origin/develop' into shigusegubu-clean
2884d6e9ba Merge branch 'admin-dashboard-fixes' into shigusegubu-clean
Compare 4 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2024-10-05 18:48:30 +03:00
812ba9d47b post merge fixes
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2024-10-05 18:47:35 +03:00
f354de14cc Merge branch 'themes3-grand-finale-maybe' into shigusegubu-themes3
48cc7ccc78 don't normalize theme and split index fetching into its own block
a21f25ed8e test fix
3d77860e57 moved the select motion stuff into its own component
Compare 9 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2024-10-04 14:58:33 +03:00
322cd6d5e0 test fix
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2024-10-04 13:12:39 +03:00
7ddc8822f4 Merge remote-tracking branch 'origin/develop' into shigusegubu-themes3
bb0a7a81c5 Merge branch 'bookmark-folders' into 'develop'
216ca52073 Merge remote-tracking branch 'origin/develop' into bookmark-folders
a1c3a7a742 Merge branch 'shadow-control-2.0' into 'develop'
56a3bff267 Merge branch 'splashscreen' into 'develop'
Compare 17 commits »
hj pushed to shigusegubu-themes3 at hj/pleroma-fe 2024-10-03 02:21:49 +03:00
e7406974d5 Merge branch 'themes3-grand-finale-maybe' into shigusegubu-themes3
13838a75a9 import of v2 on appearance tab works now
20e6382df6 fix states not showing, move palette out of the way
dee3cf7883 migrate all other function calls to new format
ab295c588d better input styles
Compare 45 commits »
hj pushed to shigusegubu-clean at hj/pleroma-fe 2024-10-03 02:19:14 +03:00
8163366402 Merge remote-tracking branch 'origin/develop' into shigusegubu-clean
hj created branch shigusegubu-clean in hj/pleroma-fe 2024-10-03 02:19:14 +03:00