tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,192 Commits 5 Branches 0 Tags
8ec882df0c5db54ed8cd5c14382aaeda16f8a87e
Commit Graph
28192 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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]andGitHub Actions 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
Echoanddiondiondion 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
Echoanddiondiondion 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]andGitHub Actions 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
David Roetzel 84d8020165 Store a remote actor's featuredCollections URI (#38166) 2026-03-12 09:11:32 +00:00
Eugen Rochko 51894ac247 Change order of onboarding steps (#38121) 2026-03-11 21:07:31 +00:00
Claire 3492283a9e Merge pull request #3439 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 811575a109
 2026-03-11 19:35:19 +01:00
diondiondion 979ef236ca [Glitch] Collection editor: Format topic as hashtag 
Port 3ef7d2835a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:55:45 +01:00
Echo 99b43f225c [Glitch] Profile editing: Always show field buttons 
Port 4a08ab64d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:55:18 +01:00
diondiondion 18aefaea62 [Glitch] Refactor collection editor state handling 
Port 20932752fe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:54:52 +01:00
Echo 006b06199f [Glitch] Profile editing: Add warning for links 
Port 12c6c6dcf9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:54:22 +01:00
Echo 3ed3ce4e05 [Glitch] Profile editing: Fix bug with reordering 
Port f971670c62 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:53:42 +01:00
Claire 0dddc44eb5 [Glitch] Add fallback to Object intent for FEP-3b86 in remote interaction helper 
Port 9916c786e6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:53:10 +01:00
diondiondion a76ee2e233 [Glitch] Prevent hover card from showing unintentionally 
Port 316290ba9d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-11 18:52:39 +01:00
Claire b5222606e3 Merge commit '811575a10903cada549580979cc809ca98ad570c' into glitch-soc/merge-upstream 2026-03-11 18:50:59 +01:00
Matt Jankowski 811575a109 Use bundler version 4.0.8 (#38150) 2026-03-11 17:11:28 +00:00
Matt Jankowski 0a216003ff Disable use_multi_json for json validator / match_json_schema (#38151) 2026-03-11 17:11:00 +00:00
diondiondion 3ef7d2835a Collection editor: Format topic as hashtag (#38153) 2026-03-11 17:04:37 +00:00
David Roetzel 3091e2e525 Ingestion of remote collections (#38144) 2026-03-11 14:29:00 +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