Claire
42ec9a607b
Merge commit 'c26003af215da7696e2b0dcece7fa695b1be8871' into glitch-soc/merge-upstream
2026-05-18 19:35:08 +02:00
diondiondion
28ae61f34d
Unify compact button size between variants ( #39070 )
2026-05-18 14:33:23 +00:00
Claire
808b7a858d
Merge commit '8bbde181db0d6d79018fb1754a8296e753d47415' into glitch-soc/merge-upstream
2026-05-13 18:42:04 +02:00
Echo
758db36ec7
Refactor account header banners ( #38921 )
2026-05-13 08:38:17 +00:00
Claire
4fcc9b8a40
Merge commit 'd2f640272f3f36c8979cff645416682840528906' into glitch-soc/merge-upstream
2026-05-12 18:37:31 +02:00
diondiondion
e7ed8bb682
Indent collection preview cards when displayed in notifications ( #38957 )
2026-05-10 08:31:12 +00:00
Claire
99f0a03dec
Merge commit 'b2aa476abbe82e2b49d84c9fb8ef654f95391fd3' into glitch-soc/merge-upstream
2026-05-07 18:26:17 +02:00
Echo
f24f98ce40
Profile: Remove old classes ( #38920 )
2026-05-07 09:41:03 +00:00
Claire
6935fce458
Merge commit 'ba83509ff4ed3f7193f3ca5c5deb3038c39620b1' into glitch-soc/merge-upstream
2026-05-04 21:08:25 +02:00
diondiondion
a23b3c7c25
Update block dialog copy to include quotes & collections ( #38897 )
2026-05-04 15:22:24 +00:00
Eugen Rochko
ee88da4511
Add admin UI for managing email subscriptions ( #38741 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2026-05-04 13:56:04 +00:00
Claire
b3bae7e78f
Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Upstream added a new setting textually adjacent to ones modified by glitch-soc's.
Added upstream's new setting.
2026-04-25 09:20:39 +02:00
Echo
e2be688389
Profile redesign: Show full join date ( #38687 )
2026-04-23 12:47:01 +00:00
diondiondion
d7b60a2cb6
Fix preview for local collection links ( #38793 )
2026-04-23 11:47:31 +00:00
Claire
b6abf7a69f
Merge commit 'c4eec632b92c800ae38dba111c4c76e63bb1c0de' into glitch-soc/merge-upstream
2026-04-22 20:24:21 +02:00
diondiondion
5b1891a1ae
Fix confusing hover states in admin list items ( #38782 )
2026-04-22 14:12:27 +00:00
Claire
3072de056a
Merge commit '3a84990780fb1b48999f661f0cea5cb29cca4d33' into glitch-soc/merge-upstream
2026-04-15 16:27:32 +02:00
diondiondion
298fc7ce4c
Prevent text wrapping in Badge component ( #38691 )
2026-04-15 12:06:26 +00:00
Claire
1eac058989
Merge commit '73fc8d34d98a80cfb32d3c7c5dc4794fad5470d5' into glitch-soc/merge-upstream
2026-04-11 13:22:19 +02:00
diondiondion
05bed6f3d8
Update Profile Featured tab to latest designs ( #38616 )
2026-04-09 09:15:05 +00:00
diondiondion
b6f09b9a2b
Use more neutral background color on Share page ( #38621 )
2026-04-09 08:40:06 +00:00
Claire
b9014ec220
Merge commit '66fdd3ae65e13349fbc0b2818d4b91a389075553' into glitch-soc/main
2026-04-08 19:32:32 +02:00
diondiondion
7d9b1e6d1e
Update collection account item design ( #38586 )
2026-04-08 14:26:39 +00:00
Claire
69b70d48c6
Merge commit 'db13dddcf90343574dee320fff7e8bb9bf3707e4' into glitch-soc/merge-upstream
2026-04-07 20:08:57 +02:00
Echo
db13dddcf9
Profile redesign: Changes verified field border colors ( #38585 )
2026-04-07 13:51:07 +00:00
Claire
da85a16692
Merge commit '8fa91b4b81951f884a773d0aa56fc4f1a48da03e' into glitch-soc/merge-upstream
2026-04-04 09:31:50 +02:00
Echo
759e97fd36
Profile redesign: Adds a "Follows you" badge ( #38549 )
2026-04-03 09:39:29 +00:00
Claire
30bb39fe54
Merge commit '8e00f7cc8fab9b447f80a27a972eef78186633ad' into glitch-soc/merge-upstream
2026-03-27 18:15:50 +01:00
diondiondion
8e00f7cc8f
Improve contrast for text-warning and text-success tokens ( #38459 )
2026-03-27 16:28:29 +00:00
diondiondion
098d698a7e
Implement new collection page design ( #38450 )
2026-03-27 15:30:06 +00:00
diondiondion
e26c6fa256
Fix styling regressions: familiar followers layout & alert action hover color ( #38438 )
2026-03-27 10:12:41 +00:00
Claire
2ac493ee8e
Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream
2026-03-26 18:23:45 +01:00
diondiondion
2124be8a81
Update collection list item design ( #38425 )
2026-03-26 14:56:36 +00:00
diondiondion
39ad873589
Fix regressions caused by rendering default translation wrapper element ( #38412 )
2026-03-26 11:16:55 +00:00
Echo
dd8602a928
Profile editing: Add notice in profile preferences ( #38404 )
2026-03-26 11:03:40 +00:00
Claire
79958d9442
Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/post_status_service.rb`:
Upstream added a line adjacent to one that had been modified due to local-only posting.
Added upstream's change.
- `tsconfig.json`:
Upstream updated Typescript and updated `tsconfig` in the process by changing paths, where
glitch-soc had extra paths. Updated as upstream did.
2026-03-25 21:36:32 +01:00
Eugen Rochko
bcf0718a9a
Add email subscriptions ( #38163 )
2026-03-25 16:25:45 +00:00
diondiondion
37236acd3b
Update web theme tokens with latest design system tokens ( #38387 )
2026-03-25 14:34:38 +00:00
Claire
3d8e40f7c9
Merge commit 'c72ca33fac1ae1518371f5954ae9487692b17709' into glitch-soc/merge-upstream
2026-03-24 17:05:53 +01:00
Echo
c7e90ee67a
Remove column header button ( #38362 )
...
Co-authored-by: diondiondion <mail@diondiondion.com>
2026-03-24 13:28:09 +00:00
Claire
291f141a02
Merge commit '1ee457f2d37c2b77a7fbce246a7c72ac9f9d3056' into glitch-soc/merge-upstream
2026-03-19 18:14:55 +01:00
Claire
1ee457f2d3
Split invite_users permission into invite_bypass_approval ( #38278 )
2026-03-19 15:25:54 +00:00
Claire
fac3080289
Merge commit 'cffa8de6267a57673b7f6264fab671153f965d23' into glitch-soc/merge-upstream
2026-03-19 12:38:31 +01:00
diondiondion
43d66959aa
Sign-up server rules: Show different icon on toggle button when description is expanded ( #38293 )
2026-03-19 10:58:59 +00:00
Claire
842bac86f6
Merge commit 'db074fc3e2b671e28a44ae379e6df1fcbdbbce53' into glitch-soc/merge-upstream
2026-03-18 18:01:57 +01:00
diondiondion
380b898d0d
Improve accessibility of server rules list in sign-up flow ( #38257 )
2026-03-18 16:08:23 +00:00
Claire
2b0531914f
Merge commit 'd52d0e4dedcc4c8ca12781681debe68f77c007e2' into glitch-soc/merge-upstream
2026-03-18 12:01:23 +01:00
Claire
3593ddff11
Merge commit 'b320c9e4c901bf99ccbca321bad2ceb2f51de140' into glitch-soc/merge-upstream
2026-03-17 18:58:19 +01:00
Claire
bd9e7d6060
Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/settings/discovery/show.html.haml`:
Glitch-soc has an extra setting textually adjacent to a line upstream has changed.
Applied upstream's change while keeping glitch-soc's setting.
2026-03-17 18:53:00 +01:00
diondiondion
11112fa9dc
Remove superfluous SCSS imports file ( #38261 )
2026-03-17 17:39:21 +00:00
