Commit graph

7037 commits

Author SHA1 Message Date
syuilo
d96cdbf66e Merge branch 'master' into hybrid-tl 2018-07-11 13:50:52 +09:00
syuilo
60e866ec25 oops 2018-07-11 13:50:37 +09:00
syuilo
e4a4893b29 Merge branch 'master' into hybrid-tl 2018-07-11 13:49:18 +09:00
syuilo
98775ecb43 oops 2018-07-11 13:49:06 +09:00
syuilo
c7590e2ef5 Merge branch 'master' into hybrid-tl 2018-07-11 13:47:26 +09:00
syuilo
d429c25a2c Refactor 2018-07-11 13:47:01 +09:00
syuilo
63ea2de834 Fix 2018-07-11 13:43:40 +09:00
syuilo
5428b6de48 wip 2018-07-11 13:43:09 +09:00
syuilo
1df45b546c wip 2018-07-11 09:36:30 +09:00
syuilo
12edef6f08 Update call.ts 2018-07-10 22:07:24 +09:00
syuilo
c7e191c665 Merge pull request #1877 from syuilo/greenkeeper/@types/koa-bodyparser-5.0.1
Update @types/koa-bodyparser to the latest version 🚀
2018-07-10 14:39:24 +09:00
greenkeeper[bot]
ec8f8d0f78 fix(package): update @types/koa-bodyparser to version 5.0.1 2018-07-10 01:34:50 +00:00
syuilo
fd53d14cf7 Merge pull request #1875 from tamaina/master
Improve Messaging
2018-07-09 21:24:59 +09:00
syuilo
cc3eb594a1 Refactoring 2018-07-09 21:15:49 +09:00
tamaina
c8070671eb Update messaging-room.message.vue 2018-07-08 23:45:16 +09:00
tamaina
deaa5b350b Update messaging-room.vue 2018-07-08 23:41:09 +09:00
Aya Morisawa
e1dd855f00 Add locales 2018-07-08 20:20:28 +09:00
Aya Morisawa
77ef4404f3 Fix typo 2018-07-08 20:15:10 +09:00
Aya Morisawa
a5f2bcffcd Merge branch 'master' of aya.github:syuilo/misskey 2018-07-08 20:04:35 +09:00
Aya Morisawa
f92221744f Add locales 2018-07-08 20:01:59 +09:00
syuilo
24cebe7280 Merge pull request #1871 from mei23/mei-apreq3
フォロー申請結果とフォロー申請解除の処理の修正
2018-07-08 19:30:56 +09:00
syuilo
18c5aaef07 Merge pull request #1863 from syuilo/greenkeeper/file-type-8.1.0
Update file-type to the latest version 🚀
2018-07-08 17:54:12 +09:00
syuilo
57d8ba3c61 Merge pull request #1862 from syuilo/greenkeeper/node-sass-4.9.2
Update node-sass to the latest version 🚀
2018-07-08 17:53:58 +09:00
syuilo
c327e5a9af Merge pull request #1865 from syuilo/greenkeeper/hard-source-webpack-plugin-0.11.0
fix(package): update hard-source-webpack-plugin to version 0.11.0
2018-07-08 17:53:34 +09:00
mei23
70c17f087b Fix can't process cancel of follow request from remote 2018-07-08 17:22:18 +09:00
mei23
88c522a2a5 Fix can't process follow accept/reject from remote 2018-07-08 17:22:11 +09:00
greenkeeper[bot]
e77c7fe723 fix(package): update file-type to version 8.1.0 2018-07-08 07:49:21 +00:00
greenkeeper[bot]
81a23147f9 fix(package): update node-sass to version 4.9.2 2018-07-08 06:42:43 +00:00
greenkeeper[bot]
caebe3f183 fix(package): update hard-source-webpack-plugin to version 0.11.0
Closes #1861
2018-07-07 23:45:26 +00:00
Aya Morisawa
6597ce10e0 Fix typo 2018-07-08 05:28:14 +09:00
Aya Morisawa
d99c08ca19 Fix typo 2018-07-08 04:57:10 +09:00
Aya Morisawa
8b0e74bbee Update config example 2018-07-08 04:56:23 +09:00
Aya Morisawa
c0008ccedb Update README.md 2018-07-08 04:43:07 +09:00
syuilo
91e262099a Merge pull request #1860 from syuilo/i18n-msg-patch
Update warning message for missing locale
2018-07-08 04:37:09 +09:00
Aya Morisawa
ac0fade945 Update warning message for missing locale 2018-07-08 04:34:47 +09:00
Aya Morisawa
e5c07dca6f Update locales 2018-07-08 04:24:28 +09:00
Aya Morisawa
dd75065065 Merge branch 'master' of aya.github:syuilo/misskey 2018-07-08 04:19:46 +09:00
Aya Morisawa
d3b0f278bb Update locales 2018-07-08 04:19:31 +09:00
syuilo
229c5a3da9 Update docs 2018-07-08 04:11:15 +09:00
syuilo
096bd52a34 Fix bug 2018-07-08 03:51:09 +09:00
syuilo
d6c1324491 package-lock.json 2018-07-08 03:23:02 +09:00
syuilo
5b553877bf Clean up 2018-07-08 03:22:40 +09:00
syuilo
5ada88e4a5 ✌️ 2018-07-08 03:21:16 +09:00
syuilo
72d545c924 oops 2018-07-08 03:19:04 +09:00
syuilo
0be22cffea oops 2018-07-08 03:15:54 +09:00
syuilo
81ec90d425 oops 2018-07-08 03:13:20 +09:00
syuilo
2d2645d2e3 Merge pull request #1859 from xps2/repurl
リポジトリとフィードバックのURLをconfigから指定できるように変更
2018-07-07 21:17:29 +09:00
xps2
56932a7b68 リポジトリとフィードバックのURLをconfigから指定できるように変更 2018-07-07 21:08:22 +09:00
syuilo
5aac53aec4 ✌️ 2018-07-07 19:23:44 +09:00
syuilo
ab3e2ad870 oops 2018-07-07 19:22:31 +09:00