Commit graph

7037 commits

Author SHA1 Message Date
syuilo 8ef066adda Merge branch 'master' into hybrid-tl 2018-07-11 13:50:52 +09:00
syuilo 5cc7fa8e8b oops 2018-07-11 13:50:37 +09:00
syuilo fc998ac57c Merge branch 'master' into hybrid-tl 2018-07-11 13:49:18 +09:00
syuilo 9e4fe16f56 oops 2018-07-11 13:49:06 +09:00
syuilo 0cc00101dc Merge branch 'master' into hybrid-tl 2018-07-11 13:47:26 +09:00
syuilo 227cfd6e2f Refactor 2018-07-11 13:47:01 +09:00
syuilo 876f659847 Fix 2018-07-11 13:43:40 +09:00
syuilo 555501d534 wip 2018-07-11 13:43:09 +09:00
syuilo eb392b1251 wip 2018-07-11 09:36:30 +09:00
syuilo e32bf34830 Update call.ts 2018-07-10 22:07:24 +09:00
syuilo 94ff21649d
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] 35ff0ab2b6 fix(package): update @types/koa-bodyparser to version 5.0.1 2018-07-10 01:34:50 +00:00
syuilo fadc80166b
Merge pull request #1875 from tamaina/master
Improve Messaging
2018-07-09 21:24:59 +09:00
syuilo 9201b5318b Refactoring 2018-07-09 21:15:49 +09:00
tamaina 7b3f52505e
Update messaging-room.message.vue 2018-07-08 23:45:16 +09:00
tamaina 313afbd6db
Update messaging-room.vue 2018-07-08 23:41:09 +09:00
Aya Morisawa 8b3cb850a5 Add locales 2018-07-08 20:20:28 +09:00
Aya Morisawa 48d1b9444c Fix typo 2018-07-08 20:15:10 +09:00
Aya Morisawa 65a3c7dae4 Merge branch 'master' of aya.github:syuilo/misskey 2018-07-08 20:04:35 +09:00
Aya Morisawa 0374f58a11 Add locales 2018-07-08 20:01:59 +09:00
syuilo a7ff8678b5
Merge pull request #1871 from mei23/mei-apreq3
フォロー申請結果とフォロー申請解除の処理の修正
2018-07-08 19:30:56 +09:00
syuilo b85ae2f77f
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 9f93353519
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 37935ed467
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 8ed9e44a78 Fix can't process cancel of follow request from remote 2018-07-08 17:22:18 +09:00
mei23 a796a68e8a Fix can't process follow accept/reject from remote 2018-07-08 17:22:11 +09:00
greenkeeper[bot] f2b467c5e7 fix(package): update file-type to version 8.1.0 2018-07-08 07:49:21 +00:00
greenkeeper[bot] 21d22b60b4 fix(package): update node-sass to version 4.9.2 2018-07-08 06:42:43 +00:00
greenkeeper[bot] f76d204e09 fix(package): update hard-source-webpack-plugin to version 0.11.0
Closes #1861
2018-07-07 23:45:26 +00:00
Aya Morisawa 76c1077b8e
Fix typo 2018-07-08 05:28:14 +09:00
Aya Morisawa f3d2183a23 Fix typo 2018-07-08 04:57:10 +09:00
Aya Morisawa cdac86d104 Update config example 2018-07-08 04:56:23 +09:00
Aya Morisawa 291627ac15 Update README.md 2018-07-08 04:43:07 +09:00
syuilo 0025f3b526
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 678e80bb8b Update warning message for missing locale 2018-07-08 04:34:47 +09:00
Aya Morisawa 959f2cd61d Update locales 2018-07-08 04:24:28 +09:00
Aya Morisawa 16e2ee2759 Merge branch 'master' of aya.github:syuilo/misskey 2018-07-08 04:19:46 +09:00
Aya Morisawa 5621b280ff Update locales 2018-07-08 04:19:31 +09:00
syuilo 8cd6efbc38 Update docs 2018-07-08 04:11:15 +09:00
syuilo 0f4f862840 Fix bug 2018-07-08 03:51:09 +09:00
syuilo 14f74a561c package-lock.json 2018-07-08 03:23:02 +09:00
syuilo bd970cf215 Clean up 2018-07-08 03:22:40 +09:00
syuilo 57052013bb ✌️ 2018-07-08 03:21:16 +09:00
syuilo 8e11e2e3fc oops 2018-07-08 03:19:04 +09:00
syuilo ef58503537 oops 2018-07-08 03:15:54 +09:00
syuilo a46d230308 oops 2018-07-08 03:13:20 +09:00
syuilo e85ac32c2d
Merge pull request #1859 from xps2/repurl
リポジトリとフィードバックのURLをconfigから指定できるように変更
2018-07-07 21:17:29 +09:00
xps2 a7e27c2419 リポジトリとフィードバックのURLをconfigから指定できるように変更 2018-07-07 21:08:22 +09:00
syuilo a4c9a93b6d ✌️ 2018-07-07 19:23:44 +09:00
syuilo 1f3837a8c6 oops 2018-07-07 19:22:31 +09:00