limepotato/jormungandr-bite
1
0
Fork 0
mirror of https://iceshrimp.dev/limepotato/jormungandr-bite.git synced 2024-11-16 06:57:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
8651 commits 22 branches 21 tags 1.6 GiB
Commit graph

835 commits

Author SHA1 Message Date
gutfuckllc
6ae7269f79 Fixed welcome.vue build bug. 2018-08-01 16:37:36 -04:00
gutfuckllc
737ca22503 Localized mobile/views/pages/reversi.vue 
Also added common.name line, as to allow easier rebranding.
 2018-08-01 15:09:42 -04:00
gutfuckllc
598caa981d Localized mobile/views/components/ui.header.vue 
Also added name i18n line, as to allow easier rebranding should there be any.
 2018-08-01 15:04:00 -04:00
gutfuckllc
616819291b Forgot to add vue. here 2018-08-01 14:55:30 -04:00
gutfuckllc
9d8b6a4eb6 Translated desktop/views/pages/tag.vue 
More weird syntax fiddling. Should work nonetheless
 2018-08-01 14:52:53 -04:00
gutfuckllc
5d676baa80 Translated desktop/views/components/settings.drive.vue 2018-08-01 14:42:52 -04:00
gutfuckllc
ee9e13000c common/views/widgets/calendar.vue 
Did weird formatting tricks. Hopefully should work.
 2018-08-01 14:25:55 -04:00
gutfuckllc
5b228afe15 Translated common/views/widgets/tips.vue 
Double lines. Might want to check that.
 2018-08-01 14:14:53 -04:00
gutfuckllc
d19da489db Translated desktop\views\pages\search.vue 
Needed some weird text hack. Might want to check it later.
 2018-08-01 12:20:41 -04:00
gutfuckllc
99e89f0c2c Translated desktop/views/pages/share.vue 2018-08-01 12:09:59 -04:00
gutfuckllc
bbc1f6dc77 Translated slieshow.vue 2018-07-31 19:12:30 -04:00
gutfuckllc
1fb37e472f Added i18n line to hint 
home.vue
 2018-07-31 18:54:43 -04:00
gutfuckllc
f704a8802e Fully translated settings.profile.vue 
Added relevant translation lines
 2018-07-31 14:03:43 -04:00
gutfuckllc
16e005f513 Added uncommitted file 2018-07-31 13:56:21 -04:00
gutfuckllc
39567f06f9 Reformat, more translation 
Translated the totality of desktop/post-form.vue, reformated customization-tips.
 2018-07-31 13:54:12 -04:00
gutfuckllc
a6700350ca Added got it to the local files 
Home.vue got it was still untranslated. It now has a localization file
 2018-07-31 13:32:18 -04:00
gutfuckllc
d23dc53123 Localized customization tips on home.vue 
Added relevant customization lines.
 2018-07-31 13:29:18 -04:00
gutfuckllc
76c6e67213 Translated trash on main menu 
Translated trash on main menu
 2018-07-31 11:36:15 -04:00
Aya Morisawa
962ab9ec23 #332 2018-07-30 20:13:30 +09:00
syuilo
4dc3ffbb91 Fix bug 2018-07-30 14:46:11 +09:00
syuilo
6f2d25fd31 Revert "Fix bug" 
This reverts commit 4e6dcd16ac9a976b6fa7765d02ef86ba3493ef7f.
 2018-07-30 14:45:48 +09:00
syuilo
e378a82c6a Fix bug 2018-07-30 06:20:06 +09:00
syuilo
40b1689691 #2018 2018-07-29 09:17:07 +09:00
nzws
83f2a28e1a Fix margin in visibleUsers (mobile) 2018-07-28 13:17:32 +09:00
syuilo
e46c494651 Fix #2000 2018-07-28 07:38:29 +09:00
syuilo
e30f04be03 Merge pull request #2010 from acid-chicken/acid-chicken-patch-1 
Minify Mk-III
 2018-07-27 19:17:15 +09:00
Acid Chicken (硫酸鶏)
40c17619e6 Fix bug 2018-07-27 19:15:38 +09:00
Aya Morisawa
ed86fd2a8a ✨ 2018-07-27 19:12:16 +09:00
syuilo
e5ffffa628 Merge pull request #2009 from acid-chicken/acid-chicken-patch-1 
Minify Mk-II
 2018-07-27 18:29:24 +09:00
Acid Chicken (硫酸鶏)
0aeb704585 Update calendar.vue 2018-07-27 18:28:06 +09:00
syuilo
64f4952df3 Fix bug 2018-07-27 18:18:05 +09:00
nzws
b941e9536f Change VisibilityButton's icon in mobile view 2018-07-27 13:30:46 +09:00
syuilo
f31dbf90da ログインしていないとリバーシを観戦できない問題を修正 2018-07-27 04:01:12 +09:00
nzws
03cddd077b Fix problem displaying button in profile page 2018-07-26 21:47:02 +09:00
nzws
b100b084a5 Hide follow button of my account 2018-07-26 21:45:43 +09:00
nzws
fc5475cc7a Change VisibilityButton's icon when changing visibility 2018-07-26 21:44:21 +09:00
Acid Chicken (硫酸鶏)
0228d50bef Update misskey-flavored-markdown.ts 2018-07-26 13:48:08 +09:00
Acid Chicken (硫酸鶏)
05d40f8a57 Update hashtags.vue 2018-07-26 13:47:06 +09:00
syuilo
56864d8515 Improve tweet embed 2018-07-26 04:55:39 +09:00
syuilo
933dbf3a8b Fix bug 2018-07-26 04:29:09 +09:00
ysr227
5a8c01adbc Embed tweet when tweet url attached 2018-07-26 00:03:32 +09:00
syuilo
a6d7c191fb Clean up 2018-07-25 07:45:38 +09:00
syuilo
e8c262e2ae 🎨 2018-07-25 04:36:02 +09:00
syuilo
290267d2b4 #1893 2018-07-25 01:14:38 +09:00
syuilo
73d7ab0f47 Fix #1960 2018-07-25 00:51:30 +09:00
syuilo
8e82e22c9f Merge pull request #1968 from syuilo/object-storage 
Object storage support
 2018-07-24 23:45:19 +09:00
syuilo
07922395da wip 2018-07-24 23:43:14 +09:00
Aya Morisawa
9058747d46 Enhance #1958 2018-07-23 20:58:59 +09:00
Aya Morisawa
4186a358aa Fix typo 2018-07-23 20:11:20 +09:00
syuilo
553997fd13 Merge pull request #1959 from acid-chicken/top 
Go to top
 2018-07-23 14:37:18 +09:00
Acid Chicken (硫酸鶏)
1b35eea751 Go to top 2018-07-23 14:35:00 +09:00
Aya Morisawa
702e63e2ae #1957 2018-07-23 14:07:09 +09:00
Aya Morisawa
9af3a99eed Clean up 2018-07-23 14:04:53 +09:00
Aya Morisawa
56ec06d699 Fix #1957 2018-07-23 13:37:29 +09:00
syuilo
8652f08b67 🎨 2018-07-21 04:33:04 +09:00
syuilo
e5c037ed80 Fix 2018-07-21 03:24:39 +09:00
syuilo
12701c8ccf Improve hashtag suggestion 2018-07-21 03:15:31 +09:00
syuilo
3686cf426b ✌️ 2018-07-21 02:58:44 +09:00
syuilo
d48725e5f6 Merge pull request #1939 from acid-chicken/sushi 
🍣回転寿司🍣
 2018-07-21 02:23:13 +09:00
Acid Chicken (硫酸鶏)
8f4730a12d Update post-form.vue 2018-07-21 02:14:24 +09:00
Acid Chicken (硫酸鶏)
c2ce9a72e9 Update messaging-room.form.vue 2018-07-21 02:07:50 +09:00
Acid Chicken (硫酸鶏)
02b4e2cc7e Update post-form.vue 2018-07-21 02:06:49 +09:00
Acid Chicken (硫酸鶏)
2c68f95ff3 インデクサーを忘れていた 2018-07-21 01:25:55 +09:00
Acid Chicken (硫酸鶏)
22a1b0c8f0 保存し忘れ 2018-07-21 01:24:12 +09:00
Acid Chicken (硫酸鶏)
03b2366f73 回転寿司 2018-07-21 01:21:27 +09:00
Aya Morisawa
16dbfdd693 Fix #1868 2018-07-20 21:59:09 +09:00
syuilo
8efa065716 Merge pull request #1936 from syuilo/patch-1803 
Fix #1803
 2018-07-20 21:47:35 +09:00
Aya Morisawa
d60c8fc1c6 Fix #1803 2018-07-20 21:39:21 +09:00
Acid Chicken (硫酸鶏)
f75ec78291 タグサジェストが重複しないようにする 2018-07-20 21:12:28 +09:00
Aya Morisawa
abef7ba942 mark as read all -> mark all as read 
Close #855
 2018-07-20 14:16:02 +09:00
syuilo
8f4a638133 最近使ったハッシュタグを表示するようにするなど 2018-07-20 05:29:56 +09:00
syuilo
e2a033c627 動画もNSFW 2018-07-20 02:53:32 +09:00
syuilo
be05309ca4 #1334 2018-07-20 02:40:37 +09:00
syuilo
93a9193b0d Clean up 2018-07-19 22:02:30 +09:00
Aya Morisawa
bc01fe6000 Hide settings button 
It is unimplemented
 2018-07-19 16:40:40 +09:00
Aya Morisawa
3144b4ed20 Hide detail button 
It is unimplemented
 2018-07-19 16:21:22 +09:00
Aya Morisawa
b0e0016cec Show error message if searching is not available 2018-07-19 08:24:03 +09:00
Aya Morisawa
047c3a52e3 Hide delete button 
It is unimplemented
 2018-07-19 07:48:42 +09:00
syuilo
7394d12380 🎨 2018-07-19 04:50:46 +09:00
syuilo
c6becb02b8 🎨 2018-07-19 03:25:37 +09:00
Acid Chicken (硫酸鶏)
4c06515e1b Update calendar.vue 2018-07-19 00:13:58 +09:00
syuilo
4831f16da5 reCAPTCHAをオプションに 2018-07-19 00:04:09 +09:00
Aya Morisawa
b9d111c593 Hide drive search form 
It is unimplemented
 2018-07-18 19:13:41 +09:00
syuilo
31e4d127e9 #1720 #59 2018-07-18 07:19:24 +09:00
Acid Chicken (硫酸鶏)
6039f59a7e Update analog-clock.vue 2018-07-18 02:06:01 +09:00
Acid Chicken (硫酸鶏)
7999a7360d Update analog-clock.vue 2018-07-18 02:04:07 +09:00
Acid Chicken (硫酸鶏)
700e9d6126 Update analog-clock.vue 2018-07-18 02:02:52 +09:00
Acid Chicken (硫酸鶏)
9354058065 Update calendar.vue 2018-07-18 01:46:21 +09:00
syuilo
9eb2d6156f Fix bug 2018-07-18 01:22:11 +09:00
syuilo
f07d7b9b52 ✌️ 2018-07-17 18:50:13 +09:00
syuilo
56c8348827 Merge pull request #1916 from acid-chicken/acid-chicken-patch-1 
Proposal: Smooth Clock
 2018-07-17 18:45:21 +09:00
Acid Chicken (硫酸鶏)
515717bce9 Update analog-clock.vue 2018-07-17 18:43:04 +09:00
syuilo
ee68c0ccfb ドキュメントをMarkdownで書くように 2018-07-15 18:28:08 +09:00
syuilo
d8a0fdf934 Darken 
Co-Authored-By: tamaina <tamaina@hotmail.co.jp>
 2018-07-15 01:49:36 +09:00
syuilo
651c8f9ed6 Darken 
Co-Authored-By: tamaina <tamaina@hotmail.co.jp>
 2018-07-15 01:48:06 +09:00
syuilo
7af46e6cf8 Revert "Update messaging-room.vue" 
This reverts commit 313afbd6db2c6a842670fb5202d1a8842d51c290.
 2018-07-15 01:07:17 +09:00
ImgBotApp
dfd564a731 [ImgBot] optimizes images 
*Total -- 887.85kb -> 803.26kb (9.53%)

/src/client/app/desktop/assets/remove.png -- 3.04kb -> 0.41kb (86.39%)
/src/server/file/assets/bad-egg.png -- 4.67kb -> 1.64kb (64.96%)
/src/server/file/assets/cache-expired.png -- 14.67kb -> 5.91kb (59.75%)
/test/resources/Lenna.jpg -- 52.22kb -> 24.77kb (52.57%)
/assets/apple-touch-icon.png -- 4.71kb -> 2.46kb (47.82%)
/assets/icons/256.png -- 4.71kb -> 2.46kb (47.82%)
/assets/favicon/favicon.png -- 6.81kb -> 3.91kb (42.57%)
/assets/title.png -- 6.62kb -> 3.80kb (42.56%)
/src/server/file/assets/not-an-image.png -- 4.60kb -> 2.71kb (40.99%)
/src/server/file/assets/thumbnail-not-available.png -- 8.62kb -> 5.57kb (35.33%)
/src/client/assets/reactions/angry.png -- 5.74kb -> 4.50kb (21.6%)
/src/server/file/assets/tombstone.png -- 6.24kb -> 4.91kb (21.28%)
/src/client/assets/reactions/surprise.png -- 4.59kb -> 3.72kb (18.99%)
/assets/icons/128.png -- 3.07kb -> 2.49kb (18.74%)
/assets/icons/192.png -- 4.56kb -> 3.80kb (16.65%)
/src/client/assets/reactions/confused.png -- 7.08kb -> 5.92kb (16.5%)
/src/client/assets/reactions/love.png -- 3.26kb -> 2.74kb (16.07%)
/src/client/assets/reactions/laugh.png -- 7.74kb -> 6.77kb (12.47%)
/src/client/assets/reactions/hmm.png -- 6.47kb -> 5.74kb (11.38%)
/src/client/assets/reactions/congrats.png -- 10.39kb -> 9.77kb (6.04%)
/src/client/assets/pointer.png -- 246.93kb -> 232.06kb (6.02%)
/src/client/assets/error.jpg -- 55.53kb -> 52.84kb (4.84%)
/assets/icons/64.png -- 1.30kb -> 1.24kb (4.66%)
/src/server/file/assets/avatar.jpg -- 1.29kb -> 1.23kb (4.61%)
/src/client/assets/reactions/pudding.png -- 7.47kb -> 7.42kb (0.74%)
/src/client/assets/reactions/like.png -- 4.72kb -> 4.71kb (0.27%)
/src/client/app/desktop/assets/index.jpg -- 400.79kb -> 399.78kb (0.25%)
 2018-07-14 14:20:36 +00:00
syuilo
1cd24fa175 #1894 2018-07-14 11:58:21 +09:00
syuilo
9a1fa024ce Revert "Update messaging-room.message.vue" 
This reverts commit 7b3f52505e2566fbf0b1bd824d6ea71c15cacaff.
 2018-07-14 00:00:30 +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
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
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
2d2645d2e3 Merge pull request #1859 from xps2/repurl 
リポジトリとフィードバックのURLをconfigから指定できるように変更
 2018-07-07 21:17:29 +09:00
xps2
56932a7b68 リポジトリとフィードバックのURLをconfigから指定できるように変更 2018-07-07 21:08:22 +09:00
syuilo
bea7e21a80 Refactorng 2018-07-07 19:19:00 +09:00
syuilo
58f6a63e17 Refactorijg 2018-07-07 19:01:33 +09:00
syuilo
c06c8928fd ✌️ 2018-07-07 13:34:42 +09:00
syuilo
b6c2dd3a6e wip 2018-07-06 20:27:48 +09:00
syuilo
83eaddfebf wip 2018-07-06 12:38:07 +09:00
syuilo
a3123326a8 wip 2018-07-06 12:31:57 +09:00
syuilo
e956dd62b5 wip 2018-07-06 12:17:38 +09:00
syuilo
8e3d56fdb9 wip 2018-07-06 02:58:29 +09:00
syuilo
4c972189cb wip 2018-07-05 23:47:36 +09:00
syuilo
35fe9de7c5 Fix bug 2018-07-04 21:23:50 +09:00
syuilo
b8ab6d91a3 Fix bug 2018-07-04 20:58:03 +09:00
syuilo
cbad4df67f wip 2018-07-04 20:44:13 +09:00
syuilo
03a21ee6bc Fix bug 2018-06-28 16:21:35 +09:00
Zero King
55d1496bd5 i18n 2018-06-26 13:27:52 +00:00
syuilo
a0fd57ad20 🎨 2018-06-26 18:53:06 +09:00
syuilo
7cb2e6d888 Clean up 2018-06-26 18:47:09 +09:00
syuilo
6fc45a1ba3 Merge branch 'master' of https://github.com/syuilo/misskey 2018-06-26 18:25:50 +09:00
syuilo
570fdacdfa Improve usability 2018-06-26 18:25:27 +09:00
otya
fea3700763 正しいv('ω')v 2018-06-25 21:05:12 +09:00
syuilo
0df3c77ff2 🎨 2018-06-24 15:55:41 +09:00
syuilo
e748c55a25 Better reversi labels 2018-06-24 13:18:22 +09:00
syuilo
8aa07f8656 リモートフォローフォームを実装するなど 2018-06-24 13:08:48 +09:00
syuilo
20b0a65ad4 Fix nado 2018-06-23 23:18:39 +09:00
syuilo
81b1e72379 ✌️ 2018-06-23 23:03:25 +09:00
syuilo
92ab2b175e Merge branch 'master' of https://github.com/syuilo/misskey 2018-06-23 22:55:57 +09:00
syuilo
0268797b52 ✌️ 2018-06-23 22:55:32 +09:00
Aya Morisawa
6010d52f1b Use capital letters for othello label 2018-06-23 22:25:22 +09:00
syuilo
2ec3e22e84 i18n 2018-06-23 21:56:47 +09:00
syuilo
0bd4d1bc28 i18n 2018-06-23 19:35:19 +09:00
syuilo
e590131841 きゃー 2018-06-23 16:58:54 +09:00
syuilo
d9ae6ca243 リバーシのラベルを表示できるように 2018-06-23 16:55:52 +09:00
syuilo
007011b038 Fix bug 2018-06-23 12:09:09 +09:00
syuilo
f4d5208893 Fix 2018-06-23 11:30:18 +09:00
syuilo
b18ad70ae1 Merge pull request #1763 from tamaina/better-note-header 
change flex-shrink of .username to 2147483647
 2018-06-22 21:00:19 +09:00
tamaina
a887bf07f7 change flex-shrink of .username to 2147483647 2018-06-22 20:55:19 +09:00
syuilo
61d9e9e080 ✌️ 2018-06-22 18:47:23 +09:00
syuilo
47a15f2783 非ログイン時のトップにトレンドを表示するように 2018-06-22 18:32:21 +09:00
syuilo
5ed57cb5ab ✌️ 2018-06-22 18:03:08 +09:00
syuilo
48ef96e5d9 ✌️ 2018-06-22 17:51:36 +09:00
syuilo
5f433afd61 Merge pull request #1762 from tamaina/Improve-UI 
trifling style changes
 2018-06-22 13:39:19 +09:00
tamaina
48b3a0cf1c $theme-color 2018-06-22 13:37:46 +09:00
tamaina
7a0ad1fb4b trifling style changes 
投稿のタグのマージンと色の最適化
ユーザーページの修正(幅が伸びる、profileの色)
ウェルカムページの修正(ダークモード時)
 2018-06-22 13:20:27 +09:00
tamaina
03c0316bf2 revert ✌️ d6ef92 2018-06-22 11:15:11 +09:00
tamaina
cbcf89542a ✌️ 2018-06-21 21:19:54 +09:00
tamaina
17c72836f2 Improve note-header 2018-06-21 19:59:33 +09:00
syuilo
0fc599e843 Fix bug 2018-06-21 11:37:18 +09:00
syuilo
2368f00dfc Improve ServiceWorker notification 2018-06-21 11:35:28 +09:00
syuilo
7a6b5be429 ✌️ 2018-06-21 02:03:25 +09:00
syuilo
a0b0770adf 更新ダイアログをHTMLで描画 2018-06-21 01:58:47 +09:00
syuilo
7c92bcb59f 🎨 2018-06-21 01:46:35 +09:00
syuilo
899b69c2a9 リモートユーザーのHTMLで表現されたプロフィールをMFMに変換するように 2018-06-21 01:21:57 +09:00
syuilo
14ee744b1b Disable transitions to avoid memory leak 2018-06-20 22:28:08 +09:00
syuilo
422f542985 nanka iroiro 2018-06-20 19:55:34 +09:00
syuilo
ae0f4cedc1 Update manifest.json 2018-06-19 19:07:39 +09:00
syuilo
61b4ac4632 Merge branch 'master' of https://github.com/syuilo/misskey 2018-06-18 17:25:23 +09:00
syuilo
8187cc3da0 nanka 2018-06-18 17:25:20 +09:00
tosuke
1b14e4eed5 replace "size" to "sizes" 
やらかした
 2018-06-18 16:44:42 +09:00
tosuke
8b8f0a0abe Fix path 2018-06-18 15:38:58 +09:00
syuilo
6eb67d85db ✌️ 2018-06-18 15:05:38 +09:00
rinsuki
7f2756866f build:ts success 2018-06-17 19:09:24 +09:00
syuilo
b9e6543611 Fiox bug 2018-06-17 13:52:52 +09:00
syuilo
2326155ac8 inputのsuffixがはみ出す問題を修正 2018-06-17 11:42:23 +09:00
syuilo
6b54f277c3 reversi 💮 💯 2018-06-17 08:10:54 +09:00
syuilo
0ef77dd05c Update default home widgets 2018-06-17 06:57:50 +09:00
Tosuke
d80054642c Merge branch 'master' of github.com:syuilo/misskey 2018-06-16 19:46:51 +09:00
Tosuke
9198c7736b improve web app manifest 2018-06-16 19:45:49 +09:00
syuilo
169dd71922 Fix bug 2018-06-16 19:45:29 +09:00
syuilo
5fcf2e731d MisskeyShare 2018-06-16 18:42:49 +09:00
syuilo
53f6cacdff ✌️ 2018-06-16 07:40:07 +09:00
syuilo
97bb914542 ✌️ 2018-06-16 07:31:35 +09:00
syuilo
5e9d1a36d6 ✌️ 2018-06-16 07:13:45 +09:00
syuilo
1c50e88e71 ✌️ 2018-06-16 07:06:58 +09:00
syuilo
28b1421414 ✌️ 2018-06-15 19:58:04 +09:00
syuilo
1bea050796 🎨 2018-06-15 19:56:18 +09:00
syuilo
7fcf681a56 ✌️ 2018-06-15 13:08:56 +09:00
syuilo
d4c71a6c99 ドライブのファイルの削除を実装 2018-06-15 09:53:30 +09:00
syuilo
4a4b029667 Fix 2018-06-15 09:33:25 +09:00
syuilo
fb9b47fa6f wip 2018-06-15 07:58:27 +09:00
syuilo
ca6961e2ed wip 2018-06-15 07:56:56 +09:00
syuilo
7123206ab9 wip 2018-06-14 21:38:39 +09:00
syuilo
a7fdeffcfd wip 2018-06-14 20:23:50 +09:00
syuilo
ec8e86d8d8 wip 2018-06-14 18:57:54 +09:00
syuilo
e0118a6f4f wip 2018-06-14 18:53:02 +09:00
syuilo
cedf2da144 wip 2018-06-14 16:48:49 +09:00
syuilo
b83517acf0 wip 2018-06-14 14:52:37 +09:00