graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-09 19:43:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

Browse source
This commit is contained in:
tamaina 2023-01-04 11:09:15 +00:00
commit fa04b7a3c3
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -73,6 +73,8 @@ You should also include the user name that made the change.
- Server: trim long text of note from ap @syuilo - Server: trim long text of note from ap @syuilo
- Server: Ap inboxの最大ペイロードサイズを64kbに制限 @syuilo - Server: Ap inboxの最大ペイロードサイズを64kbに制限 @syuilo
- Server: アンテナの作成数上限を追加 @syuilo - Server: アンテナの作成数上限を追加 @syuilo
- Server: pages/likeのエラーIDが重複しているのを修正 @syuilo
- Server: pages/updateのパラメータによってはsummaryの値が更新されないのを修正 @syuilo
- Client: case insensitive emoji search @saschanaz - Client: case insensitive emoji search @saschanaz
- Client: InAppウィンドウが操作できなくなることがあるのを修正 @tamaina - Client: InAppウィンドウが操作できなくなることがあるのを修正 @tamaina
- Client: use proxied image for instance icon @syuilo - Client: use proxied image for instance icon @syuilo

2
packages/backend/src/server/api/endpoints/pages/like.ts
View file

@ -28,7 +28,7 @@ export const meta = {
alreadyLiked: { alreadyLiked: {
message: 'The page has already been liked.', message: 'The page has already been liked.',
code: 'ALREADY_LIKED', code: 'ALREADY_LIKED',
id: 'cc98a8a2-0dc3-4123-b198-62c71df18ed3', id: 'd4c1edbe-7da2-4eae-8714-1acfd2d63941',
}, },
}, },
} as const; } as const;

2
packages/backend/src/server/api/endpoints/pages/update.ts
View file

@ -111,7 +111,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
updatedAt: new Date(), updatedAt: new Date(),
title: ps.title, title: ps.title,
name: ps.name === undefined ? page.name : ps.name, name: ps.name === undefined ? page.name : ps.name,
summary: ps.name === undefined ? page.summary : ps.summary, summary: ps.summary === undefined ? page.summary : ps.summary,
content: ps.content, content: ps.content,
variables: ps.variables, variables: ps.variables,
script: ps.script, script: ps.script,

2
packages/frontend/src/components/MkSuperMenu.vue
View file

@ -62,7 +62,7 @@ export default defineComponent({
align-items: center; align-items: center;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
padding: 10px 16px 10px 8px; padding: 9px 16px 9px 8px;
border-radius: 9px; border-radius: 9px;
font-size: 0.9em; font-size: 0.9em;