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.

Sign up for GitHub

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

Jump to bottom

Bring in upstream changes #32

Merged
merged 98 commits into from
Aug 11, 2024
Merged

Bring in upstream changes #32

merged 98 commits into from
Aug 11, 2024

Conversation

nomad-geek
Copy link

No description provided.

renchap and others added 30 commits August 2, 2024 19:55
@renchap
Fix typo in english message (filtred => filtered) (mastodon#31273)
19f4aa1
@c960657
Disable irrelevant fields unless cleanup is enabled (mastodon#26562)
3d6e8d6
@valtlai
Fix missing border around tab/filter bar (mastodon#31286)
b6c1b8f
@valtlai
Fix duplicate border around search results (mastodon#31284)
315308b
@renovate
chore(deps): update devdependencies (non-major) (mastodon#31294)
3fec1ba 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency @types/ws to v8.5.12 (mastodon#31293)
e99c0e6 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency ffmpeg to v7.0.2 (mastodon#31289)
f33049f 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
fix(deps): update dependency core-js to v3.38.0 (mastodon#31290)
3a36893 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update yarn to v4.4.0 (mastodon#31274)
176d1fe 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency aws-sdk-s3 to v1.157.0 (mastodon#31252)
9e440be 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency sidekiq-scheduler to v5.0.6 (mastodon#…
29d6310 
…31245)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
fix(deps): update dependency postcss-preset-env to v10 (mastodon#31279)
02c2222 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency fog-core to '<= 2.5.0' (mastodon#31267)
a1eaf12 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#31276)
cb56a6d 
Co-authored-by: GitHub Actions <noreply@github.com>
@renovate
chore(deps): update dependency bootsnap to v1.18.4 (mastodon#31297)
6563738 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@valtlai
Improve look of verified header fields in profile (mastodon#31275)
c01a6a6
@renchap
Add account notes to hover cards (mastodon#31300)
97b9e8b
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#31307)
d15f46a 
Co-authored-by: GitHub Actions <noreply@github.com>
@renovate
chore(deps): update dependency rubocop-rspec to v3.0.4 (mastodon#31301)
135493c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@c960657
Support JSON-LD named graph (mastodon#31288)
e9e63ed
@renovate @renchap
fix(deps): update dependency @reduxjs/toolkit to v2.2.7 - abandoned (m…
103e544 
…astodon#31173)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
@c960657
Check Content-Length in ResponseWithLimitAdapter (mastodon#31285)
9d0cafd
@ClearlyClaire
Delete pending notification requests on block and notification mutes (m…
5d890eb 
…astodon#31310)
@ClearlyClaire
Add option to request partial accounts in grouped notifications API (m…
438dac9 
…astodon#31299)
@renchap
Remove usage of non-public RTK types (mastodon#31312)
57a1f86
@ClearlyClaire
Fix broken “mute” button in mutes list (mastodon#31315)
30430a6
@ClearlyClaire
Fix mutes and blocks not immediately cleaning up notification request…
c8b9e60 
…s in Web UI (mastodon#31316)
@ClearlyClaire
Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-s…
08adca0 
…oc/merge-upstream
@renchap @ClearlyClaire
[Glitch] Fix typo in english message (filtred => filtered)
700ebdb 
Port 19f4aa1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@c960657 @ClearlyClaire
[Glitch] Disable irrelevant fields unless cleanup is enabled
5cdc0c2 
Port 3d6e8d6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
renchap and others added 29 commits August 8, 2024 19:22
@renchap
Disable stylelint rules that are conflicting with Prettier (mastodon#…
a207a1f 
…31339)
@vmstan
Fix list creation textbox styling (mastodon#31348)
389549e
@renovate
Update dependency eslint-plugin-jsdoc to v50 (mastodon#31330)
f045ef8 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency eslint-plugin-promise to v7 (mastodon#31120)
6e01a23 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renchap
Update notification labels for mentions (mastodon#31304)
2095d0f
@ClearlyClaire
Change unread notification count to only cover the selected notificat…
6ca731e 
…ion type (mastodon#31326)
@vmstan
Fix post filter & report styling (mastodon#31349)
9538d9c
@tribela
Change confirmation prompt on trending management (mastodon#19626)
9bae237
@ClearlyClaire
Bust CDN cache on media deletion (mastodon#31353)
994ef16
@c960657
Add lang attribute on preview card title (mastodon#31303)
e29c401
@ClearlyClaire
Revamp notification policy options (mastodon#31343)
cbdd8ed
@ClearlyClaire
Revert "Support JSON-LD named graph (mastodon#31288)" (mastodon#31355)
8a5b57f
@ClearlyClaire
Add option to ignore filtered notifications to the web interface (mas…
1701575 
…todon#31342)
@ClearlyClaire
Fix incorrect rate limit on PUT requests (mastodon#31356)
eaedd52
@ClearlyClaire @renchap
Add ability to report, block and mute from notification requests list (…
658addc 
…mastodon#31309)

Co-authored-by: Renaud Chaput <renchap@gmail.com>
@ClearlyClaire
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-s…
31a00c0 
…oc/merge-upstream
@vmstan @ClearlyClaire
[Glitch] Fix styling issues with notification settings and mobile bor…
cc2949b 
…ders

Port 664bef3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@vmstan @ClearlyClaire
[Glitch] Fix list creation textbox styling
e7be55f 
Port 389549e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@renchap @ClearlyClaire
[Glitch] Update notification labels for mentions
5a9f526 
Port 2095d0f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Change unread notification count to only cover the selected …
ce9715d 
…notification type

Port 6ca731e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@vmstan @ClearlyClaire
[Glitch] Fix post filter & report styling
99d3816 
Port 9538d9c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Add option to ignore filtered notifications to the web inter…
58b9b80 
…face

Port 1701575 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire @renchap
[Glitch] Add ability to report, block and mute from notification requ…
b6961d0 
…ests list

Port 658addc to glitch-soc

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@audiodude
Add hint to user that other remote statuses may not be displayed (mas…
bcec8f5 
…todon#26910)
@ClearlyClaire
Fix “Accept all”/“Dismiss all” notification requests not working (mas…
28411ac 
…todon#31358)
@ClearlyClaire
Merge commit '28411acebb5626acf43b44a7b6c33ac783156f72' into glitch-s…
f43a484 
…oc/merge-upstream
@audiodude @ClearlyClaire
[Glitch] Add hint to user that other remote statuses may not be displ…
57a6307 
…ayed

Port bcec8f5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Fix “Accept all”/“Dismiss all” notification requests not wor…
082c71f 
…king

Port 28411ac to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Merge pull request #2809 from ClearlyClaire/glitch-soc/merge-upstream
e6feabf 
Merge upstream changes up to 28411ac
@nomad-geek nomad-geek merged commit 290902f into dftba-club:2024-08-10-1 Aug 11, 2024
15 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@nomad-geek @renchap @c960657 @valtlai @ClearlyClaire @mjankowski @vmstan @tribela @audiodude