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

Git checkout b kmycode kb development trytomerge #18

Merged
merged 49 commits into from
Oct 4, 2024
Merged

Git checkout b kmycode kb development trytomerge #18

merged 49 commits into from
Oct 4, 2024

Conversation

glitchbirdnew
Copy link
Owner

No description provided.

ClearlyClaire and others added 30 commits September 26, 2024 07:40
@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 <[email protected]>
@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 <[email protected]>
@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
@kmycode
Add: 引用可能なソフトウェアにbridgy-fedを追加 (kmycode#852)
652f182
@Gargron
Fix missing permission on new embeds making them unclickable (mastodo…
c352ce6 
…n#32135)
@renovate
Update dependency propshaft to v1.0.1 (mastodon#32158)
6037714 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#32140)
f477dc3 
Co-authored-by: GitHub Actions <[email protected]>
@renovate
Update DefinitelyTyped types (non-major) (mastodon#32163)
bf7cfba 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency sass to v1.79.4 (mastodon#32139)
431b382 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Remove regexp timeout feature (mastodon#32169)
e22eff8
@ClearlyClaire
Merge commit from fork
0c872be 
This should not change the set of words matched by `USERNAME_RE` but does
change the one matched by `MENTION_RE`. Indeed, the previous regexp allowed
a domain part to start with `.` or `-`, which the new regexp does not allow.
@ClearlyClaire
Bump version to 4.3.0-rc.1 (mastodon#32124)
0321008
@ClearlyClaire
Support translation branches in Crowdin (mastodon#32174)
07cd1fd
@kmycode
Merge remote-tracking branch 'parent/main' into upstream-20241001
133a263
kmycode and others added 19 commits October 1, 2024 08:31
@kmycode
Merge pull request kmycode#858 from kmycode/upstream-20241001
429469b 
Upstream 20241001
@kmycode
Fix: 絵文字リアクションボタンが右にずれる問題
a877e64
@glitchbirdnew
Merge pull request #10 from glitchbirdnew/git-checkout--b-kmycode-kb_…
cb91a57 
…development-mbarnew

Git checkout  b kmycode kb development mbarnew
@kmycode
Fix: 絵文字リアクション通知のグループ化が行われない問題
4182f75
@glitchbirdnew
Merge pull request #12 from glitchbirdnew/Upstream-merge
8c42490 
Merge pull request #10 from glitchbirdnew/git-checkout--b-kmycode-kb_…
@kmycode
Merge pull request kmycode#859 from kmycode/kbtopic-fix-emoji-reactio…
007ed79 
…n-button

Fix upstream-20241001
@glitchbirdnew
Merge branch 'mbarnew' into Upstream-kmy
78f1ab2
@glitchbirdnew
Merge pull request #14 from glitchbirdnew/Upstream-kmy
d633a50 
Upstream kmy
@kmycode
Fix: kmycode#854 引用の表示スタイル (kmycode#860)
62bf9ee
@kmycode
Change: kmycode#845 絵文字リアクションのストリーミングを止める設定をその他設定に移動 (kmycode#861)
7a6ec36
@kmycode
Change: kmycode#844 searchableByに意図しない値が入っていたときの挙動 (kmycode#862)
294acdf
@glitchbirdnew
Revert "Merge pull request #14 from glitchbirdnew/Upstream-kmy"
afb4446 
This reverts commit d633a50, reversing
changes made to 8c42490.
@glitchbirdnew
Revert "Merge branch 'mbarnew' into Upstream-kmy"
676e0b3 
This reverts commit 78f1ab2, reversing
changes made to 007ed79.
@glitchbirdnew
fix
14fe789
@glitchbirdnew
Revert "fix"
2394a55 
This reverts commit 14fe789.
@glitchbirdnew
Test
7f3d065
@glitchbirdnew
Merge branch 'mbar' of https://github.com/glitchbirdnew/mastodon into…
5fc6c23 
… mbar
@glitchbirdnew
Merge branch 'mbar' of https://github.com/glitchbirdnew/mastodon into…
83ab11e 
… mbar
@glitchbirdnew
Merge branch 'trytomerge' into git-checkout--b-kmycode-kb_development…
6937b0c 
…-trytomerge
@glitchbirdnew glitchbirdnew merged commit fc5074a into trytomerge Oct 4, 2024
4 of 9 checks passed
@glitchbirdnew glitchbirdnew deleted the git-checkout--b-kmycode-kb_development-trytomerge branch October 4, 2024 01:25
glitchbirdnew added a commit that referenced this pull request Oct 5, 2024
@glitchbirdnew
Revert "Merge pull request #18 from glitchbirdnew/git-checkout--b-kmy…
7bd38d0 
…code-kb_development-trytomerge"

This reverts commit fc5074a, reversing
changes made to e85e705.
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.
6 participants
@glitchbirdnew @ClearlyClaire @mjankowski @c960657 @Gargron @kmycode