Commit graph

5115 commits

Author SHA1 Message Date
tamaina
9c15bba0d0 Merge pull request #7 from tamaina/pop
Pop
2018-04-15 21:01:35 +09:00
tamaina
f1369188a2 Merge branch 'master' into pop 2018-04-15 21:01:27 +09:00
tamaina
d4ce00cb24 oops 2018-04-15 21:00:28 +09:00
tamaina
304c3ef1d7 Update timeline.vue 2018-04-15 20:57:37 +09:00
tamaina
4358d61d64 Update timeline.vue 2018-04-15 20:57:30 +09:00
tamaina
78479d3f17 Update timeline.vue 2018-04-15 20:50:53 +09:00
syuilo
f938a0e657 Merge pull request #1476 from Angristan/patch-1
Specify ImageMagick version (7.0+)
2018-04-15 20:02:04 +09:00
Angristan
c44b50c227 Specify ImageMagick version (7.0+)
Misskey needs the magick command
2018-04-15 12:59:29 +02:00
syuilo
0df9fdbb7c Merge pull request #1475 from Angristan/patch-1
Fix space
2018-04-15 19:55:41 +09:00
Angristan
5785325a30 Fix space
Sorry :3
2018-04-15 12:55:15 +02:00
syuilo
6f6884bf6f 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
Angristan
b7dfc239c3 Fix list number 2018-04-15 12:52:54 +02:00
Angristan
74d138925e Add node-gyp instructions to build the crypto module
Otherwise misskey can't run.
2018-04-15 12:52:16 +02:00
tamaina
de7542b939 Update timeline.vue 2018-04-15 19:30:51 +09:00
tamaina
cf97784de1 Update timeline.vue 2018-04-15 19:29:40 +09:00
syuilo
72e268ef81 oops 2018-04-15 19:24:21 +09:00
tamaina
049171e978 Update timeline.vue 2018-04-15 19:10:12 +09:00
tamaina
2d2cb7551b Merge pull request #6 from syuilo/master
追従
2018-04-15 19:06:15 +09:00
syuilo
8ff4d8325f Fix bug 2018-04-15 18:57:59 +09:00
syuilo
dd2c3a993a v4895 2018-04-15 18:48:17 +09:00
syuilo
696a8c80f7 ✌️ 2018-04-15 18:38:40 +09:00
tamaina
8ce85e73ea Merge pull request #5 from syuilo/master
追従
2018-04-15 18:12:11 +09:00
syuilo
55392fcffc nanka iroiro 2018-04-15 17:53:25 +09:00
syuilo
77356dc61f ストリームを経由してのリクエストではトークンの添付は無駄だった 2018-04-15 17:39:12 +09:00
syuilo
57c65bdd2f Merge branch 'master' of https://github.com/syuilo/misskey 2018-04-15 17:29:40 +09:00
syuilo
e215a52fd9 Fix bug 2018-04-15 17:29:32 +09:00
syuilo
b79861d89e Update translate.ja.md 2018-04-15 14:20:58 +09:00
syuilo
c5203203a6 Create translate.ja.md 2018-04-15 14:19:17 +09:00
syuilo
11cb8a3ba8 Fix bug 2018-04-15 13:20:52 +09:00
syuilo
1c2aaec303 Fix bug 2018-04-15 12:51:05 +09:00
syuilo
a8c3e7038a oops 2018-04-15 12:40:48 +09:00
syuilo
d0078123e4 oops 2018-04-15 12:13:10 +09:00
syuilo
52d0f3a600 ✌️ 2018-04-15 12:11:09 +09:00
syuilo
a6c2b4a39f 🍕 2018-04-15 11:57:33 +09:00
syuilo
610f856f03 i18n 2018-04-15 07:54:54 +09:00
syuilo
60326d5155 i18n 2018-04-15 07:51:56 +09:00
syuilo
89ef37c3e2 Merge branch 'master' of https://github.com/syuilo/misskey 2018-04-15 07:41:14 +09:00
syuilo
3c94a26d1f oops 2018-04-15 07:41:10 +09:00
syuilo
13e975f0dd Update README.md 2018-04-15 07:14:00 +09:00
syuilo
e37f67c2de v4876 2018-04-15 06:38:20 +09:00
syuilo
c57576652a ✌️ 2018-04-15 06:37:55 +09:00
syuilo
67421783b4 wip 2018-04-15 06:34:55 +09:00
syuilo
c85d4fa363 i18n 2018-04-15 06:26:33 +09:00
syuilo
f1c8a8e559 Merge pull request #1470 from syuilo/i18n
i18n
2018-04-15 06:21:45 +09:00
syuilo
593abb2a8e 🍕 2018-04-15 06:21:19 +09:00
syuilo
ef018fa87f ✌️ 2018-04-15 06:16:50 +09:00
syuilo
2f37431f9b wip 2018-04-15 05:57:30 +09:00
syuilo
2d26269d99 wip 2018-04-15 05:22:16 +09:00
syuilo
4ed5bca72b wip 2018-04-15 02:58:49 +09:00
syuilo
ab224b9339 wip 2018-04-15 02:51:29 +09:00