5336 Commits

Author SHA1 Message Date
Claire
3d8e40f7c9 Merge commit 'c72ca33fac1ae1518371f5954ae9487692b17709' into glitch-soc/merge-upstream 2026-03-24 17:05:53 +01:00
Echo
2d4b5b6c51
Profile editing: Visual fixes (#38346) 2026-03-24 13:47:07 +00:00
Echo
c7e90ee67a
Remove column header button (#38362)
Co-authored-by: diondiondion <mail@diondiondion.com>
2026-03-24 13:28:09 +00:00
Echo
aef70991f8
Profile redesign: Remove hashtags from featured page (#38363) 2026-03-24 13:10:27 +00:00
Echo
000199f003
Profile redesign: Simplify header for follower/following lists (#38366) 2026-03-24 13:03:44 +00:00
Echo
5ba5a2e552
Profile redesign: Ensure boost and languages menu items are only for following (#38365) 2026-03-24 12:58:19 +00:00
Claire
60236bffe6 Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream 2026-03-24 12:13:39 +01:00
github-actions[bot]
65952f9b4c
New Crowdin Translations (automated) (#38354)
Co-authored-by: GitHub Actions <noreply@github.com>
2026-03-24 09:40:31 +00:00
renovate[bot]
1935f4db79
Update dependency vite to v8 (#38174)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
2026-03-23 11:47:03 +00:00
Echo
931da0c327
Profile redesign: Nudge to add featured tags (#38315) 2026-03-23 09:07:53 +00:00
github-actions[bot]
34a52fd38b
New Crowdin Translations (automated) (#38321)
Co-authored-by: GitHub Actions <noreply@github.com>
2026-03-23 07:45:28 +00:00
Claire
469076c357 Merge commit '4e276e4476c81482143440f1f405479e0e4be7eb' into glitch-soc/merge-upstream 2026-03-20 18:03:14 +01:00
diondiondion
806f4f1589
Add simple language selector to collection editor (#38316) 2026-03-20 16:02:50 +00:00
diondiondion
8bce0b99d4
Implements tag suggestions for collections topic field (#38307) 2026-03-20 13:48:06 +00:00
Echo
6507a61d30
Profile redesign: Profile tab settings (#38309) 2026-03-20 13:38:10 +00:00
Echo
00bcb014df
Profile editing: Use server flag (#38310) 2026-03-20 13:32:48 +00:00
github-actions[bot]
d7d8d7f5ab
New Crowdin Translations (automated) (#38303)
Co-authored-by: GitHub Actions <noreply@github.com>
2026-03-20 09:38:52 +00:00
Claire
291f141a02 Merge commit '1ee457f2d37c2b77a7fbce246a7c72ac9f9d3056' into glitch-soc/merge-upstream 2026-03-19 18:14:55 +01:00
Echo
605b5b91c9
Refactor: Remove Status unsafe lifecycles (#38294) 2026-03-19 14:18:47 +00:00
Claire
fac3080289 Merge commit 'cffa8de6267a57673b7f6264fab671153f965d23' into glitch-soc/merge-upstream 2026-03-19 12:38:31 +01:00
Echo
cffa8de626
Refactor: Relative timestamp component (#38275) 2026-03-19 11:15:23 +00:00
Echo
2af5c8551d
Profile redesign: Adjust account number fields to be stacked (#38283) 2026-03-19 11:04:15 +00:00
github-actions[bot]
6aedd2f9ec
New Crowdin Translations (automated) (#38288)
Co-authored-by: GitHub Actions <noreply@github.com>
2026-03-19 09:30:49 +00:00
Claire
2b0531914f Merge commit 'd52d0e4dedcc4c8ca12781681debe68f77c007e2' into glitch-soc/merge-upstream 2026-03-18 12:01:23 +01:00
github-actions[bot]
5e7f221cab
New Crowdin Translations (automated) (#38267)
Co-authored-by: GitHub Actions <noreply@github.com>
2026-03-18 09:17:33 +00: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
Claire
04bf07a9cf Merge commit 'c37bc5a8a94758e19b2d50db5e7816a96cec5cf4' into glitch-soc/merge-upstream 2026-03-17 18:01:07 +01:00
diondiondion
68984de5b5
Revamp heading levels in settings & admin pages (#38230) 2026-03-17 10:32:24 +00:00
github-actions[bot]
75c5f30556
New Crowdin Translations (automated) (#38247)
Co-authored-by: GitHub Actions <noreply@github.com>
2026-03-17 09:36:34 +00:00
Claire
73f77c49d8 Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
  Bumped the Mastodon API version as upstream did.
2026-03-16 18:16:56 +01:00
Echo
4328807f28
Profile editing: Finish image editing (#38235) 2026-03-16 15:56:30 +00:00
Echo
21c27eb3af
Profile editing: Uploading avatar and header images (#38189) 2026-03-16 11:39:52 +00:00
Claire
4359098740 Merge commit '9c8be1e72146af247e2b6cdae6e1d37371506569' into glitch-soc/merge-upstream 2026-03-16 12:17:49 +01:00
github-actions[bot]
5b6b86c97c
New Crowdin Translations (automated) (#38201)
Co-authored-by: GitHub Actions <noreply@github.com>
2026-03-16 08:26:09 +00:00
Claire
3afb58ad18 Merge commit '89b7a3d7fb73ba79d33cab9755424b4aa2050b1b' into glitch-soc/merge-upstream 2026-03-14 11:41:24 +01:00
Echo
d26269d68b
Adds a range selector component (#38191) 2026-03-13 14:28:39 +00:00
Echo
91407ecc15
Fix incorrect SASS addition (#38194) 2026-03-13 14:21:39 +00:00
diondiondion
890b2673fc
Allow displaying field status (error, warning, info) under form fields (#38175) 2026-03-13 13:55:17 +00:00
github-actions[bot]
3a2613a3e8
New Crowdin Translations (automated) (#38185)
Co-authored-by: GitHub Actions <noreply@github.com>
2026-03-13 09:33:06 +00:00
Claire
3833eadfbf Merge commit 'adede83c7c9a943cf9954fe865becf6a0c2d2280' into glitch-soc/merge-upstream 2026-03-12 18:48:32 +01:00
Echo
420136e83b
Profile editing: Edit image menu (#38156)
Co-authored-by: diondiondion <mail@diondiondion.com>
2026-03-12 10:42:29 +00:00
github-actions[bot]
7f9df6d02d
New Crowdin Translations (automated) (#38164)
Co-authored-by: GitHub Actions <noreply@github.com>
2026-03-12 09:53:59 +00:00
Eugen Rochko
51894ac247
Change order of onboarding steps (#38121) 2026-03-11 21:07:31 +00:00
Claire
b5222606e3 Merge commit '811575a10903cada549580979cc809ca98ad570c' into glitch-soc/merge-upstream 2026-03-11 18:50:59 +01:00
diondiondion
3ef7d2835a
Collection editor: Format topic as hashtag (#38153) 2026-03-11 17:04:37 +00:00
Echo
4a08ab64d1
Profile editing: Always show field buttons (#38152) 2026-03-11 13:52:44 +00:00
diondiondion
20932752fe
Refactor collection editor state handling (#38133) 2026-03-11 13:20:56 +00:00
Echo
12c6c6dcf9
Profile editing: Add warning for links (#38148) 2026-03-11 13:19:39 +00:00
Echo
f971670c62
Profile editing: Fix bug with reordering (#38147) 2026-03-11 12:09:54 +00:00
github-actions[bot]
d39f867931
New Crowdin Translations (automated) (#38143)
Co-authored-by: GitHub Actions <noreply@github.com>
2026-03-11 10:16:06 +00:00