Commit Graph

3239 Commits

Author SHA1 Message Date
syuilo
4add44f3bd
Update create.ts 2018-07-14 13:47:36 +09:00
syuilo
9666e6b4d3 #1894 2018-07-14 11:58:21 +09:00
syuilo
c937cb94f9 Clean up 2018-07-14 11:55:36 +09:00
Aya Morisawa
28cd7a67de Update log message 2018-07-14 00:41:33 +09:00
Aya Morisawa
97f75cea52 Merge branch 'master' of aya.github:syuilo/misskey 2018-07-14 00:39:50 +09:00
Aya Morisawa
5e788f0da4 Kill child process on exit 2018-07-14 00:39:39 +09:00
Aya Morisawa
1fc9d034d0 Update log message 2018-07-14 00:39:11 +09:00
syuilo
dc8f14c23a Fix #1887 2018-07-14 00:36:39 +09:00
syuilo
73c328f90b Merge branch 'master' of https://github.com/syuilo/misskey 2018-07-14 00:34:08 +09:00
syuilo
25a6f7041a Fix bug 2018-07-14 00:34:05 +09:00
Aya Morisawa
35dd6a5ac3 Merge branch 'master' of aya.github:syuilo/misskey 2018-07-14 00:05:56 +09:00
Aya Morisawa
98ea238087 Add missing semicolon 2018-07-14 00:05:49 +09:00
syuilo
f2959ada85 Revert "Update messaging-room.message.vue"
This reverts commit 7b3f52505e.
2018-07-14 00:00:30 +09:00
Aya Morisawa
874837666c Update error message 2018-07-13 23:52:28 +09:00
Aya Morisawa
c66532d18f Update logger 2018-07-13 23:51:16 +09:00
syuilo
2bc572b4cc アカウントを凍結されていたらAPIにアクセスできないようにした 2018-07-13 23:44:45 +09:00
syuilo
2db01f3d5c Clean up 2018-07-13 23:39:20 +09:00
Aya Morisawa
a0a116b7bf Merge branch 'master' of aya.github:syuilo/misskey 2018-07-13 23:25:49 +09:00
Aya Morisawa
aec7d53414 Fix port cehcking 2018-07-13 23:25:32 +09:00
PRB0t
0e7fe670aa 🤖 Fix a bug 2018-07-13 16:17:02 +02:00
Aya Morisawa
bd805f1d88 Update log message 2018-07-13 23:05:37 +09:00
syuilo
0074f8da1b Improve log 2018-07-11 23:59:57 +09:00
syuilo
c41ccf7821 Fix bug 2018-07-11 14:33:03 +09:00
syuilo
b68af344cb oops 2018-07-11 14:08:18 +09:00
syuilo
1af3c42001 wip 2018-07-11 14:03:21 +09:00
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
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
48d1b9444c Fix typo 2018-07-08 20:15:10 +09:00
syuilo
a7ff8678b5
Merge pull request #1871 from mei23/mei-apreq3
フォロー申請結果とフォロー申請解除の処理の修正
2018-07-08 19:30:56 +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
Aya Morisawa
678e80bb8b Update warning message for missing locale 2018-07-08 04:34:47 +09:00
syuilo
0f4f862840 Fix bug 2018-07-08 03:51:09 +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