Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream - 4.2.11 #59

Merged
merged 85 commits into from
Aug 18, 2024
Merged
Changes from 1 commit
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
caf0164
Improve legibility of account/hashtag autosuggest (#31361)
vmstan Aug 10, 2024
7519ef2
Use material symbol for responsive menu toggle (#31362)
mjankowski Aug 10, 2024
885e67b
Use material symbol for modal layout sign out link (#31363)
mjankowski Aug 10, 2024
d308901
Move Follow Recommendations to Trends menu, rename to Recommendations…
ThisIsMissEm Aug 10, 2024
c39a8e1
Change “e-mail” to “email” in en.yml (#31317)
beanieyi Aug 10, 2024
19dbc74
Fix typos in localisation from #31342 (#31369)
renchap Aug 10, 2024
634ab0b
New Crowdin Translations (automated) (#31351)
github-actions[bot] Aug 11, 2024
85152af
New Crowdin Translations (automated) (#31377)
github-actions[bot] Aug 11, 2024
f441b28
Merge commit '85152af95f51642bcef0ba781a1e7213d79e8f03' into glitch-s…
ClearlyClaire Aug 11, 2024
d6e340b
[Glitch] Improve legibility of account/hashtag autosuggest
vmstan Aug 10, 2024
f299f8b
[Glitch] Use material symbol for responsive menu toggle
mjankowski Aug 10, 2024
4515bf9
[Glitch] Move Follow Recommendations to Trends menu, rename to Recomm…
ThisIsMissEm Aug 10, 2024
dff29c8
[Glitch] Fix typos in localisation from #31342
renchap Aug 10, 2024
9edf98c
Merge pull request #2810 from ClearlyClaire/glitch-soc/merge-upstream
ClearlyClaire Aug 11, 2024
2e03dc9
Fix extra slash on notification policy request (#31378)
TheEssem Aug 11, 2024
7365a13
Revert Safari scrollbar changes (#31372)
vmstan Aug 11, 2024
fbdda9f
Fix account header avatar border (#31373)
vmstan Aug 11, 2024
3abb5c0
New Crowdin Translations (automated) (#31382)
github-actions[bot] Aug 12, 2024
709dcd0
Add support for incoming <s> tag (#31375)
mediaformat Aug 12, 2024
a7b718c
Fix all streamed notification types being stored without filtering (#…
ClearlyClaire Aug 12, 2024
a1f723a
Add support for PKCE Extension in OmniAuth OIDC (#31131)
ThisIsMissEm Aug 12, 2024
b42661b
Add missing Appeals link under Moderation in navigiation (#31071)
ThisIsMissEm Aug 12, 2024
83480df
Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-s…
ClearlyClaire Aug 12, 2024
939af85
[Glitch] Fix extra slash on notification policy request
TheEssem Aug 11, 2024
47df10e
[Glitch] Revert Safari scrollbar changes
vmstan Aug 11, 2024
61b2139
[Glitch] Fix account header avatar border
vmstan Aug 11, 2024
8426c20
[Glitch] Fix all streamed notification types being stored without fil…
ClearlyClaire Aug 12, 2024
115fb0a
Merge pull request #2811 from ClearlyClaire/glitch-soc/merge-upstream
ClearlyClaire Aug 12, 2024
7e501c5
Add a border above the timeline hint for statuses with replies (#31387)
renchap Aug 13, 2024
f6d090f
Change avatars border radius (#31390)
renchap Aug 13, 2024
02df1b4
Finish email allow/deny list naming migration (#30530)
mjankowski Aug 13, 2024
862e793
New Crowdin Translations (automated) (#31394)
github-actions[bot] Aug 13, 2024
2ed1307
Fix what was intended as a comment being interpreted as strings (#31398)
ClearlyClaire Aug 13, 2024
2b1670d
Fix modal border and padding inconsistencies (#31399)
ClearlyClaire Aug 13, 2024
c3e1d86
Fix log out from user menu not working on Safari (#31402)
renchap Aug 13, 2024
12582d0
Fix styling of notification browser permission denied banner (#31406)
ClearlyClaire Aug 13, 2024
3a787d7
Update docker/build-push-action action to v6 (#31381)
renovate[bot] Aug 13, 2024
2e85167
Only run PR rebase needed check on non-fork repos (#31401)
mjankowski Aug 13, 2024
d767439
Update dependency axios to v1.7.4 [SECURITY] (#31409)
renovate[bot] Aug 13, 2024
7d4b602
Fix collapsable column borders in Safari and improve Safari scrollbar…
vmstan Aug 13, 2024
6bd7da7
Update crowdin/github-action action to v2 (#31380)
renovate[bot] Aug 13, 2024
0d85a79
Fix notification screen crashing in rare cases where the status no lo…
renchap Aug 14, 2024
feaf2f2
Update renovate config to fix #31379 (#31408)
renchap Aug 14, 2024
202f43c
New Crowdin Translations (automated) (#31411)
github-actions[bot] Aug 14, 2024
ee6d3a8
Update dependency concurrent-ruby to v1.3.4 (#31412)
renovate[bot] Aug 14, 2024
3e3450b
Update dependency cssnano to v7.0.5 (#31413)
renovate[bot] Aug 14, 2024
7996a95
Change notification request acceptance to immediately delete the requ…
ClearlyClaire Aug 14, 2024
8d96907
Update dependency @types/webpack to v4.41.39 (#31379)
renovate[bot] Aug 14, 2024
95c11d3
Don't push to cache buster if attachment path is nil (#31414)
tribela Aug 14, 2024
4fdaf45
Update dependency oj to v3.16.5 (#31417)
renovate[bot] Aug 14, 2024
5b2750e
Update dependency libvips to v8.15.3 (#31416)
renovate[bot] Aug 14, 2024
b5ad4aa
Update dependency propshaft to v0.9.1 (#31421)
renovate[bot] Aug 14, 2024
b5e799d
Update dependency postcss to v8.4.41 (#31420)
renovate[bot] Aug 14, 2024
5c91610
Update dependency postcss-preset-env to v10.0.1 (#31422)
renovate[bot] Aug 14, 2024
3cc2968
Update dependency wicg-inert to v3.1.3 (#31423)
renovate[bot] Aug 14, 2024
a1ddaa9
Fix removal of border from account listing (#31432)
vmstan Aug 14, 2024
169b358
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-s…
ClearlyClaire Aug 14, 2024
d3db2d0
[Glitch] Add a border above the timeline hint for statuses with replies
renchap Aug 13, 2024
072f560
[Glitch] Change avatars border radius
renchap Aug 13, 2024
a190efc
[Glitch] Fix modal border and padding inconsistencies
ClearlyClaire Aug 13, 2024
9194197
Modify profile directory page image borders (#31391)
vmstan Aug 14, 2024
09929a4
[Glitch] Fix log out from user menu not working on Safari
renchap Aug 13, 2024
bf01299
[Glitch] Fix styling of notification browser permission denied banner
ClearlyClaire Aug 13, 2024
cf96857
[Glitch] Fix collapsable column borders in Safari and improve Safari …
vmstan Aug 13, 2024
524fc85
[Glitch] Fix notification screen crashing in rare cases where the sta…
renchap Aug 14, 2024
0dbdf6a
[Glitch] Fix removal of border from account listing
vmstan Aug 14, 2024
4545b8d
Add the ability to ignore specific browser errors for a spec (#31436)
renchap Aug 15, 2024
5d04e29
Disable Chrome's search engine selection screen when running system s…
renchap Aug 15, 2024
d844537
Merge pull request #2813 from ClearlyClaire/glitch-soc/merge-upstream
ClearlyClaire Aug 15, 2024
9f27758
Merge commit '5d04e297755c4a8b4e908f706d272520521341d4' into glitch-s…
ClearlyClaire Aug 15, 2024
104c378
[Glitch] Modify profile directory page image borders
vmstan Aug 14, 2024
d6c80f6
Merge pull request #2814 from ClearlyClaire/glitch-soc/merge-upstream
ClearlyClaire Aug 15, 2024
9a24552
New Crowdin Translations (automated) (#31440)
github-actions[bot] Aug 16, 2024
78d08da
Update opentelemetry-ruby (non-major) (#31446)
renovate[bot] Aug 16, 2024
a0afbba
Update dependency sanitize to v6.1.3 (#31434)
renovate[bot] Aug 16, 2024
622628a
Update dependency rspec-rails to v6.1.4 (#31442)
renovate[bot] Aug 16, 2024
32a78e5
Add a follow button & follower count on follow notifications (#31433)
renchap Aug 16, 2024
a2dfe5a
Update dependency test-prof to v1.4.0 (#31431)
renovate[bot] Aug 16, 2024
367d384
Update dependency aws-sdk-s3 to v1.158.0 (#31447)
renovate[bot] Aug 16, 2024
1acbb62
Update changelog for v4.2.11 (#31452)
ClearlyClaire Aug 16, 2024
2d589a5
Fix incorrect activity matching in notification unfiltering worker (#…
ClearlyClaire Aug 16, 2024
3ea0050
Merge commit '2d589a5ed445b474ab7cec27b0db2a331ed7bd49' into glitch-s…
ClearlyClaire Aug 16, 2024
ceeabff
[Glitch] Add a follow button & follower count on follow notifications
renchap Aug 16, 2024
ec1ee7a
Merge pull request #2815 from ClearlyClaire/glitch-soc/merge-upstream
ClearlyClaire Aug 16, 2024
c2252b4
Merge branch 'glitch-soc-main' into merge-upstream
sneakers-the-rat Aug 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update crowdin/github-action action to v2 (mastodon#31380)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate[bot] authored Aug 13, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 6bd7da72e9394eca4a8ee1addaad1a5118d50881
2 changes: 1 addition & 1 deletion .github/workflows/crowdin-download.yml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ jobs:
# Download the translation files from Crowdin
- name: crowdin action
uses: crowdin/github-action@v1
uses: crowdin/github-action@v2
with:
upload_sources: false
upload_translations: false
2 changes: 1 addition & 1 deletion .github/workflows/crowdin-upload.yml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ jobs:
uses: actions/checkout@v4

- name: crowdin action
uses: crowdin/github-action@v1
uses: crowdin/github-action@v2
with:
upload_sources: true
upload_translations: false