2748 Commits

Author SHA1 Message Date
Echo
3d0a6ba831
Emoji: Cache data by path instead of just Etag (#37858) 2026-02-13 15:23:22 +00:00
Echo
f5aa5adcf7
Profile redesign: About tab (#37851) 2026-02-13 13:37:39 +00:00
Claire
ddc7df2064 Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream 2026-02-13 13:03:51 +01:00
Echo
45057d1df2
Fixes appearing in Following list (#37854) 2026-02-13 10:03:57 +00:00
Claire
e451416d90 Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream 2026-02-12 18:00:45 +01:00
diondiondion
c44cc1f5c3
Implement Collection list item design (#37850) 2026-02-12 16:30:10 +00:00
diondiondion
e4bb347f72
Theme tokens sync (#37841) 2026-02-12 11:33:28 +00:00
Claire
2373c5a132 Merge commit 'ca9966ce2ff79dcac90b2feced65fa991534d53e' into glitch-soc/merge-upstream 2026-02-11 20:26:56 +01:00
diondiondion
f99c60a8f3
Add useStorageState hook (#37825) 2026-02-11 13:30:53 +00:00
Echo
bbd88d356d
Profile redesign: Show yourself in follower list (#37813) 2026-02-11 13:19:18 +00:00
Claire
4fbd1ad7ae Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream
Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.

They were all manually resolved by adapting the relevant code.
2026-02-11 13:32:18 +01:00
Echo
0279a52216
Profile redesign: Account filter fixes (#37811) 2026-02-10 17:20:02 +00:00
Claire
d89db37e93 Merge commit 'fb89198460f9cebf624cc5ca0b139563ae4fd120' into glitch-soc/merge-upstream 2026-02-10 18:02:15 +01:00
Echo
fb89198460
Profile redesign: Quality pass (#37766) 2026-02-10 10:56:03 +00:00
Claire
8f58c42ca3 Merge commit '2e30044a374811bc94fd62a8159cb2c9ffe18a4d' into glitch-soc/merge-upstream 2026-02-06 22:45:55 +01:00
Echo
2e30044a37
Profile redesign: Pinned posts (#37761)
Co-authored-by: diondiondion <mail@diondiondion.com>
2026-02-06 14:53:34 +00:00
diondiondion
7e27ba990e
Move account search into hook (#37762) 2026-02-06 13:08:29 +00:00
Echo
7a4945c0d3
Show mute end date in badge (#37747) 2026-02-05 20:01:28 +00:00
Claire
3bbc8ecf92 Merge commit '8ebe2e673e2fd175140df7275eb362c8eecfec31' into glitch-soc/merge-upstream 2026-02-04 19:23:24 +01:00
diondiondion
8ebe2e673e
Split collection editor into dedicated routes (#37731) 2026-02-04 17:45:41 +00:00
Claire
13499168f8 Merge commit 'c48634cf5f3c5b50fcf6ea075121fa2d88e07c0e' into glitch-soc/merge-upstream 2026-02-03 15:44:04 +01:00
Echo
0923e2cb26
Profile redesign: Fields iteration (#37682) 2026-02-03 13:02:33 +00:00
Echo
346ca87ee8
Profile redesign: Follow button and menu reorg (#37707) 2026-02-03 11:33:20 +00:00
diondiondion
218ca36653
Add components TextInput, TextArea, and FormStack (#37705) 2026-02-03 10:02:13 +00:00
diondiondion
ceb4a878fb
Add Select component (#37702) 2026-02-02 17:31:34 +00:00
Claire
5b926157e8 Merge commit '6188de3efc293a6327cabcb858430aa79564dfd7' into glitch-soc/merge-upstream 2026-02-02 18:26:04 +01:00
Echo
1100035af4
Profile redesign: Additional badges (#37683) 2026-02-02 10:23:08 +00:00
Claire
b490913ad7 Merge commit 'a7a33ef6bc61cf10ef654313cfb7a45fe2b58ae3' into glitch-soc/merge-upstream 2026-01-30 18:00:16 +01:00
diondiondion
a7a33ef6bc
Adds new Checkbox and CheckboxField components (#37665) 2026-01-30 14:44:28 +00:00
Claire
d62a7775b5 Merge commit 'd0502ac3c1630e281fda5492cbc28390262b0aeb' into glitch-soc/merge-upstream 2026-01-29 21:08:46 +01:00
diondiondion
6f53b0b634
Implement editing collection settings and deleting collections (#37658) 2026-01-29 11:01:40 +00:00
diondiondion
2427e14446
Add initial collections editor page (#37643) 2026-01-29 09:06:49 +00:00
Echo
8a42689268
Prevent account note from appearing on your own profile (#37653) 2026-01-29 09:02:42 +00:00
Echo
9079a75574
Profile redesign: Featured tags (#37645) 2026-01-29 09:01:36 +00:00
Claire
36be9bbebf Merge commit 'a495a0cbfcf9f6111c0e598af0864de2b76e4111' into glitch-soc/merge-upstream 2026-01-28 19:29:10 +01:00
Echo
ec76288dff
Profile redesign: Timeline filters (#37626) 2026-01-28 10:17:32 +00:00
Claire
5a45a3203a Merge commit '7af5ba271d6f04831f000e9b815914375e42abeb' into glitch-soc/merge-upstream 2026-01-27 18:03:27 +01:00
Echo
34f0482ad4
Profile redesign: Account notes (#37593) 2026-01-27 15:34:09 +00:00
Echo
c0616bcab6
Profile redesign: Username update (#37627) 2026-01-27 15:03:52 +00:00
Echo
76ab866d93
Deprecate need for revert-layer CSS (#37632) 2026-01-27 14:45:35 +00:00
Claire
8b95254883 Merge commit 'c36db57acedf0033c090748125c665a0360cd11f' into glitch-soc/merge-upstream 2026-01-23 17:57:20 +01:00
diondiondion
a1acf8f4bc
Add "My collections" page (#37552) 2026-01-23 13:51:39 +00:00
diondiondion
0924171c0f
Add form field components: TextInputField, TextAreaField, SelectField (#37578) 2026-01-22 16:08:57 +00:00
Echo
42b2fdb0ac
Re-download Material Icons (#37571) 2026-01-22 12:04:15 +00:00
Claire
95aaefe083 Merge commit '562ea656f495f0619e393b7d93bd07c5abd28e5a' into glitch-soc/merge-upstream 2026-01-21 22:04:02 +01:00
Echo
e79d51ce19
Profile redesign: verified badges (#37538) 2026-01-21 13:08:08 +00:00
Echo
22ec368574
Profile redesign: Badges (#37550) 2026-01-20 15:15:49 +00:00
Claire
5d04c56c48 Merge commit '400c1f3e8ec0ffd33ad30d9334b9210cdb89b14c' into glitch-soc/merge-upstream 2026-01-20 16:14:14 +01:00
Echo
a1c17fef3a
Profile redesign: Account name (#37527) 2026-01-20 11:10:46 +00:00
Claire
7839c8d9af Merge commit 'cc3c7ba532f75617505bb41297651a5c14f71bdd' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream simplified `theme_style_tags`. Our version is different because of
  the different theming system.
  Adapted upstream's changes.
- `app/views/layouts/error.html.haml`:
  Theming system.
2026-01-16 23:22:19 +01:00