stevenoh0908/mastodon-sakyey
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,211 Commits 75 Branches 3 Tags
b1942f4f4362d43d1f30f9fb8cd0dd4bb74e4c5b
Commit Graph

28211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
b1942f4f43 Merge pull request #3444 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 9c8be1e721
 2026-03-16 18:02:39 +01:00
Claire
4359098740 Merge commit '9c8be1e72146af247e2b6cdae6e1d37371506569' into glitch-soc/merge-upstream 2026-03-16 12:17:49 +01:00
renovate[bot]
9c8be1e721 Update dependency immutable to v4.3.8 [SECURITY] (#38073) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-16 11:03:13 +00:00
David Roetzel
12c63a382c Handle adding already approved collection items (#38213) 2026-03-16 10:35:07 +00:00
Claire
62b90d73d7 Fixes some model definitions in tootctl maintenance fix-duplicates (#38214) 2026-03-16 10:00:08 +00:00
Claire
5521aac4ab Fix hashtags preceded by non-break spaces not being processed as such (#38212) 2026-03-16 09:39:18 +00:00
David Roetzel
c993daa347 Start of handling FeatureRequest activities (#38193) 2026-03-16 09:04:28 +00:00
Matt Jankowski
8d5d66ecfc Remove unused react component helper method (#38207) 2026-03-16 09:02:21 +00:00
Matt Jankowski
e2bf09d57d Add timestamp spec for markers API response (#38206) 2026-03-16 08:48:10 +00:00
David Roetzel
2f989c780a Reinstate action logging (#38211) 2026-03-16 08:42:06 +00:00
Matt Jankowski
f561014aa8 Make use of email_domain in sign up approval check (#38199) 2026-03-16 08:34:18 +00: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
Matt Jankowski
a9c248f14f Limit email domain block variant query to unique values (#38196) 2026-03-16 08:11:32 +00:00
renovate[bot]
e7cb3af15f Update dependency aws-sdk-s3 to v1.216.0 (#38187) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-16 08:11:11 +00:00
renovate[bot]
10624ecce6 Update dependency oj to v3.16.16 (#38186) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-16 08:11:06 +00:00
Claire
ad0a7f83f0 Merge pull request #3441 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 89b7a3d7fb
 2026-03-14 12:55:51 +01:00
diondiondion
39f1861252 [Glitch] A11y improvements on login & settings pages 
Port 89b7a3d7fb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-14 11:51:20 +01:00
Echo
334188b4fc [Glitch] Adds a range selector component 
Port d26269d68b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-14 11:49:27 +01:00
Echo
a78119d8d3 [Glitch] Fix incorrect SASS addition 
Port 91407ecc15 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-14 11:48:14 +01:00
diondiondion
8ec882df0c [Glitch] Allow displaying field status (error, warning, info) under form fields 
Port 890b2673fc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-14 11:43:31 +01:00
Claire
3afb58ad18 Merge commit '89b7a3d7fb73ba79d33cab9755424b4aa2050b1b' into glitch-soc/merge-upstream 2026-03-14 11:41:24 +01:00
diondiondion
89b7a3d7fb A11y improvements on login & settings pages (#38188) 2026-03-13 17:14:04 +00:00
Matt Jankowski
ec0e78f128 Add coverage for rewrite with vary username paths (#38197) 2026-03-13 16:54:57 +00: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
renovate[bot]
fdbc3c8a16 Update dependency sass to v1.98.0 (#38142) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-13 13:21:45 +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
Matt Jankowski
6416724f75 Normalize current_username on account migration (#38183) 2026-03-13 09:33:02 +00:00
Claire
1b49ef10d2 Merge pull request #3440 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 377952703c
 2026-03-12 20:12:20 +01:00
Claire
208b556c18 Merge commit '377952703cf70f14008cc7938479558d8cca9903' into glitch-soc/merge-upstream 2026-03-12 19:03:08 +01:00
Claire
d099de23c5 Merge commit 'bf32befcc21831b31f684795bb211b2f1f4cfb6d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream reordered model annotations, while glitch-soc has extra columns.
  Reordered as upstream did.
- `app/models/status_edit.rb`:
  Upstream reordered model annotations, while glitch-soc has extra columns.
  Reordered as upstream did.
 2026-03-12 19:01:28 +01:00
Echo
a7974df51a [Glitch] Profile editing: Edit image menu 
Port 420136e83b to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-12 18:53:39 +01:00
diondiondion
ba7db10fd0 [Glitch] Fix extra border on accounts in settings page 
Port 13c94db9e7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-12 18:51:04 +01:00
Eugen Rochko
263615b74f [Glitch] Change order of onboarding steps 
Port 51894ac247 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-12 18:50:13 +01:00
Claire
3833eadfbf Merge commit 'adede83c7c9a943cf9954fe865becf6a0c2d2280' into glitch-soc/merge-upstream 2026-03-12 18:48:32 +01:00
David Roetzel
377952703c Add serializers for Accept+Reject of feature requests (#38177) 2026-03-12 15:46:36 +00:00
renovate[bot]
7511357ec6 Update opentelemetry-ruby (non-major) (#38138) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-12 14:09:17 +00:00
Nicholas La Roux
21a8ff5351 Upgrade from Ruby 3.4.8 to 3.4.9 (#38154) 2026-03-12 14:04:35 +00:00
Matt Jankowski
7778db1418 Truncate unsupported/EOL version changelogs (#38173) 2026-03-12 14:04:21 +00:00
Matt Jankowski
bf32befcc2 Run annotaterb models after bug fix to re-order model comments (#38172) 2026-03-12 14:00:41 +00:00
Echo
adede83c7c Updates to latest Material Icons (#38171) 2026-03-12 11:17:43 +00:00
David Roetzel
eeed483518 Handle Remove of an individual collection item (#38170) 2026-03-12 11:11:39 +00:00
Echo
420136e83b Profile editing: Edit image menu (#38156) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-03-12 10:42:29 +00:00
David Roetzel
353c8b2abf Handle Remove activity on featuredCollections (#38169) 2026-03-12 10:37:53 +00:00
diondiondion
13c94db9e7 Fix extra border on accounts in settings page (#38168) 2026-03-12 10:19:06 +00:00
Hugo Gameiro
4552cda15a Fix OpenStack Swift Keystone token rate limiting (#38145) 2026-03-12 10:15:49 +00:00
David Roetzel
94aa5d7c9e Handle Add activity to featuredCollections (#38167) 2026-03-12 10:14:22 +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
Matt Jankowski
2330f11cad Remove unused @markdown from user mailer terms action (#38160) 2026-03-12 09:22:56 +00:00