merge upstream #3
oat
commented 2022-11-21 04:12:47 +01:00
Owner
No description provided.
oat
added 36 commits 2022-11-21 04:12:47 +01:00
f890fdca41
Bump Helm app version to 4.0.2 (#20697)
aaca78da78
Fix safari explore disappearing tabs (#20917)
a2931d19ae
Add missing admin scopes (fix #20892) (#20918)
413481f953
Add maskable icon support for Android (#20904)
0cc77263fc
Change batch account suspension to create a strike (#20897)
642870c82b
Bump Helm chart version to account for mastodon 4 (#20886)
654d348aac
Make the button that expands the publish form differentiable from the button that publishes a post (#20864)
e1f819fd78
Fix pagination of followed tags (#20861)
eb80789b0b
Fix misleading wording about waitlists (#20850)
7955d4b959
Add form-action CSP directive (#20781)
00b2720ef0
Change automatic post deletion configuration to be accessible to redirected users (#20774)
72618ebf03
Fix getting a single EmailDomainBlock (#20846)
7fdeed5fbc
Make tag following idempotent (#20860)
cbb0153bd0
Fix invalid/empty RSS feed link on account pages (#20772)
daf6f3453e
Handle links with no href in VerifyLinkService (#20741)
92734e3df1
Use buildx functions for faster build (#20692)
e7deea62d1
Remove last references to "silencing" in UI text (#20637)
c373148b3d
Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)
4f15fd0ba1
Fix style for hashes (#20518)
585cc1a604
Remove use of DOMParser in front-end emoji rewriting code (#20758)
ab7d99e035
Fix various issues with domain block import (#1944)
aec61a703f
Merge branch 'main' into glitch-soc/merge-upstream
5ef92dff57
Remove glitch-soc-specific translations of upstreamed feature (domain block import)
1b5ed32085
Split off Dockerfile components for faster build times (#20933)
87929ad866
[Glitch] Fix safari explore disappearing tabs
4b449fff23
[Glitch] Make the button that expands the publish form differentiable from the button that publishes a post
c22f3a87a3
[Glitch] Remove use of DOMParser in front-end emoji rewriting code
381137c94e
Merge pull request #1951 from ClearlyClaire/glitch-soc/merge-upstream
0a78631e86
New Crowdin updates (#20759)
231e3ec552
Remove blank line from start of Dockerfile breaking syntax declaration (#20948)
4ae97a2e4c
Fix OAuth flow being broken by recent CSP change (#20958)
367db8222f
Merge branch 'main' into glitch-soc/merge-upstream
f233b5ed25
Merge pull request #1954 from ClearlyClaire/glitch-soc/merge-upstream
48e136605a
Fix form-action CSP directive for external login (#20962)
597a783742
Merge branch 'main' into glitch-soc/merge-upstream
e0e7a09cfe
Merge pull request #1955 from ClearlyClaire/glitch-soc/merge-upstream
oat
merged commit 7cb3b3f2df into main 2022-11-21 04:13:52 +01:00
oat
referenced this issue from a commit 2022-11-21 04:13:52 +01:00
Merge pull request 'merge upstream' (#3) from remote/mastodon:main into main
Loading…
Reference in New Issue
No description provided.
Delete Branch ":main"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?