Commit Graph

20371 Commits

Author SHA1 Message Date
6122c50ca5 Merge branch 'master' into pop 2018-04-15 21:01:27 +09:00
80a0a9f052 oops 2018-04-15 21:00:28 +09:00
50baad1fd0 Update timeline.vue 2018-04-15 20:57:37 +09:00
83327fc477 Update timeline.vue 2018-04-15 20:57:30 +09:00
7df6419208 Update timeline.vue 2018-04-15 20:50:53 +09:00
66b208e75d Merge pull request #1476 from Angristan/patch-1
Specify ImageMagick version (7.0+)
2018-04-15 20:02:04 +09:00
934d9f3544 Specify ImageMagick version (7.0+)
Misskey needs the magick command
2018-04-15 12:59:29 +02:00
6a4306dc4b Merge pull request #1475 from Angristan/patch-1
Fix space
2018-04-15 19:55:41 +09:00
9b47e75628 Fix space
Sorry :3
2018-04-15 12:55:15 +02:00
ddfa6da2d6 Merge pull request #1474 from Angristan/patch-1
Add node-gyp instructions to build the crypto module
2018-04-15 19:53:45 +09:00
ab7c31e290 Fix list number 2018-04-15 12:52:54 +02:00
f2df583d8b Add node-gyp instructions to build the crypto module
Otherwise misskey can't run.
2018-04-15 12:52:16 +02:00
aea194fba2 Update timeline.vue 2018-04-15 19:30:51 +09:00
98e28f4ddf Update timeline.vue 2018-04-15 19:29:40 +09:00
becdc4b609 oops 2018-04-15 19:24:21 +09:00
dc8c05373c Update timeline.vue 2018-04-15 19:10:12 +09:00
c0a7e13f04 Merge pull request #6 from syuilo/master
追従
2018-04-15 19:06:15 +09:00
780b9c51d1 Fix bug 2018-04-15 18:57:59 +09:00
f5d2564433 v4895 2018-04-15 18:48:17 +09:00
a9ea405c0c ✌️ 2018-04-15 18:38:40 +09:00
f982f5e850 Merge pull request #5 from syuilo/master
追従
2018-04-15 18:12:11 +09:00
10e3411020 nanka iroiro 2018-04-15 17:53:25 +09:00
0bbe8267b8 ストリームを経由してのリクエストではトークンの添付は無駄だった 2018-04-15 17:39:12 +09:00
2325c147f8 Merge branch 'master' of https://github.com/syuilo/misskey 2018-04-15 17:29:40 +09:00
39bf3b7d72 Fix bug 2018-04-15 17:29:32 +09:00
af2be8887d Update translate.ja.md 2018-04-15 14:20:58 +09:00
a3473079ac Create translate.ja.md 2018-04-15 14:19:17 +09:00
2d7525b2f6 Fix bug 2018-04-15 13:20:52 +09:00
eebd5f62b3 Fix bug 2018-04-15 12:51:05 +09:00
82c93fdcb8 oops 2018-04-15 12:40:48 +09:00
a2b9a66acd oops 2018-04-15 12:13:10 +09:00
efd87c7625 ✌️ 2018-04-15 12:11:09 +09:00
69c452a980 🍕 2018-04-15 11:57:33 +09:00
10f6d5980f i18n 2018-04-15 07:54:54 +09:00
63fdb68320 i18n 2018-04-15 07:51:56 +09:00
1af31882e8 Merge branch 'master' of https://github.com/syuilo/misskey 2018-04-15 07:41:14 +09:00
ef715ec64b oops 2018-04-15 07:41:10 +09:00
5117cd9f41 Update README.md 2018-04-15 07:14:00 +09:00
cf76042574 v4876 2018-04-15 06:38:20 +09:00
30752b0fff ✌️ 2018-04-15 06:37:55 +09:00
0ef280377b wip 2018-04-15 06:34:55 +09:00
9c2f340c1e i18n 2018-04-15 06:26:33 +09:00
369977189c Merge pull request #1470 from syuilo/i18n
i18n
2018-04-15 06:21:45 +09:00
7ced7db866 🍕 2018-04-15 06:21:19 +09:00
a53746e9d0 ✌️ 2018-04-15 06:16:50 +09:00
d3b3a7fc4e wip 2018-04-15 05:57:30 +09:00
f78ae399f2 wip 2018-04-15 05:22:16 +09:00
5a49d14246 wip 2018-04-15 02:58:49 +09:00
986780a39a wip 2018-04-15 02:51:29 +09:00
1464df57fa wip 2018-04-15 02:36:01 +09:00