Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,581 Commits 74 Branches 58 Tags
8bb81f9496cbe04fc941b3ac03b6e0a53468fabe
Commit Graph

25581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
8bb81f9496 Merge pull request #3115 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to a203a05eb1
v4.4.0-rc.1 		2025-07-01 20:51:10 +02:00
diondiondion
605df74f06 [Glitch] fix: Fix column header overlapping mobile menu on old Safari 
Port e6e8974785 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-01 18:48:16 +02:00
Claire
98e90b7c1f Merge commit 'a203a05eb10db82e1db2d75398e0261cfe4d33e4' into glitch-soc/merge-upstream 2025-07-01 18:47:15 +02:00
Claire
a203a05eb1 Fix missing newline in changelog (#35227) 2025-07-01 12:31:55 +00:00
Claire
68090cd8be Bump version to v4.4.0-rc.1 (#35196) 2025-07-01 09:21:32 +00:00
github-actions[bot]
dd064aaa36 New Crowdin Translations (automated) (#35224) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-07-01 09:02:26 +00:00
diondiondion
e6e8974785 fix: Fix column header overlapping mobile menu on old Safari (#35225) 2025-07-01 08:53:43 +00:00
Claire
5e95c63b5b Merge pull request #3114 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to c357a7f8d6
 2025-07-01 10:45:20 +02:00
Renaud Chaput
498af63b85 chore: validate the project funding.json association (#35221) 2025-06-30 16:21:52 +00:00
diondiondion
0bb2dc9d26 [Glitch] fix: Fix popover/dialog backgrounds not blurred on older Webkit browsers 
Port e8a603b18f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-30 17:56:29 +02:00
Claire
2eec4da8fc Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream 2025-06-30 17:52:22 +02:00
David Roetzel
c357a7f8d6 Add optional bulk mailer settings (#35203) 2025-06-30 14:49:14 +00:00
David Roetzel
bae258925c Persist follow recommendations from FASP (#35218) 2025-06-30 13:39:36 +00:00
diondiondion
e8a603b18f fix: Fix popover/dialog backgrounds not blurred on older Webkit browsers (#35220) 2025-06-30 12:16:54 +00:00
renovate[bot]
f00c8e3245 chore(deps): update dependency haml_lint to v0.64.0 (#35215) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-30 11:25:47 +00:00
Claire
153af19f55 Add specs for PublicFileServer middleware (#35219) 2025-06-30 11:23:11 +00:00
Matt Jankowski
964916c71b Add coverage for TermsOfService scopes/validations (#35204) 2025-06-30 10:28:14 +00:00
github-actions[bot]
8782e860b6 New Crowdin Translations (automated) (#35208) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-30 09:33:15 +00:00
renovate[bot]
641c0c6393 fix(deps): update dependency pg to v8.16.3 (#35213) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-30 09:33:09 +00:00
renovate[bot]
0383100b0e fix(deps): update dependency ws to v8.18.3 (#35214) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-30 09:33:03 +00:00
Jeong Arm
87db28cebc Fix unexpected "cache-control: no-cache" header in public file server (#35209) 2025-06-30 09:06:18 +00:00
David Roetzel
ac4b735c67 Add FASP account search support (#34033) 2025-06-30 07:42:34 +00:00
Claire
bc3dacc371 Merge pull request #3113 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 0d650780e2
 2025-06-27 18:10:54 +02:00
github-actions[bot]
6d017dbf10 New Crowdin Translations (automated) (#35202) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-27 08:37:39 +00:00
diondiondion
f21c92bb45 [Glitch] fix: Fix outdated icon in notifications permissions banner 
Port 9576434d47 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-26 18:07:16 +02:00
diondiondion
7b98298f85 [Glitch] refactor: Tweak wording of "discard draft?" confirmation dialogs 
Port b804ed0cba to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-26 18:06:55 +02:00
diondiondion
1f8378c12d [Glitch] fix: Prevent scrolling behind menus and modals in Safari iOS 
Port c1ef1f62d5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-26 18:06:16 +02:00
Claire
f7b4580b49 Merge commit '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a file, glitch-soc had extra files.
  Took upstream's changes and moved glitch-soc's additions at the end.
 2025-06-26 18:04:37 +02:00
renovate[bot]
0d650780e2 fix(deps): update dependency postcss-preset-env to v10.2.4 (#35194) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-26 14:17:31 +00:00
Eugen Rochko
1804a87193 Change terms of service generator to not be displayed (#35127) 2025-06-26 13:26:41 +00:00
diondiondion
9576434d47 fix: Fix outdated icon in notifications permissions banner (#35193) 2025-06-26 13:25:12 +00:00
diondiondion
b804ed0cba refactor: Tweak wording of "discard draft?" confirmation dialogs (#35192) 2025-06-26 13:03:24 +00:00
David Roetzel
48451b782d Move email env var reading to yml files (#35191) 2025-06-26 12:18:30 +00:00
Claire
2e0a00ab46 Fix search operators sometimes getting lost (#35190) 2025-06-26 10:35:49 +00:00
Claire
e4618a6ba5 Merge pull request #3111 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to dbb20f76a7
 2025-06-26 12:01:09 +02:00
github-actions[bot]
a9f2ec45da New Crowdin Translations (automated) (#35189) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-26 08:40:39 +00:00
diondiondion
c1ef1f62d5 fix: Prevent scrolling behind menus and modals in Safari iOS (#35183) 2025-06-25 19:22:11 +00:00
diondiondion
d285b07774 [Glitch] fix: Fix search icon overlapping text on Trending page 
Port 8fa32ca8ba to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-25 19:46:43 +02:00
diondiondion
0156ed6641 [Glitch] fix: Prevent content scrolling behind main menu (part 1) 
Port c6dddbb66e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-25 19:46:18 +02:00
Echo
9e5b9433f8 [Glitch] Storybook Helpers 
Port c52848b444 to glitch-soc, kinda

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-25 19:44:38 +02:00
Emelia Smith
34b8ff8267 [Glitch] Implement Instance Moderation Notes 
Port CSS changes from 72f2f35bfb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-25 19:42:23 +02:00
Claire
c9a1e27a49 Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream 
Conflicts:
- `tsconfig.json`:
  glitch-soc had extra paths under `app/javascript/flavours`, but upstream
  added `app/javascript` as a whole, so updated to upstream's.
 2025-06-25 19:29:09 +02:00
Claire
dbb20f76a7 Fix crash in development environment with no prebuilt assets and no vite dev server running (#35177) 2025-06-25 14:20:07 +00:00
renovate[bot]
91741214e1 chore(deps): update node.js to 22.17 (#35166) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-06-25 14:01:46 +00:00
diondiondion
8fa32ca8ba fix: Fix search icon overlapping text on Trending page (#35175) 2025-06-25 13:26:44 +00:00
Matt Jankowski
8285194451 Move layout setup for OAuth views to controllers (#35176) 2025-06-25 13:26:17 +00:00
Claire
392eaf1010 Ensure consistent ordering of rule translations in admin interface (#35174) 2025-06-25 13:15:59 +00:00
Claire
fa9318083e Merge pull request #3110 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 8ba1487f30
 2025-06-25 14:51:27 +02:00
diondiondion
c6dddbb66e fix: Prevent content scrolling behind main menu (part 1) (#35173) 2025-06-25 12:12:49 +00:00
Echo
c52848b444 Storybook Helpers (#35158) 2025-06-25 11:20:11 +00:00