Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,060 Commits 75 Branches 73 Tags
8d836e0a49d679a5b6837e14e49e75d0dce554d9
Commit Graph

28060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
8d836e0a49 Merge commit 'a89754f28847ebccee36fab248537d5f49f37024' into glitch-soc/merge-upstream 
Conflicts:
- `db/schema.rb`:
  Upstream re-generated the file, which reordered all the definitions.
  Re-generated the files as well.
 2026-03-04 18:39:00 +01:00
Claire
96e4d1d821 Merge pull request #3428 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 8a0261c51c
 2026-03-04 18:35:14 +01:00
Matt Jankowski
a89754f288 Re-run db:schema:dump with rails 8.1 (#38044) 2026-03-04 13:57:53 +00:00
diondiondion
0ae3733a22 [Glitch] Fix local collection link resulting in error page 
Port d0e7692d79 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-04 12:41:28 +01:00
diondiondion
3fecef0bb1 [Glitch] Profile redesign: Fix timeline filter button color on Safari iOS 
Port c0b2286871 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-04 12:41:09 +01:00
Claire
c96db36396 Merge commit '8a0261c51caf76b6d12e3801da471759c31c9608' into glitch-soc/merge-upstream 2026-03-04 12:40:16 +01:00
Claire
8a0261c51c Add missing_attribution boolean to preview cards (#38043) 2026-03-04 11:18:37 +00:00
Claire
5472ab251a Fix existing posts not being removed from lists when a list member is unfollowed (#38048) 2026-03-04 11:18:28 +00:00
github-actions[bot]
078b87bdc1 New Crowdin Translations (automated) (#38047) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-04 11:06:26 +00:00
Matt Jankowski
177f4ee3ae Update haml_lint to version 0.72.0 (#38042) 2026-03-04 11:03:25 +00:00
renovate[bot]
0a4f96be21 Update dependency tzinfo-data to v1.2026.1 (#38035) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-04 11:01:47 +00:00
renovate[bot]
0f2ad41f89 Update dependency public_suffix to v7.0.5 (#38034) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-04 11:01:44 +00:00
github-actions[bot]
b12429e41c New Crowdin translations (#3424) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-03 19:30:59 +01:00
Claire
551da3a300 Merge pull request #3427 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to a3aeae0288
 2026-03-03 19:30:34 +01:00
diondiondion
d0e7692d79 Fix local collection link resulting in error page (#38038) 2026-03-03 17:34:37 +00:00
diondiondion
c0b2286871 Profile redesign: Fix timeline filter button color on Safari iOS (#38040) 2026-03-03 17:34:01 +00:00
diondiondion
8b2e8e7b58 [Glitch] Prevent hover card from showing on touch devices 
Port de4ee8565c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-03 18:27:26 +01:00
diondiondion
5f710e3edc [Glitch] Convert ColumnsArea component to TS 
Port 1d21d9d4c2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-03 18:27:06 +01:00
diondiondion
a4b7c9f933 [Glitch] Anchor post navigation via hotkeys to top of viewport 
Port 6e5aa00436 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-03 18:20:50 +01:00
Claire
45b87f31ff Merge commit 'a3aeae02885408381c7c1f3f6a0cc88799823409' into glitch-soc/merge-upstream 2026-03-03 18:12:16 +01:00
Claire
a3aeae0288 Add test to cover proper URL for media in DELETE /api/v1/statuses/:id (#38037) 2026-03-03 15:36:54 +00:00
diondiondion
de4ee8565c Prevent hover card from showing on touch devices (#38039) 2026-03-03 15:26:56 +00:00
diondiondion
1d21d9d4c2 Convert ColumnsArea component to TS (#38031) 2026-03-03 12:48:50 +00:00
diondiondion
6e5aa00436 Anchor post navigation via hotkeys to top of viewport (#38036) 2026-03-03 11:02:04 +00:00
github-actions[bot]
80066631ee New Crowdin Translations (automated) (#38032) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-03 10:47:19 +00:00
diondiondion
396d9dd12a Allow scrolling alt text popover with keyboard & improved media focus outlines (#38033) 2026-03-03 10:27:46 +00:00
Claire
4298b7d57a Merge pull request #3426 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 74b3b6c798
 2026-03-02 19:20:04 +01:00
Claire
d2f5feb25f Fix linting issue 2026-03-02 18:59:32 +01:00
Echo
54cfc49b42 [Glitch] Profile editing: Allow adding arbitrary featured tags 
Port 74b3b6c798 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-02 18:48:31 +01:00
diondiondion
fe7dc293c4 [Glitch] Collection share modal cleanup 
Port 03b2f77ad2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-02 18:48:31 +01:00
David Roetzel
26ce025df1 [Glitch] Change cursor to make clear summary is clickable 
Port ceaadc791e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-02 18:48:31 +01:00
diondiondion
5cfbb5b359 [Glitch] Add "skip to content", "skip to navigation" links 
Port 816e63d2a5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-02 18:48:31 +01:00
Antoine Cellerier
739c35811e [Glitch] Add g+e keyboard shortcut for /explore (trending) 
Port 87004ddb96 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-02 18:15:16 +01:00
Claire
1b92ac0729 Merge commit '74b3b6c798d1f137947e80df8eefb7412e70febd' into glitch-soc/merge-upstream 2026-03-02 18:11:45 +01:00
Claire
b55936be7e Merge pull request #3425 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 2f65701920
 2026-03-02 18:11:05 +01:00
Echo
74b3b6c798 Profile editing: Allow adding arbitrary featured tags (#38012) 2026-03-02 16:32:08 +00:00
diondiondion
03b2f77ad2 Collection share modal cleanup (#38030) 2026-03-02 16:19:13 +00:00
David Roetzel
ceaadc791e Change cursor to make clear summary is clickable (#38029) 2026-03-02 15:13:56 +00:00
Matt Jankowski
e7cec161fd Reduce haml-lint LineLength configuration to 240 (#37287) 2026-03-02 14:43:57 +00:00
diondiondion
816e63d2a5 Add "skip to content", "skip to navigation" links (#38006) 2026-03-02 14:37:33 +00:00
Antoine Cellerier
87004ddb96 Add g+e keyboard shortcut for /explore (trending) (#38014) 2026-03-02 13:49:28 +00:00
David Roetzel
f953d40289 Add API to revoke collection item (#38027) 2026-03-02 13:38:03 +00:00
Claire
799bd69189 Merge commit '2f657019201d73c9d86d1ece339e66e72954f0eb' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
  Upstream refactored a line adjacent to a glitch-soc modified line.
  Ported upstream changes.
 2026-03-02 12:19:02 +01:00
David Roetzel
2f65701920 Add service to revoke inclusion in a Collection (#38026) 2026-03-02 10:16:41 +00:00
Shlee
6ab24de659 trustworthy_attribution - Bounce bad URIs (#37372) 2026-03-02 10:03:21 +00:00
renovate[bot]
ba8e495631 Update dependency pg to v8.19.0 (#37978) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-02 09:30:52 +00:00
renovate[bot]
178e8c23b1 Update dependency eslint-plugin-jsdoc to v62 (#37433) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-02 09:30:17 +00:00
Matt Jankowski
c86a8f8798 Use file_field support for array to accept attribute (#37844) 2026-03-02 09:27:04 +00:00
renovate[bot]
e3a53b6f5a Update Node.js to 24.14 (#37971) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2026-03-02 09:08:04 +00:00
Matt Jankowski
74f7a5e8e9 Remove unneeded stylelint-config-prettier-scss package (#37973) 2026-03-02 09:07:50 +00:00