diff --git a/CHANGELOG.md b/CHANGELOG.md index 64de67ed2..94ffe4f2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,12 @@ mongodb: 8. master ブランチに戻す 9. enjoy +11.9.0 (2019/05/02) +------------------- +### Improvements +* MisskeyPagesで編集時にページブロックをドラッグで並べ替えられるように +* MisskeyPagesにカウンターボタンブロックを追加 + 11.8.1 (2019/05/02) ------------------- ### Fixes diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index a8a5cbafd..5d85819d5 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1915,6 +1915,12 @@ pages: text: "タイトル" default: "デフォルト値" + counter: "カウンター" + _counter: + name: "変数名" + text: "タイトル" + inc: "増加値" + _button: text: "タイトル" action: "ボタンを押したときの動作" diff --git a/package.json b/package.json index 2dddb678f..d1a51e6ea 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "11.8.1", + "version": "11.9.0", "codename": "daybreak", "repository": { "type": "git", diff --git a/src/client/app/common/scripts/collect-page-vars.ts b/src/client/app/common/scripts/collect-page-vars.ts index 683f9b73a..4c40d5d88 100644 --- a/src/client/app/common/scripts/collect-page-vars.ts +++ b/src/client/app/common/scripts/collect-page-vars.ts @@ -26,6 +26,12 @@ export function collectPageVars(content) { type: 'boolean', value: x.default || false }); + } else if (x.type === 'counter') { + pageVars.push({ + name: x.name, + type: 'number', + value: 0 + }); } else if (x.children) { collect(x.children); } diff --git a/src/client/app/common/views/components/page-editor/els/page-editor.el.button.vue b/src/client/app/common/views/components/page-editor/els/page-editor.el.button.vue index 3e2d3fe19..f89279f05 100644 --- a/src/client/app/common/views/components/page-editor/els/page-editor.el.button.vue +++ b/src/client/app/common/views/components/page-editor/els/page-editor.el.button.vue @@ -1,5 +1,5 @@