1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-01 00:08:39 +09:00
Commit Graph

22652 Commits

Author SHA1 Message Date
Claire
d6c80f67fb
Merge pull request #2814 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 5d04e29775
2024-08-15 23:30:33 +02:00
Michael Stanclift
104c378cb4 [Glitch] Modify profile directory page image borders
Port 9194197de5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-15 21:59:08 +02:00
Claire
9f2775830c Merge commit '5d04e297755c4a8b4e908f706d272520521341d4' into glitch-soc/merge-upstream 2024-08-15 21:58:04 +02:00
Claire
d84453796b
Merge pull request #2813 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to a1ddaa9ee9
2024-08-15 09:15:00 +02:00
Renaud Chaput
5d04e29775
Disable Chrome's search engine selection screen when running system specs (#31437) 2024-08-15 06:45:00 +00:00
Renaud Chaput
4545b8d6cb
Add the ability to ignore specific browser errors for a spec (#31436) 2024-08-15 06:44:13 +00:00
Michael Stanclift
0dbdf6a7f3 [Glitch] Fix removal of border from account listing
Port a1ddaa9ee9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-14 21:28:16 +02:00
Renaud Chaput
524fc8563b [Glitch] Fix notification screen crashing in rare cases where the status no longer exists
Port 0d85a79f19 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-14 21:26:51 +02:00
Michael Stanclift
cf96857038 [Glitch] Fix collapsable column borders in Safari and improve Safari scrollbars
Port 7d4b602cb2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-14 21:25:45 +02:00
Claire
bf0129968e [Glitch] Fix styling of notification browser permission denied banner
Port 12582d095e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-14 21:25:16 +02:00
Renaud Chaput
09929a42f7 [Glitch] Fix log out from user menu not working on Safari
Port c3e1d86d58 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-14 21:24:50 +02:00
Michael Stanclift
9194197de5
Modify profile directory page image borders (#31391) 2024-08-14 19:23:45 +00:00
Claire
a190efcd6d [Glitch] Fix modal border and padding inconsistencies
Port 2b1670da48 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-14 21:23:10 +02:00
Renaud Chaput
072f560174 [Glitch] Change avatars border radius
Port f6d090fdf5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-14 21:22:42 +02:00
Renaud Chaput
d3db2d04ad [Glitch] Add a border above the timeline hint for statuses with replies
Port 7e501c59c2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-14 21:22:07 +02:00
Claire
169b35869f Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream 2024-08-14 21:17:43 +02:00
Michael Stanclift
a1ddaa9ee9
Fix removal of border from account listing (#31432) 2024-08-14 17:09:23 +00:00
renovate[bot]
3cc2968344
Update dependency wicg-inert to v3.1.3 (#31423)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-14 14:55:01 +00:00
renovate[bot]
5c91610e53
Update dependency postcss-preset-env to v10.0.1 (#31422)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-14 14:23:17 +00:00
renovate[bot]
b5e799d165
Update dependency postcss to v8.4.41 (#31420)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-14 13:12:16 +00:00
renovate[bot]
b5ad4aae23
Update dependency propshaft to v0.9.1 (#31421)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-14 12:48:01 +00:00
renovate[bot]
5b2750e384
Update dependency libvips to v8.15.3 (#31416)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-14 09:45:14 +00:00
renovate[bot]
4fdaf4513d
Update dependency oj to v3.16.5 (#31417)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-14 09:21:51 +00:00
Jeong Arm
95c11d365d
Don't push to cache buster if attachment path is nil (#31414) 2024-08-14 08:57:42 +00:00
renovate[bot]
8d96907933
Update dependency @types/webpack to v4.41.39 (#31379)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-14 07:35:33 +00:00
Claire
7996a9543d
Change notification request acceptance to immediately delete the request (#31256) 2024-08-14 07:34:30 +00:00
renovate[bot]
3e3450be36
Update dependency cssnano to v7.0.5 (#31413)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-14 07:33:32 +00:00
renovate[bot]
ee6d3a83f1
Update dependency concurrent-ruby to v1.3.4 (#31412)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-14 07:32:19 +00:00
github-actions[bot]
202f43ccc6
New Crowdin Translations (automated) (#31411)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-14 07:04:01 +00:00
Renaud Chaput
feaf2f2437
Update renovate config to fix #31379 (#31408) 2024-08-14 06:53:12 +00:00
Renaud Chaput
0d85a79f19
Fix notification screen crashing in rare cases where the status no longer exists (#31403) 2024-08-14 06:47:15 +00:00
renovate[bot]
6bd7da72e9
Update crowdin/github-action action to v2 (#31380)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-13 22:28:13 +00:00
Michael Stanclift
7d4b602cb2
Fix collapsable column borders in Safari and improve Safari scrollbars (#31389) 2024-08-13 21:54:03 +00:00
renovate[bot]
d767439205
Update dependency axios to v1.7.4 [SECURITY] (#31409)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-13 21:53:36 +00:00
Matt Jankowski
2e85167188
Only run PR rebase needed check on non-fork repos (#31401) 2024-08-13 21:37:26 +00:00
renovate[bot]
3a787d785c
Update docker/build-push-action action to v6 (#31381)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-13 20:09:38 +00:00
Claire
12582d095e
Fix styling of notification browser permission denied banner (#31406) 2024-08-13 19:32:27 +00:00
Renaud Chaput
c3e1d86d58
Fix log out from user menu not working on Safari (#31402) 2024-08-13 17:49:23 +00:00
Claire
2b1670da48
Fix modal border and padding inconsistencies (#31399) 2024-08-13 17:48:28 +00:00
Claire
2ed13071ef
Fix what was intended as a comment being interpreted as strings (#31398) 2024-08-13 08:48:10 +00:00
github-actions[bot]
862e793b45
New Crowdin Translations (automated) (#31394)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-13 07:42:08 +00:00
Matt Jankowski
02df1b4e4a
Finish email allow/deny list naming migration (#30530) 2024-08-13 07:37:32 +00:00
Renaud Chaput
f6d090fdf5
Change avatars border radius (#31390) 2024-08-13 07:26:23 +00:00
Renaud Chaput
7e501c59c2
Add a border above the timeline hint for statuses with replies (#31387) 2024-08-13 07:14:41 +00:00
Claire
115fb0a513
Merge pull request #2811 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to b42661ba95
2024-08-12 19:37:25 +02:00
Claire
8426c20d34 [Glitch] Fix all streamed notification types being stored without filtering
Port a7b718c31a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-12 17:51:54 +02:00
Michael Stanclift
61b2139267 [Glitch] Fix account header avatar border
Port fbdda9f6c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-12 17:51:25 +02:00
Michael Stanclift
47df10e9ed [Glitch] Revert Safari scrollbar changes
Port 7365a13ee7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-12 17:50:25 +02:00
Essem
939af853e6 [Glitch] Fix extra slash on notification policy request
Port 2e03dc9fbf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-12 17:49:55 +02:00
Claire
83480df820 Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added `<s>` to the list of allowed tags, the conflict is because
  we have a different list of allowed tags.
  Added `<s>` like upstream did.
2024-08-12 17:46:24 +02:00