1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-15 23:28:31 +09:00
Commit Graph

22832 Commits

Author SHA1 Message Date
Claire
89a61954a7
Merge pull request #2817 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 53c183f899
2024-08-19 20:43:17 +02:00
Claire
bfd01110d8 [Glitch] Reload notifications when accepted notifications are merged (streaming only)
Port 53c183f899 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-19 18:43:57 +02:00
Claire
99ffae7d44 [Glitch] Refactor some actions to be proper async actions instead of passing a continuation
Port 1e612c5a09 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-19 18:43:24 +02:00
Emelia Smith
a7751d26e7 [Glitch] Disable rule selector in ReportReasonSelector if instance has no rules
Port 71f257d529 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-19 18:34:06 +02:00
Claire
1760f84349 Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream 2024-08-19 18:25:31 +02:00
Claire
53c183f899
Reload notifications when accepted notifications are merged (streaming only) (#31419) 2024-08-19 15:59:06 +00:00
Edward Moulsdale
d4f135bc6d
Fix in memoriam accounts appearing in follow recommendations (#31474)
Co-authored-by: Utkarsh Wankar <46633523+kernal053@users.noreply.github.com>
2024-08-19 15:55:42 +00:00
Claire
d2e4be0456
Hopefully fix notifications pagination flaky test (#31494) 2024-08-19 14:53:54 +00:00
Claire
1e612c5a09
Refactor some actions to be proper async actions instead of passing a continuation (#31453) 2024-08-19 14:41:32 +00:00
Renaud Chaput
40f6631ac9
Fix Husky git hooks not being installed anymore (#31435) 2024-08-19 13:55:18 +00:00
Emelia Smith
99051479c1
Fix Trending Tags pending review having an unstable sort order (#31473)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-08-19 13:25:40 +00:00
Emelia Smith
71f257d529
Disable rule selector in ReportReasonSelector if instance has no rules (#31458) 2024-08-19 12:28:06 +00:00
renovate[bot]
31d374e5f5
Update opentelemetry-ruby (non-major) (#31451)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-19 11:42:33 +00:00
renovate[bot]
3db3e3dae5
Update dependency postcss-preset-env to v10.0.2 (#31488)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-19 08:56:08 +00:00
github-actions[bot]
c4e0a7dced
New Crowdin Translations (automated) (#31463)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-19 08:29:48 +00:00
renovate[bot]
9cda8c0197
Update dependency use-debounce to v10.0.3 (#31468)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-19 08:12:01 +00:00
renovate[bot]
d57ee31413
Update devDependencies (non-major) (#31489)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-19 08:10:15 +00:00
renovate[bot]
d6404714b6
Update eslint (non-major) (#31490)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-19 08:10:13 +00:00
Claire
ec1ee7a732
Merge pull request #2815 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 2d589a5ed4
2024-08-16 21:44:46 +02:00
Renaud Chaput
ceeabffee5 [Glitch] Add a follow button & follower count on follow notifications
Port 32a78e56e0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-16 20:09:01 +02:00
Claire
3ea00508ac Merge commit '2d589a5ed445b474ab7cec27b0db2a331ed7bd49' into glitch-soc/merge-upstream 2024-08-16 20:06:59 +02:00
Claire
2d589a5ed4
Fix incorrect activity matching in notification unfiltering worker (#31456) 2024-08-16 17:11:23 +00:00
Claire
1acbb628b9
Update changelog for v4.2.11 (#31452) 2024-08-16 12:52:57 +00:00
renovate[bot]
367d3841af
Update dependency aws-sdk-s3 to v1.158.0 (#31447)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-16 10:34:40 +00:00
renovate[bot]
a2dfe5a779
Update dependency test-prof to v1.4.0 (#31431)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-16 10:33:24 +00:00
Renaud Chaput
32a78e56e0
Add a follow button & follower count on follow notifications (#31433) 2024-08-16 10:00:59 +00:00
renovate[bot]
622628a199
Update dependency rspec-rails to v6.1.4 (#31442)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-16 10:00:15 +00:00
renovate[bot]
a0afbba54d
Update dependency sanitize to v6.1.3 (#31434)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-16 09:54:27 +00:00
renovate[bot]
78d08da1fb
Update opentelemetry-ruby (non-major) (#31446)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-16 09:53:33 +00:00
github-actions[bot]
9a24552732
New Crowdin Translations (automated) (#31440)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-16 09:11:33 +00:00
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