Commit Graph

880 Commits

Author SHA1 Message Date
Acid Chicken (硫酸鶏)
80d343bb0b
Update avatar.vue 2018-08-13 03:36:42 +09:00
syuilo
9e41fddea3
Merge pull request #2130 from acid-chicken/patch-player
WIP: Add player
2018-08-13 03:25:22 +09:00
Acid Chicken (硫酸鶏)
8384efc8c7
Create whitelist 2018-08-13 03:23:36 +09:00
Acid Chicken (硫酸鶏)
4da8cc478f
Update ui.header.vue 2018-08-13 01:58:15 +09:00
syuilo
01f28b21dd #1211 2018-08-13 01:25:50 +09:00
syuilo
2cb39a8882 Fix #2097 2018-08-13 00:59:36 +09:00
Acid Chicken (硫酸鶏)
92befbb4cc Fix #2177
Resolves #2177
2018-08-13 00:18:02 +09:00
syuilo
4a5e145048 Add new reaction: rip 😇 2018-08-11 21:08:34 +09:00
MeiMei
9bc17974f2 未利用時はTwitterでログインを表示しない (#2156) 2018-08-11 20:20:35 +09:00
Acid Chicken (硫酸鶏)
19c872a1f3
Update url-preview.vue 2018-08-11 19:56:53 +09:00
Acid Chicken (硫酸鶏)
9252c59d90
Merge branch 'master' into patch-player 2018-08-11 19:56:05 +09:00
MeiMei
a8f142096c Cache failed url-preview (apply to proxy/client) (#2154) 2018-08-11 18:04:59 +09:00
MeiMei
3d10b19727 Fix Powered by <b>Misskey</b>. (#2140) 2018-08-10 20:11:54 +09:00
syuilo
454d294cf3 Fix #2133 など 2018-08-10 00:51:40 +09:00
Acid Chicken (硫酸鶏)
1b9f293959
Update url-preview.vue
多分もう折り返す必要はないのだわ
2018-08-09 23:34:54 +09:00
Acid Chicken (硫酸鶏)
7289d5b401 Add player 2018-08-09 16:44:34 +09:00
Acid Chicken (硫酸鶏)
6a92c19227
Update url-preview.vue 2018-08-09 04:21:25 +09:00
Acid Chicken (硫酸鶏)
ebf0479ecc
Update url-preview.vue 2018-08-09 04:05:28 +09:00
syuilo
196c55edbc
Merge pull request #2125 from acid-chicken/acid-chicken-patch-2
Spotify
2018-08-09 03:32:55 +09:00
Acid Chicken (硫酸鶏)
e724c1e7e8
Update url-preview.vue 2018-08-09 03:32:09 +09:00
syuilo
7bd33ecc72 ✌️ 2018-08-07 13:25:50 +09:00
syuilo
d4f7058574 🍕 2018-08-07 12:37:17 +09:00
gutfuckllc
b85f13dad3 Localize mobile search.vue 2018-08-06 21:06:09 -04:00
gutfuckllc
eb8c3fe884 Localize a dev file 2018-08-06 21:03:24 -04:00
gutfuckllc
ff325d9588 Localized annotations line 2018-08-06 21:00:58 -04:00
gutfuckllc
a98392ff27 Localize "only one file attached" popup 2018-08-06 20:57:14 -04:00
gutfuckllc
24de518922 Localized 2 missing lines for mobile widgets.vue 2018-08-06 16:08:54 -04:00
gutfuckllc
a169c7756f Added more close buttons 2018-08-06 16:05:48 -04:00
gutfuckllc
4f590e0a96 Localized adjective 2018-08-06 16:04:20 -04:00
gutfuckllc
f5b5b290e4 Localized copy-paste message (added common) 2018-08-06 16:02:53 -04:00
gutfuckllc
1f75cf4ace Localize missing line 2018-08-06 16:00:12 -04:00
gutfuckllc
1e4f11a979 Localize japanese adjective. 2018-08-06 15:58:09 -04:00
gutfuckllc
be12e23aa1 Localize unlocalized line. 2018-08-06 15:55:39 -04:00
gutfuckllc
790e6ceca4 Localize unlocalized line 2018-08-06 15:53:21 -04:00
gutfuckllc
a303d52990 Fix typo 2018-08-06 15:53:06 -04:00
syuilo
d733a1b445 i18n 2018-08-07 03:20:26 +09:00
syuilo
5f208a7d99 ユーザー検索APIを統合 2018-08-06 18:28:27 +09:00
syuilo
0d9782571f 🎨 2018-08-06 00:09:21 +09:00
syuilo
be67f5f422 🎨 2018-08-05 23:38:31 +09:00
syuilo
2e454dad2d 🎨 2018-08-05 20:57:24 +09:00
syuilo
6ef28214df ひとつの投稿内で使えるそれぞれの動きのあるMFM構文は3回までに制限 2018-08-05 19:36:19 +09:00
syuilo
5bbc95d659 文字数が多い場合は動きを無効に 2018-08-05 19:20:26 +09:00
syuilo
128a201b9d #2080 など 2018-08-05 13:40:26 +09:00
syuilo
cd28504dd8 Add new MFM syntax 2018-08-05 12:33:51 +09:00
syuilo
9a2ff56a79 動きのあるMFMを無効にするオプションを実装 2018-08-04 22:48:35 +09:00
syuilo
be9f6ad294 Implement surrender of reversi 2018-08-04 22:28:01 +09:00
syuilo
61a9ad23f1 Fix bug 2018-08-04 12:35:57 +09:00
syuilo
29418ecbb4 🎨 2018-08-04 11:32:53 +09:00
syuilo
67e97310cf Clean up 2018-08-04 11:25:39 +09:00
syuilo
33d3d5c570 スライダーコントロールを追加するなど 2018-08-04 11:24:15 +09:00
syuilo
0389afa0fe 🎨 2018-08-04 01:48:02 +09:00
syuilo
caec6933d1 Fix bug 2018-08-04 01:47:57 +09:00
syuilo
b13f42645b Fix bug 2018-08-04 01:03:48 +09:00
syuilo
d456e5e45c Implement new MFM syntax 2018-08-03 23:27:37 +09:00
syuilo
42fbc7ab66 Fix #2047 2018-08-03 23:06:58 +09:00
syuilo
8272118e29 typo 2018-08-03 23:01:55 +09:00
syuilo
5defcd6592 🍕 2018-08-03 22:49:54 +09:00
syuilo
13451f6843 ✌️ 2018-08-03 22:42:53 +09:00
syuilo
cbcf3fd7f1 ✌️ 2018-08-03 22:34:58 +09:00
syuilo
6da9da0e8f
Merge pull request #2077 from syuilo/#2066
なんか
2018-08-03 21:32:59 +09:00
syuilo
000635252c wip 2018-08-03 21:30:44 +09:00
syuilo
c016d212ed Fix bug 2018-08-03 21:11:53 +09:00
syuilo
cd6829ca64 wip 2018-08-03 15:59:24 +09:00
syuilo
a88942f58a wip 2018-08-03 09:39:03 +09:00
syuilo
1e3cff6174 wip 2018-08-03 00:36:29 +09:00
syuilo
3f29a0382b wip 2018-08-02 22:54:52 +09:00
Aya Morisawa
7b33c63f78 #332 (#2065) 2018-08-02 19:03:31 +09:00
syuilo
b9dfb937f1 Fix bug 2018-08-02 14:24:27 +09:00
syuilo
ccdc33e476 ✌️ 2018-08-02 09:56:13 +09:00
syuilo
5c497d7563 ✌️ 2018-08-02 09:52:47 +09:00
syuilo
ab009cfbd7 🎨 2018-08-02 09:24:08 +09:00
syuilo
1d4f4b829f Improve i18n 2018-08-02 08:04:16 +09:00
syuilo
23f2370c4b Improve i18n 2018-08-02 07:53:11 +09:00
syuilo
32053d963f i18n reversi 2018-08-02 07:36:25 +09:00
syuilo
dd167a476f Remove some outdated tips 2018-08-02 07:06:31 +09:00
syuilo
b0fdf25b24 Improve i18n 2018-08-02 06:58:15 +09:00
gutfuckllc
2f8b64d6fb Translated mobile/views/pages/widgets/activity.vue and mobile/views/pages/widgets.vue 2018-08-01 17:34:27 -04:00
gutfuckllc
b608e594af Translated mobile/views/pages/welcome.vue 2018-08-01 17:30:54 -04:00
gutfuckllc
9652440579 Translated mobile/views/pages/welcome.vue 2018-08-01 17:30:35 -04:00
gutfuckllc
55d2ae2050 Translated mobile/views/pages/signup.vue 2018-08-01 16:43:47 -04:00
gutfuckllc
bdde0c3c63 Fixed welcome.vue build bug. 2018-08-01 16:37:36 -04:00
gutfuckllc
08afa44e09 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
3ec3fa2d1e 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
df74a4eb20 Forgot to add vue. here 2018-08-01 14:55:30 -04:00
gutfuckllc
5ab4d0c29b Translated desktop/views/pages/tag.vue
More weird syntax fiddling. Should work nonetheless
2018-08-01 14:52:53 -04:00
gutfuckllc
d6fab5fd6c Translated desktop/views/components/settings.drive.vue 2018-08-01 14:42:52 -04:00
gutfuckllc
c5b682dc89 common/views/widgets/calendar.vue
Did weird formatting tricks. Hopefully should work.
2018-08-01 14:25:55 -04:00
gutfuckllc
86d49c6704 Translated common/views/widgets/tips.vue
Double lines. Might want to check that.
2018-08-01 14:14:53 -04:00
gutfuckllc
e42c8859b4 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
3636db3f85 Translated desktop/views/pages/share.vue 2018-08-01 12:09:59 -04:00
gutfuckllc
3750b4d7d0 Translated slieshow.vue 2018-07-31 19:12:30 -04:00
gutfuckllc
b39384258c Added i18n line to hint
home.vue
2018-07-31 18:54:43 -04:00
gutfuckllc
0a8213b851 Fully translated settings.profile.vue
Added relevant translation lines
2018-07-31 14:03:43 -04:00
gutfuckllc
460a4edb13 Added uncommitted file 2018-07-31 13:56:21 -04:00
gutfuckllc
2855ec0372 Reformat, more translation
Translated the totality of desktop/post-form.vue, reformated customization-tips.
2018-07-31 13:54:12 -04:00
gutfuckllc
0f34ed3ccd 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
cbb73e4e15 Localized customization tips on home.vue
Added relevant customization lines.
2018-07-31 13:29:18 -04:00
gutfuckllc
aed7d06af5 Translated trash on main menu
Translated trash on main menu
2018-07-31 11:36:15 -04:00
Aya Morisawa
ff6993478f #332 2018-07-30 20:13:30 +09:00
syuilo
1ba1a7aa40 Fix bug 2018-07-30 14:46:11 +09:00
syuilo
835057d970 Revert "Fix bug"
This reverts commit 4e6dcd16ac.
2018-07-30 14:45:48 +09:00
syuilo
4e6dcd16ac Fix bug 2018-07-30 06:20:06 +09:00
syuilo
33f0dd8d43 #2018 2018-07-29 09:17:07 +09:00
nzws
33e1c08273 Fix margin in visibleUsers (mobile) 2018-07-28 13:17:32 +09:00
syuilo
50a6efd568 Fix #2000 2018-07-28 07:38:29 +09:00
syuilo
9ef477f04b
Merge pull request #2010 from acid-chicken/acid-chicken-patch-1
Minify Mk-III
2018-07-27 19:17:15 +09:00
Acid Chicken (硫酸鶏)
5268fee5b5
Fix bug 2018-07-27 19:15:38 +09:00
Aya Morisawa
68e28faedc 2018-07-27 19:12:16 +09:00
syuilo
a880f5cbb8
Merge pull request #2009 from acid-chicken/acid-chicken-patch-1
Minify Mk-II
2018-07-27 18:29:24 +09:00
Acid Chicken (硫酸鶏)
df5a7c7e0c
Update calendar.vue 2018-07-27 18:28:06 +09:00
syuilo
6b19e54c23 Fix bug 2018-07-27 18:18:05 +09:00
nzws
b29492e8eb Change VisibilityButton's icon in mobile view 2018-07-27 13:30:46 +09:00
syuilo
fab0a0d6e2 ログインしていないとリバーシを観戦できない問題を修正 2018-07-27 04:01:12 +09:00
nzws
3fcc793269 Fix problem displaying button in profile page 2018-07-26 21:47:02 +09:00
nzws
fd27a0efef Hide follow button of my account 2018-07-26 21:45:43 +09:00
nzws
4474a2568e Change VisibilityButton's icon when changing visibility 2018-07-26 21:44:21 +09:00
Acid Chicken (硫酸鶏)
0852045928
Update misskey-flavored-markdown.ts 2018-07-26 13:48:08 +09:00
Acid Chicken (硫酸鶏)
04de0e9a50
Update hashtags.vue 2018-07-26 13:47:06 +09:00
syuilo
ce4fb49d4c Improve tweet embed 2018-07-26 04:55:39 +09:00
syuilo
91b89b79d2 Fix bug 2018-07-26 04:29:09 +09:00
ysr227
e44f33bf14 Embed tweet when tweet url attached 2018-07-26 00:03:32 +09:00
syuilo
0b656999d8 Clean up 2018-07-25 07:45:38 +09:00
syuilo
f8477fa88d 🎨 2018-07-25 04:36:02 +09:00
syuilo
51bafe8259 #1893 2018-07-25 01:14:38 +09:00
syuilo
f1bbbcfedf Fix #1960 2018-07-25 00:51:30 +09:00
syuilo
7432de3d33
Merge pull request #1968 from syuilo/object-storage
Object storage support
2018-07-24 23:45:19 +09:00
syuilo
03ce87d710 wip 2018-07-24 23:43:14 +09:00
Aya Morisawa
9ad403af00 Enhance #1958 2018-07-23 20:58:59 +09:00
Aya Morisawa
5b116737b6 Fix typo 2018-07-23 20:11:20 +09:00
syuilo
8adc799041
Merge pull request #1959 from acid-chicken/top
Go to top
2018-07-23 14:37:18 +09:00
Acid Chicken (硫酸鶏)
41e657b64e Go to top 2018-07-23 14:35:00 +09:00
Aya Morisawa
f16cda51fb #1957 2018-07-23 14:07:09 +09:00
Aya Morisawa
886510d721 Clean up 2018-07-23 14:04:53 +09:00
Aya Morisawa
138fa1454f Fix #1957 2018-07-23 13:37:29 +09:00
syuilo
1d027613e4 🎨 2018-07-21 04:33:04 +09:00
syuilo
e9de73d2f6 Fix 2018-07-21 03:24:39 +09:00
syuilo
afcf2fddb1 Improve hashtag suggestion 2018-07-21 03:15:31 +09:00
syuilo
7316352ff5 ✌️ 2018-07-21 02:58:44 +09:00
syuilo
ad76d5d8e2
Merge pull request #1939 from acid-chicken/sushi
🍣回転寿司🍣
2018-07-21 02:23:13 +09:00
Acid Chicken (硫酸鶏)
9bb02e5bf6
Update post-form.vue 2018-07-21 02:14:24 +09:00
Acid Chicken (硫酸鶏)
ae68e6372c
Update messaging-room.form.vue 2018-07-21 02:07:50 +09:00
Acid Chicken (硫酸鶏)
69593994ef
Update post-form.vue 2018-07-21 02:06:49 +09:00
Acid Chicken (硫酸鶏)
cb52ebe65b インデクサーを忘れていた 2018-07-21 01:25:55 +09:00
Acid Chicken (硫酸鶏)
9b989ebac6 保存し忘れ 2018-07-21 01:24:12 +09:00
Acid Chicken (硫酸鶏)
f13bef4ac8 回転寿司 2018-07-21 01:21:27 +09:00
Aya Morisawa
773d104306 Fix #1868 2018-07-20 21:59:09 +09:00
syuilo
b8e948b009
Merge pull request #1936 from syuilo/patch-1803
Fix #1803
2018-07-20 21:47:35 +09:00
Aya Morisawa
ac19567f2b Fix #1803 2018-07-20 21:39:21 +09:00
Acid Chicken (硫酸鶏)
bc627fc55c タグサジェストが重複しないようにする 2018-07-20 21:12:28 +09:00
Aya Morisawa
5d09b7e38b mark as read all -> mark all as read
Close #855
2018-07-20 14:16:02 +09:00
syuilo
8dc5375d55 最近使ったハッシュタグを表示するようにするなど 2018-07-20 05:29:56 +09:00
syuilo
738ced81ec 動画もNSFW 2018-07-20 02:53:32 +09:00
syuilo
ec2b1ec3f0 #1334 2018-07-20 02:40:37 +09:00
syuilo
31a6f2b421 Clean up 2018-07-19 22:02:30 +09:00
Aya Morisawa
66c106722c Hide settings button
It is unimplemented
2018-07-19 16:40:40 +09:00
Aya Morisawa
9d0204f2fa Hide detail button
It is unimplemented
2018-07-19 16:21:22 +09:00
Aya Morisawa
e03ec67b5c Show error message if searching is not available 2018-07-19 08:24:03 +09:00
Aya Morisawa
7e27e2757f Hide delete button
It is unimplemented
2018-07-19 07:48:42 +09:00
syuilo
7873905cde 🎨 2018-07-19 04:50:46 +09:00
syuilo
84da99d56c 🎨 2018-07-19 03:25:37 +09:00
Acid Chicken (硫酸鶏)
6da464fd1b
Update calendar.vue 2018-07-19 00:13:58 +09:00
syuilo
efaa41ba49 reCAPTCHAをオプションに 2018-07-19 00:04:09 +09:00
Aya Morisawa
6e720b2798 Hide drive search form
It is unimplemented
2018-07-18 19:13:41 +09:00
syuilo
df20f5063d #1720 #59 2018-07-18 07:19:24 +09:00
Acid Chicken (硫酸鶏)
4713822122
Update analog-clock.vue 2018-07-18 02:06:01 +09:00
Acid Chicken (硫酸鶏)
e10de62a7a
Update analog-clock.vue 2018-07-18 02:04:07 +09:00
Acid Chicken (硫酸鶏)
14b235e3a4
Update analog-clock.vue 2018-07-18 02:02:52 +09:00
Acid Chicken (硫酸鶏)
180bf33a28
Update calendar.vue 2018-07-18 01:46:21 +09:00
syuilo
3c678f0e92 Fix bug 2018-07-18 01:22:11 +09:00
syuilo
4a25ed0627
✌️ 2018-07-17 18:50:13 +09:00
syuilo
f65fbf9d55
Merge pull request #1916 from acid-chicken/acid-chicken-patch-1
Proposal: Smooth Clock
2018-07-17 18:45:21 +09:00
Acid Chicken (硫酸鶏)
6169acd478
Update analog-clock.vue 2018-07-17 18:43:04 +09:00
syuilo
0a4b652493 Darken
Co-Authored-By: tamaina <tamaina@hotmail.co.jp>
2018-07-15 01:49:36 +09:00
syuilo
41fa045999 Darken
Co-Authored-By: tamaina <tamaina@hotmail.co.jp>
2018-07-15 01:48:06 +09:00
syuilo
28dcf8bc1e Revert "Update messaging-room.vue"
This reverts commit 313afbd6db.
2018-07-15 01:07:17 +09:00
ImgBotApp
4c58dc61bc
[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
9666e6b4d3 #1894 2018-07-14 11:58:21 +09:00
syuilo
f2959ada85 Revert "Update messaging-room.message.vue"
This reverts commit 7b3f52505e.
2018-07-14 00:00:30 +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
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
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
e85ac32c2d
Merge pull request #1859 from xps2/repurl
リポジトリとフィードバックのURLをconfigから指定できるように変更
2018-07-07 21:17:29 +09:00
xps2
a7e27c2419 リポジトリとフィードバックのURLをconfigから指定できるように変更 2018-07-07 21:08:22 +09:00
syuilo
aa4ef6745a Refactorng 2018-07-07 19:19:00 +09:00
syuilo
865fd25af1 Refactorijg 2018-07-07 19:01:33 +09:00
syuilo
081ad9adcf Fix bug 2018-07-04 21:23:50 +09:00
syuilo
bc627da923 Fix bug 2018-07-04 20:58:03 +09:00
syuilo
c1b77365a0 wip 2018-07-04 20:44:13 +09:00
syuilo
a23ef386ea Fix bug 2018-06-28 16:21:35 +09:00