Commit graph

10,035 commits

Author SHA1 Message Date
Henry Jameson
0a7a2f0da4 Merge branch 'setttingssync' into shigusegubu-themes3 2026-02-13 09:09:02 +02:00
Henry Jameson
e9993e8d5a config.mergedConfig -> syncConfig.mergedConfig 2026-02-13 09:07:03 +02:00
Henry Jameson
0a00ce025a lint 2026-02-13 08:37:07 +02:00
Henry Jameson
5aec0faa2c modify logic behind push notification subscriptions 2026-02-12 22:24:33 +02:00
Henry Jameson
a91821933f rewrote push notifications plugin 2026-02-12 22:14:52 +02:00
Henry Jameson
90ac30249b post-merge headache 2026-02-12 22:14:44 +02:00
Henry Jameson
3530830b07 Merge branch 'develop' into setttingssync 2026-02-12 17:16:18 +02:00
HJ
2881b31ff2 Merge pull request 'instance-migration' (#3470) from instance-migration into develop
Reviewed-on: https://git.pleroma.social/pleroma/pleroma-fe/pulls/3470
2026-02-12 12:42:38 +00:00
HJ
0f5c9ace4f Merge pull request 'Fix iOS scroll' (#3472) from fix-ios-scroll into develop
Reviewed-on: https://git.pleroma.social/pleroma/pleroma-fe/pulls/3472
2026-02-11 20:22:25 +00:00
Henry Jameson
9ae56174c9 Fix iOS scroll not working in settings modal 2026-02-11 22:21:05 +02:00
Henry Jameson
b0dc2dd74a test 2026-02-11 21:26:39 +02:00
Henry Jameson
db2f48a1f9 lint 2026-02-11 20:42:31 +02:00
Henry Jameson
cafe49de11 Merge branch 'instance-migration' into shigusegubu-themes3 2026-02-11 00:39:50 +02:00
Henry Jameson
4cd6c6e9f0 Merge branch 'instance-migration' of ssh://git.pleroma.social/pleroma/pleroma-fe into instance-migration 2026-02-11 00:39:39 +02:00
Henry Jameson
fd2986ea85 fix tests 2026-02-10 21:29:48 +02:00
Henry Jameson
b2011429c6 Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma-fe into instance-migration 2026-02-10 19:01:51 +02:00
Henry Jameson
8dce2d75aa fix featurespanel 2026-02-10 18:54:42 +02:00
Henry Jameson
fbf01fce09 fix featurespanel 2026-02-10 18:54:07 +02:00
Henry Jameson
d0202e9ca9 Merge branch 'instance-migration' into shigusegubu-themes3 2026-02-05 01:40:10 +02:00
Henry Jameson
c87abc9eb7 avoid collision with a keyword 2026-02-05 01:28:56 +02:00
Henry Jameson
9060977790 lint 2026-02-05 01:24:53 +02:00
Henry Jameson
7c6ce89b6e Merge branch 'instance-migration' into shigusegubu-themes3 2026-02-05 01:21:06 +02:00
Henry Jameson
6750397ef7 fix custom emoji reacts now working 2026-02-05 01:19:03 +02:00
Henry Jameson
58f06dea94 fixed hideISP 2026-02-05 01:17:20 +02:00
Henry Jameson
8985094644 changelog 2026-02-05 01:02:44 +02:00
Henry Jameson
13cd50886b fix vertical tab switcher 2026-02-05 01:01:47 +02:00
Henry Jameson
c5aee1c012 Revert "undo tabswitcher-related changes"
This reverts commit 92d0916f40.
2026-02-05 01:01:10 +02:00
Henry Jameson
92d0916f40 undo tabswitcher-related changes 2026-02-05 00:59:26 +02:00
Henry Jameson
1fcc7c6ae8 fix error in console 2026-02-05 00:34:53 +02:00
Henry Jameson
c2f5840a02 move scrobblesAvailable to instance capabilities store 2026-02-05 00:34:14 +02:00
Henry Jameson
1e93e0a9c3 separate featureset into instancecapabilites store 2026-02-05 00:28:45 +02:00
Henry Jameson
b419408643 Merge branch 'instance-migration' into shigusegubu-themes3 2026-01-29 21:42:10 +02:00
Henry Jameson
848d48e404 fix bookmarks 2026-01-29 21:42:02 +02:00
Henry Jameson
04f9547c13 fix bookmarks 2026-01-29 21:41:34 +02:00
Henry Jameson
0fec78ec81 Merge branch 'instance-migration' into shigusegubu-themes3 2026-01-29 21:33:04 +02:00
Henry Jameson
20e781c71d fix ISP (again) 2026-01-29 21:32:53 +02:00
Henry Jameson
e3a441310f fix/revert privateMode to avoid conflict with keyword 2026-01-29 21:32:37 +02:00
Henry Jameson
6eb94da3e8 make sw shut up 2026-01-29 21:24:21 +02:00
Henry Jameson
775a469507 fix background 2026-01-29 21:24:18 +02:00
Henry Jameson
4ea48dafb9 Merge branch 'instance-migration' into shigusegubu-themes3 2026-01-29 21:15:30 +02:00
Henry Jameson
3cdcfe19f4 minor change for consistency sake 2026-01-29 21:15:17 +02:00
Henry Jameson
74d83a996c ISP fixes 2026-01-29 21:06:42 +02:00
Henry Jameson
7d5c2e32cc Merge branch 'instance-migration' into shigusegubu-themes3 2026-01-29 20:50:13 +02:00
Henry Jameson
3e71833cab typos 2026-01-29 20:50:04 +02:00
Henry Jameson
a96e3b4b5d Merge branch 'instance-migration' into shigusegubu-themes3 2026-01-29 20:47:31 +02:00
Henry Jameson
d028a86013 always include .js for stores 2026-01-29 20:44:55 +02:00
Henry Jameson
18d8ea6b63 better lint 2026-01-29 20:40:00 +02:00
Henry Jameson
e554eeeef6 separation support 2026-01-29 20:37:48 +02:00
Henry Jameson
5e21134d9b move stickers to emoji store 2026-01-29 15:14:17 +02:00
Henry Jameson
573a980512 separation 2026-01-29 15:11:47 +02:00