Commit graph

3239 commits

Author SHA1 Message Date
syuilo
e1b7522650 Update create.ts 2018-07-14 13:47:36 +09:00
syuilo
1cd24fa175 #1894 2018-07-14 11:58:21 +09:00
syuilo
89ec3d5e1b Clean up 2018-07-14 11:55:36 +09:00
Aya Morisawa
e23dbd501e Update log message 2018-07-14 00:41:33 +09:00
Aya Morisawa
9d3a7e3d26 Merge branch 'master' of aya.github:syuilo/misskey 2018-07-14 00:39:50 +09:00
Aya Morisawa
2e9e300d0c Kill child process on exit 2018-07-14 00:39:39 +09:00
Aya Morisawa
9cf9d341b3 Update log message 2018-07-14 00:39:11 +09:00
syuilo
2e9a4e8f15 Fix #1887 2018-07-14 00:36:39 +09:00
syuilo
9f4f47dcd4 Merge branch 'master' of https://github.com/syuilo/misskey 2018-07-14 00:34:08 +09:00
syuilo
5c32223b6d Fix bug 2018-07-14 00:34:05 +09:00
Aya Morisawa
0b99420d44 Merge branch 'master' of aya.github:syuilo/misskey 2018-07-14 00:05:56 +09:00
Aya Morisawa
5bf02d22cb Add missing semicolon 2018-07-14 00:05:49 +09:00
syuilo
9a1fa024ce Revert "Update messaging-room.message.vue"
This reverts commit 7b3f52505e2566fbf0b1bd824d6ea71c15cacaff.
2018-07-14 00:00:30 +09:00
Aya Morisawa
8a976da19a Update error message 2018-07-13 23:52:28 +09:00
Aya Morisawa
89275f118e Update logger 2018-07-13 23:51:16 +09:00
syuilo
00b833644b アカウントを凍結されていたらAPIにアクセスできないようにした 2018-07-13 23:44:45 +09:00
syuilo
5e4b72577a Clean up 2018-07-13 23:39:20 +09:00
Aya Morisawa
740254b1ea Merge branch 'master' of aya.github:syuilo/misskey 2018-07-13 23:25:49 +09:00
Aya Morisawa
8b16c8f8f8 Fix port cehcking 2018-07-13 23:25:32 +09:00
PRB0t
211ba1ec54 🤖 Fix a bug 2018-07-13 16:17:02 +02:00
Aya Morisawa
26be72d4eb Update log message 2018-07-13 23:05:37 +09:00
syuilo
d23c10f87d Improve log 2018-07-11 23:59:57 +09:00
syuilo
f790e44415 Fix bug 2018-07-11 14:33:03 +09:00
syuilo
c42d6ad902 oops 2018-07-11 14:08:18 +09:00
syuilo
32e2699ad3 wip 2018-07-11 14:03:21 +09:00
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
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
77ef4404f3 Fix typo 2018-07-08 20:15:10 +09:00
syuilo
24cebe7280 Merge pull request #1871 from mei23/mei-apreq3
フォロー申請結果とフォロー申請解除の処理の修正
2018-07-08 19:30:56 +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
Aya Morisawa
ac0fade945 Update warning message for missing locale 2018-07-08 04:34:47 +09:00
syuilo
096bd52a34 Fix bug 2018-07-08 03:51:09 +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