natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/syuilo/misskey

This commit is contained in:
syuilo 2018-06-26 18:25:50 +09:00
parent 36c2f8fe5d 2defddc153
commit 5422697397
14 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -14,7 +14,7 @@ ultimately sophisticated professional microblogging software.
<a href="https://www.patreon.com/syuilo"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160" /></a> <a href="https://www.patreon.com/syuilo"><img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" alt="Become a Patron!" width="160" /></a>
![](https://c10.patreonusercontent.com/3/e30%3D/patreon-posts/RsKWEDEKf8D_wYDQWAbex9CSb-1DnXW1nfqfLvuys5ROj2k0VF6_luuzHMTyf95n.png?token-time=1529539200&token-hash=RmcSP0947mw5o2-B6g1L6aU_OoDXANe198kLU6HMO30%3D) ![](https://ja.mstdn.wiki/images/e/ed/Deck.jpg)
:sparkles: Features :sparkles: Features
---------------------------------------------------------------- ----------------------------------------------------------------

2
locales/de.yml
View File

@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
attach-media-from-local: "Medien von deinem PC hinzufügen" attach-media-from-local: "Medien von deinem PC hinzufügen"
attach-media-from-drive: "Medien von deinem Speicher hinzufügen" attach-media-from-drive: "Medien von deinem Speicher hinzufügen"
attach-cancel: "Hinzufügen abbrechen" attach-cancel: "Hinzufügen abbrechen"
insert-a-kao: "v(‘ω’)v" insert-a-kao: "v('ω')v"
create-poll: "Eine Abstimmung erstellen" create-poll: "Eine Abstimmung erstellen"
text-remain: "{} Zeichen verbleibend" text-remain: "{} Zeichen verbleibend"
desktop/views/components/post-form-window.vue: desktop/views/components/post-form-window.vue:

2
locales/en.yml
View File

@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
attach-media-from-local: "Attach media from your PC" attach-media-from-local: "Attach media from your PC"
attach-media-from-drive: "Attach media from your Drive" attach-media-from-drive: "Attach media from your Drive"
attach-cancel: "Cancel attachment" attach-cancel: "Cancel attachment"
insert-a-kao: "v(‘ω’)v" insert-a-kao: "v('ω')v"
create-poll: "Create a poll" create-poll: "Create a poll"
text-remain: "{} characters remaining" text-remain: "{} characters remaining"
desktop/views/components/post-form-window.vue: desktop/views/components/post-form-window.vue:

2
locales/es.yml
View File

@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
attach-media-from-local: "PCからメディアを添付" attach-media-from-local: "PCからメディアを添付"
attach-media-from-drive: "Adjunta multimedia desde tu Disco" attach-media-from-drive: "Adjunta multimedia desde tu Disco"
attach-cancel: "Quitar el archivo adjunto" attach-cancel: "Quitar el archivo adjunto"
insert-a-kao: "v(‘ω’)v" insert-a-kao: "v('ω')v"
create-poll: "Crea una encuesta" create-poll: "Crea una encuesta"
text-remain: "quedan {} caracteres" text-remain: "quedan {} caracteres"
desktop/views/components/post-form-window.vue: desktop/views/components/post-form-window.vue:

2
locales/fr.yml
View File

@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
attach-media-from-local: "Joindre un media depuis votre PC" attach-media-from-local: "Joindre un media depuis votre PC"
attach-media-from-drive: "Joindre un media depuis votre Drive" attach-media-from-drive: "Joindre un media depuis votre Drive"
attach-cancel: "Annuler la jointure de fichier" attach-cancel: "Annuler la jointure de fichier"
insert-a-kao: "v(‘ω’)v" insert-a-kao: "v('ω')v"
create-poll: "Créer un sondage" create-poll: "Créer un sondage"
text-remain: "{} charactères restants" text-remain: "{} charactères restants"
desktop/views/components/post-form-window.vue: desktop/views/components/post-form-window.vue:

2
locales/it.yml
View File

@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
attach-media-from-local: "PCからメディアを添付" attach-media-from-local: "PCからメディアを添付"
attach-media-from-drive: "ドライブからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付"
attach-cancel: "添付取り消し" attach-cancel: "添付取り消し"
insert-a-kao: "v(‘ω’)v" insert-a-kao: "v('ω')v"
create-poll: "アンケートを作成" create-poll: "アンケートを作成"
text-remain: "残り{}文字" text-remain: "残り{}文字"
desktop/views/components/post-form-window.vue: desktop/views/components/post-form-window.vue:

2
locales/ja.yml
View File

@ -461,7 +461,7 @@ desktop/views/components/post-form.vue:
attach-media-from-local: "PCからメディアを添付" attach-media-from-local: "PCからメディアを添付"
attach-media-from-drive: "ドライブからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付"
attach-cancel: "添付取り消し" attach-cancel: "添付取り消し"
insert-a-kao: "v(‘ω’)v" insert-a-kao: "v('ω')v"
create-poll: "アンケートを作成" create-poll: "アンケートを作成"
text-remain: "残り{}文字" text-remain: "残り{}文字"

2
locales/ko.yml
View File

@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
attach-media-from-local: "PCからメディアを添付" attach-media-from-local: "PCからメディアを添付"
attach-media-from-drive: "ドライブからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付"
attach-cancel: "添付取り消し" attach-cancel: "添付取り消し"
insert-a-kao: "v(‘ω’)v" insert-a-kao: "v('ω')v"
create-poll: "アンケートを作成" create-poll: "アンケートを作成"
text-remain: "残り{}文字" text-remain: "残り{}文字"
desktop/views/components/post-form-window.vue: desktop/views/components/post-form-window.vue:

2
locales/pl.yml
View File

@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
attach-media-from-local: "Załącz zawartość multimedialną z komputera" attach-media-from-local: "Załącz zawartość multimedialną z komputera"
attach-media-from-drive: "Załącz zawartość multimedialną z dysku" attach-media-from-drive: "Załącz zawartość multimedialną z dysku"
attach-cancel: "Usuń załącznik" attach-cancel: "Usuń załącznik"
insert-a-kao: "v(‘ω’)v" insert-a-kao: "v('ω')v"
create-poll: "Utwórz ankietę" create-poll: "Utwórz ankietę"
text-remain: "pozostałe znaki: {}" text-remain: "pozostałe znaki: {}"
desktop/views/components/post-form-window.vue: desktop/views/components/post-form-window.vue:

2
locales/pt.yml
View File

@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
attach-media-from-local: "PCからメディアを添付" attach-media-from-local: "PCからメディアを添付"
attach-media-from-drive: "ドライブからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付"
attach-cancel: "添付取り消し" attach-cancel: "添付取り消し"
insert-a-kao: "v(‘ω’)v" insert-a-kao: "v('ω')v"
create-poll: "アンケートを作成" create-poll: "アンケートを作成"
text-remain: "残り{}文字" text-remain: "残り{}文字"
desktop/views/components/post-form-window.vue: desktop/views/components/post-form-window.vue:

2
locales/ru.yml
View File

@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
attach-media-from-local: "PCからメディアを添付" attach-media-from-local: "PCからメディアを添付"
attach-media-from-drive: "ドライブからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付"
attach-cancel: "添付取り消し" attach-cancel: "添付取り消し"
insert-a-kao: "v(‘ω’)v" insert-a-kao: "v('ω')v"
create-poll: "アンケートを作成" create-poll: "アンケートを作成"
text-remain: "残り{}文字" text-remain: "残り{}文字"
desktop/views/components/post-form-window.vue: desktop/views/components/post-form-window.vue:

2
locales/zh.yml
View File

@ -400,7 +400,7 @@ desktop/views/components/post-form.vue:
attach-media-from-local: "PCからメディアを添付" attach-media-from-local: "PCからメディアを添付"
attach-media-from-drive: "ドライブからメディアを添付" attach-media-from-drive: "ドライブからメディアを添付"
attach-cancel: "添付取り消し" attach-cancel: "添付取り消し"
insert-a-kao: "v(‘ω’)v" insert-a-kao: "v('ω')v"
create-poll: "アンケートを作成" create-poll: "アンケートを作成"
text-remain: "残り{}文字" text-remain: "残り{}文字"
desktop/views/components/post-form-window.vue: desktop/views/components/post-form-window.vue:

8
package.json
View File

@ -65,7 +65,7 @@
"@types/mocha": "5.2.3", "@types/mocha": "5.2.3",
"@types/mongodb": "3.0.21", "@types/mongodb": "3.0.21",
"@types/ms": "0.7.30", "@types/ms": "0.7.30",
"@types/node": "10.3.5", "@types/node": "10.3.6",
"@types/nopt": "3.0.29", "@types/nopt": "3.0.29",
"@types/parse5": "5.0.0", "@types/parse5": "5.0.0",
"@types/pug": "2.0.4", "@types/pug": "2.0.4",
@ -80,7 +80,7 @@
"@types/speakeasy": "2.0.2", "@types/speakeasy": "2.0.2",
"@types/tmp": "0.0.33", "@types/tmp": "0.0.33",
"@types/uuid": "3.4.3", "@types/uuid": "3.4.3",
"@types/webpack": "4.4.2", "@types/webpack": "4.4.3",
"@types/webpack-stream": "3.2.10", "@types/webpack-stream": "3.2.10",
"@types/websocket": "0.0.39", "@types/websocket": "0.0.39",
"@types/ws": "5.1.2", "@types/ws": "5.1.2",
@ -102,7 +102,7 @@
"element-ui": "2.4.1", "element-ui": "2.4.1",
"emojilib": "2.2.12", "emojilib": "2.2.12",
"escape-regexp": "0.0.1", "escape-regexp": "0.0.1",
"eslint": "5.0.0", "eslint": "5.0.1",
"eslint-plugin-vue": "4.5.0", "eslint-plugin-vue": "4.5.0",
"eventemitter3": "3.1.0", "eventemitter3": "3.1.0",
"exif-js": "2.3.0", "exif-js": "2.3.0",
@ -126,7 +126,7 @@
"gulp-util": "3.0.8", "gulp-util": "3.0.8",
"hard-source-webpack-plugin": "0.9.0", "hard-source-webpack-plugin": "0.9.0",
"highlight.js": "9.12.0", "highlight.js": "9.12.0",
"html-minifier": "3.5.16", "html-minifier": "3.5.17",
"http-signature": "1.2.0", "http-signature": "1.2.0",
"inquirer": "6.0.0", "inquirer": "6.0.0",
"is-root": "2.0.0", "is-root": "2.0.0",

2
src/client/app/common/scripts/get-kao.ts
View File

@ -1,5 +1,5 @@
export default () => [ export default () => [
'(=^・・^=)', '(=^・・^=)',
'v(‘ω’)v', 'v('ω')v',
'🐡( \'-\' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!' '🐡( \'-\' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!'
][Math.floor(Math.random() * 3)]; ][Math.floor(Math.random() * 3)];