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

Merge upstream changes up to 9d664f87a04b6a5157ddbe60ee33b5b7a960198e #2860

Merged
merged 32 commits into from
Sep 29, 2024
Merged

Merge upstream changes up to 9d664f87a04b6a5157ddbe60ee33b5b7a960198e #2860

merged 32 commits into from
Sep 29, 2024

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Sep 29, 2024 •
edited
Loading

Gargron and others added 30 commits September 25, 2024 16:36
@Gargron
Change responsive break points on navigation panel in web UI (mastodo…
28c4eca 
…n#32034)
@Gargron
Add preview of followers removed in domain block modal in web UI (mas…
3426ea2 
…todon#32032)
@c960657
Rename "Data export" menu item (mastodon#32099)
db33255
@ClearlyClaire
Fix typo causing incorrect error being raised in blurhash processing …
886baa5 
…failure (mastodon#32104)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#32103)
278a075 
Co-authored-by: GitHub Actions <noreply@github.com>
@mjankowski
Remove page_json var from ap/replies spec (mastodon#32000)
db57fe8
@c960657
Use same styling for statuses in email as on web (mastodon#32073)
00aaf77
@Gargron
Change design of media tab on profiles in web UI (mastodon#31967)
89df27a
@ClearlyClaire
Add fallback to domain block confirmation modal (mastodon#32105)
7a62d57
@Gargron
Add ability to view alt text by clicking the ALT badge in web UI (mas…
a04433f 
…todon#32058)
@ClearlyClaire
Fix scrollbar width (mastodon#32091)
89c39e7
@mjankowski
Use 1 column layout for form ul on narrow widths (mastodon#32112)
106b22b
@renovate
Update dependency blurhash to v0.1.8 (mastodon#32114)
ee2d966 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Add “A Mastodon update is available.” message on admin dashboard for …
513f187 
…non-bugfix updates (mastodon#32106)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#32121)
c9b0699 
Co-authored-by: GitHub Actions <noreply@github.com>
@mjankowski
Only show recently used tags hint when they are present (mastodon#32120)
675ec1a
@mjankowski
Wrap webhook event label with samp tag (mastodon#32115)
04dd3a9
@mjankowski
Use previously extracted model constants in form maxlength attribut…
e02e88b 
…es (mastodon#32113)
@mjankowski
Remove completed TODO note in tags request spec (mastodon#32108)
cdd7526
@Gargron
Change media reordering design in the compose form in web UI (mastodo…
11a12e5 
…n#32093)
@mjankowski
Add no-toolbar state for "nothing here" batch table views (mastodon…
24d3ce7 
…#32128)
@c960657
Mailer layout fixes (mastodon#32132)
9d664f8
@ClearlyClaire
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-s…
7ef25ae 
…oc/merge-upstream
@Gargron @ClearlyClaire
[Glitch] Add preview of followers removed in domain block modal in we…
7b290ce 
…b UI

Port 3426ea2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Add fallback to domain block confirmation modal
8439084 
Port 7a62d57 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
[Glitch] Fix scrollbar width
77d2f7e 
Port 89c39e7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@mjankowski @ClearlyClaire
[Glitch] Use 1 column layout for form ul on narrow widths
3fa34bd 
Port 106b22b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@mjankowski @ClearlyClaire
[Glitch] Add no-toolbar state for "nothing here" batch table views
b8c23f9 
Port 24d3ce7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@Gargron @ClearlyClaire
[Glitch] Change responsive break points on navigation panel in web UI
157ecf2 
Port 28c4eca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@Gargron @ClearlyClaire
[Glitch] Change design of media tab on profiles in web UI
9b5f073 
Port 89df27a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@Gargron @ClearlyClaire
[Glitch] Add ability to view alt text by clicking the ALT badge in we…
9e10fd5 
…b UI

Port a04433f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@Gargron @ClearlyClaire
[Glitch] Change media reordering design in the compose form in web UI
e80971e 
Port 11a12e5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire ClearlyClaire marked this pull request as ready for review September 29, 2024 12:28
@ClearlyClaire ClearlyClaire merged commit 9bf624b into glitch-soc:main Sep 29, 2024
35 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.
4 participants
@ClearlyClaire @Gargron @c960657 @mjankowski