graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-24 13:23:08 +02:00
Code Issues Projects Releases Packages Wiki Activity
13904 commits 62 branches 916 tags 154 MiB
Commit graph

5401 commits

Author SHA1 Message Date
syuilo
3acd2e0f0c
🎨 2018-12-09 13:25:46 +09:00
syuilo
b1b5a795c8
Revert "Eliminate if-statement (#3556)" 
This reverts commit fb8b0c291d.
 2018-12-09 13:21:42 +09:00
tamaina
197e2c8377 #2501 (#3567) 
* refactor mfm/html

* fix

* fix

* https://github.com/syuilo/misskey/pull/3567#discussion_r240023301
 2018-12-09 13:15:32 +09:00
Aya Morisawa
fb8b0c291d Eliminate if-statement (#3556) 2018-12-09 13:13:00 +09:00
Aya Morisawa
706d47ec32 #2501 (#3560) 
* #2501

* Update stream.ts
 2018-12-09 13:09:31 +09:00
Aya Morisawa
f6f79fb388
Refactor getChildrenCount (#3554) 
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 2018-12-09 09:44:51 +09:00
Aya Morisawa
34235d4d44
Refactor getTextCount (#3553) 
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 2018-12-09 09:44:24 +09:00
Aya Morisawa
17baf8770a
Eliminate if-statement (#3564) 2018-12-09 03:45:47 +09:00
Aya Morisawa
01f60edb17
Eliminate duplicated condition on if-statement (#3563) 2018-12-09 03:45:07 +09:00
Aya Morisawa
15b11e59f4
Eliminate if-statement (#3562) 2018-12-09 03:44:37 +09:00
Aya Morisawa
a2db4db963
Eliminate if-statement (#3561) 
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 2018-12-09 03:43:58 +09:00
Aya Morisawa
e87b9cc019
Use && to eliminate if-statement (#3558) 2018-12-09 03:41:18 +09:00
Aya Morisawa
54cb94db1d
Eliminate if-statement (#3555) 2018-12-09 03:40:40 +09:00
Aya Morisawa
1de8e1eeb1
#2501 2018-12-09 01:05:55 +09:00
MeiMei
1d8fb65959 Fix follow duplicate (#3548) 
* フォローとリクエスト両方存在しても解除する

* 既にフォローしてても承認できるように
 2018-12-08 18:55:00 +09:00
tamaina
28482627f7 improve user-integration display in the user page (#3541) 
* improve user-integration display in the user page

* delete unnecessary comma
 2018-12-08 16:59:29 +09:00
Acid Chicken (硫酸鶏)
48deb35d4b Update server-stats.ts (#3512) 2018-12-08 10:40:45 +09:00
syuilo
596f92cfcc
[Client] Improve cw-button 2018-12-08 10:36:26 +09:00
syuilo
b2dedf7f98
Add comment 2018-12-08 10:20:43 +09:00
MeiMei
34393ef89f Improve custom emoji parsing (#3539) 
* Use MFM parser for extracting emoji in name

* Fix custom emoji regex

* Revert "Fix custom emoji regex"

This reverts commit 4c21caf59753e7653c02f81ddf0cde8c44f48008.
 2018-12-08 06:39:15 +09:00
MeiMei
e2843a5ce4 Resolve #3537 (#3540) 
* Resolve #3537

* tune
 2018-12-08 06:18:37 +09:00
MeiMei
702875a78e Apply tag length limit from AP (#3536) 2018-12-07 21:01:43 +09:00
Aya Morisawa
96571866a3
#2593 (mobile) (#3521) 2018-12-07 18:33:09 +09:00
syuilo
f72b00bec7
Update parser.ts 2018-12-07 18:26:54 +09:00
syuilo
1e7b5a0a98
Resolve #3529 2018-12-07 17:54:35 +09:00
Acid Chicken (硫酸鶏)
9f09afc824 Fix bug caused by Chrome 71 (#3535) 
* Update emoji.vue

* Update autocomplete.vue

* Update emoji.vue

* Update autocomplete.vue

* Update emoji.vue
 2018-12-07 17:21:34 +09:00
MeiMei
93b599dc8e Add user name conversions (#3534) 
* Add user name conversions

* add conversion
 2018-12-07 11:29:49 +09:00
MeiMei
008432e156 lint fix (#3522) 2018-12-06 19:15:09 +09:00
Aya Morisawa
d3d50b2f79
Add missing comma 2018-12-06 17:02:44 +09:00
Aya Morisawa
eefeb4c268
#2593 (desktop) (#3518) 2018-12-06 16:56:24 +09:00
syuilo
7a8e97972c
✌️ 2018-12-06 16:33:35 +09:00
syuilo
3555213155
Resolve #3519 2018-12-06 16:30:28 +09:00
syuilo
5d3d8dffd6
Update photo-stream.vue 2018-12-06 16:19:12 +09:00
syuilo
dea8688c9d
Refactor 
Use mk-user-name
 2018-12-06 16:09:33 +09:00
syuilo
a235869cfa
Refactor 
Make mk-user-name component
 2018-12-06 11:18:13 +09:00
tamaina
31b30e3dd2 Resolve #3347 , #3349 (#3513) 
* Resolve  #3347 , #3349
Make deck columns' width be selectable and flexible

* deckColumnMinwidth --> deckColumnMinWidth

* w-default --> normal

* ✌️
 2018-12-06 11:11:46 +09:00
Aya Morisawa
58b3be438a Resolve #1872 (#3516) 2018-12-06 10:21:41 +09:00
MeiMei
4522568749 Emoji support in profile (#3514) 
* Emoji in profile

* Add emojis to fields
 2018-12-06 10:02:04 +09:00
Acid Chicken (硫酸鶏)
fe891da886 外部サービス連携情報をPersonのfieldsに乗せて配信する (#3499) 
* Update person.ts

* Update person.ts

refs: https://github.com/syuilo/misskey/pull/3499#issuecomment-444484557

* Update person.ts

refs: https://github.com/syuilo/misskey/pull/3499#pullrequestreview-181755475
 2018-12-06 00:37:59 +09:00
Aya Morisawa
66836836ab
Add small syntax (#3506) 2018-12-05 20:11:54 +09:00
Aya Morisawa
dc8f4c8d6a
Fix #3341 (#3502) 2018-12-05 18:44:57 +09:00
syuilo
ed4860dfd9
[MFM] Add italic syntax 
Resolve #3486
 2018-12-05 17:39:26 +09:00
syuilo
20c0690352
[Client] Resolve #3500 2018-12-05 17:27:27 +09:00
syuilo
a105faeaae Update home.photos.vue 2018-12-04 11:02:51 +09:00
syuilo
13404310a7
Revert "Update switch.vue" 
This reverts commit 40520f3997.
 2018-12-04 09:42:55 +09:00
syuilo
40520f3997
Update switch.vue 2018-12-04 03:50:07 +09:00
MeiMei
c1d59716d1 Remove unnecessary Renote check code (#3489) 2018-12-04 03:22:41 +09:00
MeiMei
d8698743a1 Do not show Renote button when inhibited (#3488) 2018-12-04 03:22:08 +09:00
syuilo
6e343d50f1
[MFM] Implement strike syntax 
Resolve #3485
 2018-12-04 01:28:21 +09:00
syuilo
ce3f735654
Fix bug 2018-12-04 01:07:26 +09:00
syuilo
9b5e623130
🎨 2018-12-04 01:04:53 +09:00
syuilo
f0b0c5b540
🎨 
Add ripple effect
 2018-12-04 01:02:19 +09:00
MeiMei
227798300f Improve widget paging looks (#3482) 
* Improve widget paging looks

* rewind when error
 2018-12-03 23:14:10 +09:00
syuilo
c222b9ae94
Update init.ts 2018-12-03 20:26:46 +09:00
syuilo
53a0f3c794
Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-12-03 20:26:38 +09:00
syuilo
9ff349c548
Update post-form.vue 2018-12-03 20:21:05 +09:00
Aya Morisawa
0935bd4bd4 Resolve #3281 (#3479) 2018-12-03 20:11:18 +09:00
syuilo
45bee7cc2f
Resolve #327 2018-12-03 20:08:18 +09:00
syuilo
1c86a4bc26
Refactor 2018-12-03 19:44:03 +09:00
syuilo
c047324b42
🎨 2018-12-03 09:43:07 +09:00
syuilo
0d478046de
Improve usability 2018-12-03 09:41:22 +09:00
syuilo
f3479d1b98
Refactor 2018-12-03 09:38:43 +09:00
syuilo
2fdecb8a38
🎨 2018-12-03 09:14:17 +09:00
syuilo
07d6894c42
Clean up 2018-12-02 23:00:06 +09:00
Aya Morisawa
03588b3fd6
Merge if-statements (#3478) 2018-12-02 22:32:09 +09:00
nico
2633873fcc Fix syntax error (#3477) 
src/remote/activitypub/models/person.ts(326,4): error TS1005: ',' expected.
 2018-12-02 21:19:28 +09:00
Aya Morisawa
928d359dd2
Use takeWhile instead of some (#3475) 2018-12-02 20:28:22 +09:00
Aya Morisawa
184eb00133
Remove self-assignment (#3476) 2018-12-02 20:26:15 +09:00
syuilo
e264a49b08
[Client] Resolve #2596 2018-12-02 20:24:38 +09:00
syuilo
8caf853c80
Merge branches 'develop', 'develop' and 'develop' of https://github.com/syuilo/misskey into develop 2018-12-02 20:11:03 +09:00
Aya Morisawa
b451c04787
Use primitive type boolean (#3474) 2018-12-02 20:10:56 +09:00
syuilo
1653977392
Improve input dialog 2018-12-02 20:10:53 +09:00
Aya Morisawa
a0d9def98a
Simplify expressions (#3473) 2018-12-02 19:35:41 +09:00
Aya Morisawa
92701e5cec Fix #3445 (#3471) 2018-12-02 19:24:57 +09:00
Aya Morisawa
0b6b6a4f2f
Remove unneccesary casts 2018-12-02 19:05:08 +09:00
MeiMei
3a2dc95850 No MFM parsing when remote note (#3470) 
* Use tag for hashtag detection of remote note

* No MFM parsing when remote note
 2018-12-02 18:05:33 +09:00
syuilo
c38a32dee9
🎨 2018-12-02 15:31:24 +09:00
syuilo
4f5abed70d
Fix 2018-12-02 15:30:48 +09:00
syuilo
c9ac9923df
Refactor: rename alert to dialog 2018-12-02 15:28:52 +09:00
syuilo
bb14895fd8
[Client] Resolve #2225 2018-12-02 15:26:56 +09:00
syuilo
6f92d601ec
🎨 2018-12-02 14:26:30 +09:00
MeiMei
345143b0c1 Suggest in CW (#3467) 2018-12-02 07:33:03 +09:00
syuilo
864b6ad1bd
Resolve #1826 2018-12-02 07:02:08 +09:00
syuilo
c58027e521
[MFM] Better hashtag detection 2018-12-02 06:53:57 +09:00
syuilo
10f466c895
Improve performance 2018-12-02 06:44:18 +09:00
MeiMei
8bc5febe66 [Client] Add missing icon (#3464) 2018-12-02 03:43:05 +09:00
MeiMei
20335e23f9 Resolve external recommended users (#3462) 
* Resolve external recommended users

* Skip unresolvable users

* Fix indent

* Use original for unresolvable users
 2018-12-02 03:42:45 +09:00
syuilo
fe707f88a4
[MFM] Better MFM parsing 2018-12-01 10:40:09 +09:00
syuilo
9b23ebd4a3
🎨 2018-12-01 09:45:48 +09:00
syuilo
e80709f7aa
Disable update notification 2018-12-01 07:59:15 +09:00
imgbot[bot]
cb71f92f42 [ImgBot] Optimize images (#3455) 
*Total -- 1,383.25kb -> 1,231.27kb (10.99%)

/assets/apple-touch-icon.png -- 4.72kb -> 2.51kb (46.79%)
/assets/icons/256.png -- 4.72kb -> 2.51kb (46.79%)
/assets/title.png -- 6.63kb -> 3.80kb (42.73%)
/assets/favicon/favicon.png -- 6.83kb -> 3.93kb (42.45%)
/assets/icons/192.png -- 3.49kb -> 2.02kb (42.08%)
/assets/icons/128.png -- 2.29kb -> 1.50kb (34.81%)
/assets/about/ui.png -- 125.21kb -> 94.85kb (24.25%)
/assets/ai-orig.png -- 255.55kb -> 199.67kb (21.86%)
/assets/icons/64.png -- 1.21kb -> 0.99kb (18.34%)
/assets/about/drive.png -- 110.33kb -> 94.20kb (14.62%)
/assets/about/post.png -- 344.52kb -> 316.57kb (8.11%)
/assets/ai.png -- 243.43kb -> 234.93kb (3.49%)
/src/client/assets/pointer.png -- 274.33kb -> 273.80kb (0.19%)
 2018-12-01 07:55:34 +09:00
Acid Chicken (硫酸鶏)
53c559c001 Allow hyphens in the middle of remote usernames (#3440) 
* Allow hyphens in the middle of remote usernames

refs: d797c29db462de4a3d69a5077a1ae4d03195b6f2

* Make options fallback better

* Make options flat
 2018-12-01 07:19:17 +09:00
MeiMei
cf4cecd4df Fix media video (#3452) 
* Fix: Always show nsfw

* [Client] Add missing video play icon
 2018-12-01 07:16:28 +09:00
MeiMei
6a8835b923 Exclude remote user or myself from talk user suggestions (#3449) 2018-12-01 07:15:55 +09:00
MeiMei
f2b1cf92e1 AP CW (#3448) 2018-12-01 07:15:10 +09:00
Aya Morisawa
3db414add4
Use for-of instead of map 
return values are not being used
 2018-11-30 23:30:28 +09:00
Aya Morisawa
9ef641b403
Remove consecutive blank line 2018-11-30 23:07:21 +09:00
MeiMei
6fa7819a44 Fix #3442 (#3443) 2018-11-30 18:13:55 +09:00
MeiMei
59a1b9adbe Trim notifications text (#3438) 
* Trim notifications

* Remove needless colons

* Use single quote

* 🎨
 2018-11-30 09:34:37 +09:00
syuilo
ee82f99f5a
Better limit 2018-11-30 00:45:02 +09:00
MeiMei
683a85ecc0 Fix SMTP (#3436) 2018-11-30 00:35:17 +09:00
syuilo
8ca27a4480
Fix #3432 2018-11-30 00:13:13 +09:00
syuilo
77d2d84e05
Fix #3434 2018-11-30 00:04:28 +09:00
MeiMei
3bde4285eb Fix SMTP (#3433) 
* Fix: SMTP local relay

* Fix SMTP SSL description

* ✌️
 2018-11-30 00:03:28 +09:00
syuilo
15efbfb244
Fix #3430 2018-11-29 22:05:11 +09:00
MeiMei
55a57db958 Show current selected language (#3429) 2018-11-29 21:56:53 +09:00
syuilo
cf9f85eb2a
メールサーバーの設定がオフの場合はメール設定を表示しないように 2018-11-29 20:33:31 +09:00
syuilo
22e30b44b9
Make require password to update email 2018-11-29 20:19:02 +09:00
syuilo
48d0e2fa5f
[MFM] Improve hashtag detection 2018-11-29 20:12:37 +09:00
syuilo
0489291815
Refactor 2018-11-29 20:09:41 +09:00
syuilo
7a412500e1
[Client] Fix #3427 2018-11-29 20:07:31 +09:00
syuilo
ab594d1dfe
Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-11-29 16:24:05 +09:00
syuilo
647d32f506
🎨 2018-11-29 16:24:02 +09:00
syuilo
1bc109b42c
Implement email config 2018-11-29 16:23:45 +09:00
Hakaba Hitoyo
afdb23ff57 Feature / Configurable web search engine (#3406) 
* configurable web search engine

* add webSearchEngine config in mobile ui

* add webSearchEngine config in desktop ui

* add webSearchEngine config

* add messages for web search engine config

* correct locale
 2018-11-29 11:05:17 +09:00
syuilo
3dcf5374c2
Mark chart apis as stable 2018-11-29 06:06:07 +09:00
Ivan
bb0cb0a866 Fix bad style in deck column options and other things (#3412) 
* Fix wrong text color in empty timeline (#3268)

* Whoops

* Fix wrong text color in deck options (#3268)

* Some padding to make it look less ugly

* Fix wrong text color in user lists menu (#3268)

* Fix wrong text color of footer on welcome screen (mobile) (#3268)

* Fix misalignment of icons and text in menu (mobile) (#3289)

* Fix wrong text color in empty timeline (mobile) (#3268)
 2018-11-29 05:02:35 +09:00
Acid Chicken (硫酸鶏)
362dc29057 Update profile-editor.vue (#3424) 2018-11-29 04:54:36 +09:00
syuilo
8af0218e4c
✌️🤔✌️ 2018-11-28 18:57:22 +09:00
syuilo
09af9968b5
🎨 2018-11-28 16:29:18 +09:00
syuilo
4bbb7eded3
Cookieを使わないように 2018-11-28 16:19:02 +09:00
syuilo
f257853906
Update signin.ts 2018-11-28 05:27:34 +09:00
nico
bdef33e88d Add theme_color and 512x512 icon to app manifest (#3417) 
As per Chrome Lighthouse PWA suggestions.
 2018-11-28 04:38:50 +09:00
syuilo
2c6bad2501
[MFM] Improve hashtag detection 2018-11-27 02:08:51 +09:00
syuilo
7ed50b90bd
[Client] Resolve #3323 2018-11-27 01:21:16 +09:00
MeiMei
b6fd5d7282 No caching /api/ (#3411) 2018-11-27 01:16:25 +09:00
MeiMei
06124dbbd5 Return 404 for undefined .well-known (#3404) 2018-11-26 04:49:24 +09:00
MeiMei
bcb04924ff Image for web publish (#3402) 
* Image for Web

* Add comment

* Make main to original
 2018-11-26 04:25:48 +09:00
syuilo
0863e5d379
🎨 2018-11-25 13:47:42 +09:00
syuilo
55dcd25df1
Improve MFM 2018-11-25 13:36:52 +09:00
syuilo
f3155ea180
[MFM] Add center syntax 
Resolve #1775
 2018-11-25 13:36:40 +09:00
syuilo
2c5162671c
Improve MFM 2018-11-25 13:23:18 +09:00
syuilo
fc8aeb5a66
[Client] Fix bug 2018-11-25 13:21:47 +09:00
syuilo
0e49c11a4c
Refactoring 2018-11-25 13:19:33 +09:00
syuilo
e0b9fe5e5d
🎨 2018-11-25 05:16:39 +09:00
syuilo
a4726e683b
🎨 2018-11-25 05:10:48 +09:00
syuilo
3b10e93efe
[MFM] Better hashtag parsing 2018-11-25 04:44:42 +09:00
syuilo
02b07c1b5b
Update note-mixin.ts 2018-11-25 04:30:32 +09:00
syuilo
5e54751bd4
Refactor 2018-11-25 04:26:07 +09:00
MeiMei
93f13ffc8e Fix: url-preview (#3397) 2018-11-25 01:39:22 +09:00
syuilo
95ba7e43b1
Fix bug: リモートユーザーのアイコンとバナーの色が取得されていない問題を修正 2018-11-24 17:29:32 +09:00
syuilo
9e5a2e5b17
Fix lint 2018-11-24 17:19:51 +09:00
syuilo
dbbc416095
[MFM] Fix hashtag detection 2018-11-24 17:18:11 +09:00
syuilo
b1c12abb7c
Refactor 2018-11-24 17:10:12 +09:00
syuilo
de2b0224d6
Resolve #3158 2018-11-24 07:04:29 +09:00
syuilo
3f8a72eb88
🎨 2018-11-24 07:03:03 +09:00
syuilo
0387176e8c
🎨 2018-11-24 07:01:40 +09:00
syuilo
aa34e332f4
Update reversi.room.vue 2018-11-24 07:01:12 +09:00
syuilo
d13999d689
🎨 2018-11-24 06:56:30 +09:00
syuilo
df8128c0b1
Update url-preview.ts 2018-11-24 06:41:22 +09:00
MeiMei
f2f7bdc5a9 Do not use _replyIds (#3392) 2018-11-23 23:12:28 +09:00
syuilo
915d352505
Resolve #3366 2018-11-23 16:39:51 +09:00
syuilo
1d1024c57a
[MFM] Improve hashtag detection 
Resolve #3387
 2018-11-23 16:02:17 +09:00
syuilo
0d272b1fb0
Resolve #3376 2018-11-23 08:13:17 +09:00
syuilo
7e803ff9a9
Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-11-23 08:01:29 +09:00
syuilo
246cead2b1
Improve user operations 
Resolve #2197
Resolve #3367
 2018-11-23 08:01:14 +09:00
MeiMei
336b45b6f7 AP quote (#3384) 2018-11-23 02:10:07 +09:00
nico
2a0b62d26d Fix #3343 (#3383) 
Setting "X-Forwarded-Proto: https" in the SSL proxy is the correct way to do this
 2018-11-23 02:09:04 +09:00
MeiMei
653ec0cbb0 No cache /notes/:note (#3382) 2018-11-22 23:17:58 +09:00
Aya Morisawa
08f00d4990 Remove unneccesary cast (#3355) 2018-11-22 05:07:25 +09:00
Acid Chicken (硫酸鶏)
6951f7e74a Fix #3361 (#3362) 
* Update create.ts

* Update api.ts
 2018-11-22 05:06:51 +09:00
syuilo
8cbb961493
[MFM] Improve URL parsing 
Fix #3368
 2018-11-22 05:02:38 +09:00
syuilo
67df681a48
Refactoring 2018-11-22 01:51:26 +09:00
Hakaba Hitoyo
ac14adfd3e Feature / user recommendation config in admin ui (#3357) 
* add config for external user recommendation into admin ui

* debug

* correct admin ui

* switch external user recommendation to admin ui config

* debug

* debug

* debug

* Revert "debug"

This reverts commit f4a0460e5bde21cd1f39a735f496a2d74233ef3f.

* explicit parseInt radix

* add Japanese message

* change default engine to https

* remove unused settings

* debug

* nullable externalUserRecommendationTimeout
 2018-11-21 23:44:59 +09:00
syuilo
562a5f66fc
Improve usability 2018-11-21 14:44:49 +09:00
syuilo
b2f8003602
[MFM] Better inline code parse 2018-11-21 12:55:15 +09:00
MeiMei
b7b36973f7 Fix: stop in DB check (#3356) 2018-11-21 12:45:40 +09:00
syuilo
79c7712241
Improve MFM 2018-11-21 08:32:40 +09:00
syuilo
8f5f3985f4
[MFM] Fix hashtag parsing 2018-11-21 08:30:29 +09:00
syuilo
4198497237
Improve test page 2018-11-21 06:25:58 +09:00
syuilo
9b1612574e
[Client] Fix #3114 2018-11-21 06:24:46 +09:00
syuilo
db9c2913cf
Update index.vue 2018-11-21 05:36:55 +09:00
syuilo
286674c2bb
Fix bug 2018-11-21 05:27:06 +09:00
syuilo
7c259185bc
Fix bug 2018-11-21 05:26:48 +09:00
syuilo
79ffbf95db
Improve MFM parser (#3337) 
* wip

* wip

* Refactor

* Refactor

* wip

* wip

* wip

* wip

* Refactor

* Refactor

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Clean up

* Update misskey-flavored-markdown.ts

* wip

* wip

* wip

* wip

* Update parser.ts

* wip

* Add new test

* wip

* Add new test

* Add new test

* wip

* Refactor

* Update parse.ts

* Refactor

* Update parser.ts

* wip
 2018-11-21 05:11:00 +09:00
Aya Morisawa
6e347e4221 Refactor checkMongoDb (#3339) 2018-11-20 21:19:14 +09:00
MeiMei
389315e000 Fix: ap/show (#3350) 2018-11-20 21:18:14 +09:00
Aya Morisawa
168db6891f
Refactor spawnWorkers (#3338) 2018-11-20 12:25:58 +09:00
Aya Morisawa
4a77548672
Refactor port checking (#3336) 2018-11-20 11:23:32 +09:00
MeiMei
8f0c433e05 Cores => Logical cores (#3332) 2018-11-20 05:30:22 +09:00
MeiMei
e332e3c248 Explicitly set max-age (#3330) 2018-11-20 05:29:51 +09:00
Aya Morisawa
ca0cb6fd42
Merge environmentInfo and machineInfo into index.ts (#3319) 2018-11-19 13:39:10 +09:00
Aya Morisawa
be52779bbc
Use descriptive variables to improve readability (#3318) 2018-11-19 13:27:38 +09:00
Aya Morisawa
23b64794a4 Call main at the end (#3317) 2018-11-19 12:58:58 +09:00
MeiMei
644bc985e7 Fix some image processing (#3313) 
* Improve thunmbnail generation

* Respect orientation in Firefox
 2018-11-19 09:17:16 +09:00
syuilo
a390e57dff
[Client] Improve UI 2018-11-19 02:09:27 +09:00
syuilo
8d70587814
Refactoring 2018-11-19 02:04:12 +09:00
MeiMei
43c2b00cf8 Show visibility in note-detail (#3308) 
* Show visibility in note-detail

* fix
 2018-11-18 22:47:21 +09:00
Zero King
80fdfe54c4 Add faUserClock icon for follow requests (#3303) 2018-11-18 01:10:57 +09:00
MeiMei
7fcbe87591 Improve relative time detection (#3302) 2018-11-17 20:57:23 +09:00
MeiMei
e401ba9e25 Update visibility text (#3299) 2018-11-17 18:21:05 +09:00
MeiMei
35db61f1b4 To able to store local only visibilities (#3298) 2018-11-17 13:21:40 +09:00
MeiMei
0bf54b3ff6 Renote visibility (#3290) 2018-11-17 03:25:48 +09:00
MeiMei
db657c2a62 Hide unused login method (#3285) 2018-11-17 02:13:01 +09:00
nico
01964f3926 Add missing Robot icon (used on user profiles) (#3284) 2018-11-17 01:55:37 +09:00
nico
bfd6bb0fda Add missing Map Marker icon (used on user profiles) (#3283) 2018-11-17 01:50:39 +09:00
Aya Morisawa
3fc70996e2 Change math syntax (#3280) 2018-11-17 00:31:49 +09:00
Aya Morisawa
57d80932a4 Add an optional setting to remain deleted note (#3271) 
Co-authored-by: Aya Morisawa <AyaMorisawa4869@gmail.com>
Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
 2018-11-16 23:13:37 +09:00
syuilo
8569970fbe
Update github-bot.ts 2018-11-16 23:10:48 +09:00
syuilo
713e9ad5f4
Resolve #3274 2018-11-16 23:09:33 +09:00
syuilo
59e229d962
Update github-bot.ts 2018-11-16 23:02:01 +09:00
syuilo
3c5f09cda2
Clean up 2018-11-16 23:01:14 +09:00
syuilo
e42aa2530d
Update github-bot.ts 
follow dvelop instead master
 2018-11-16 23:00:34 +09:00
syuilo
27e458f884
Do not use camelCase in html 2018-11-16 22:32:06 +09:00
syuilo
831e8f8583
Refactoring 2018-11-16 22:31:28 +09:00
syuilo
0ff390ed80
[MFM] Improve various parsing 
Resolve #2779
Resolve #3053
 2018-11-16 21:57:19 +09:00
syuilo
e3b8495431
[MFM] Better URL parsing 2018-11-16 21:30:01 +09:00
syuilo
da10ba3fea
[Client] Add missing icon 
Resolve #3267
 2018-11-16 18:34:52 +09:00
syuilo
cc7de853b4
[Client] Wrap formula component to split code 2018-11-16 18:31:25 +09:00
syuilo
23d8235197
Revert "[Client] Load katex async to reduce bundle size" 
This reverts commit 37e3d60ade.
 2018-11-16 18:26:19 +09:00
syuilo
37e3d60ade
[Client] Load katex async to reduce bundle size 2018-11-16 18:22:44 +09:00
syuilo
83a3426dd5
Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-11-16 17:56:08 +09:00
syuilo
a2549192ca
Update misskey-flavored-markdown.ts 2018-11-16 17:55:48 +09:00
Aya Morisawa
9d3a1cab6e Fix #3224 (#3265) 2018-11-16 17:41:52 +09:00
Aya Morisawa
06f8d8f0a3 Show server version on server.info.vue (#3264) 2018-11-16 17:24:03 +09:00
MeiMei
fa66b79e2d Update the locale when version or language changed (#3263) 2018-11-16 17:13:22 +09:00
Aya Morisawa
81312f5a93 Remove a trailing whitespace (#3261) 2018-11-16 17:04:28 +09:00
Aya Morisawa
ad84901f39 Support math rendering on MFM (#3260) 2018-11-16 17:03:52 +09:00
MeiMei
d2385a0e52 Do not show duplicate url-preview (#3259) 2018-11-16 16:35:13 +09:00
syuilo
6e491c1466
Refactoring 2018-11-16 05:53:17 +09:00
MeiMei
bceb02d760 local only visibility (#3254) 
* local only visibility

* fix UI
 2018-11-16 05:47:29 +09:00
syuilo
aaaaf2681a
[Client] Add missing icon 2018-11-16 05:38:16 +09:00
syuilo
3c3ef9bba0
[Client] ✌️ 2018-11-16 05:36:52 +09:00
syuilo
a86ae9fa50
Better UX 2018-11-16 05:26:36 +09:00
syuilo
a3c4e8a1bc
[Client] Improve admin dashboard 2018-11-16 05:21:52 +09:00
syuilo
672b7a4c3d
🎨 2018-11-16 05:07:59 +09:00
MeiMei
bf3fee4481 Check the port is configured (#3251) 2018-11-16 03:25:35 +09:00
Aya Morisawa
766cae2299 Check Node.js version (#3245) 
* Check Node.js version

* Fix bug
 2018-11-15 22:17:06 +09:00
syuilo
4114ce4a04
[Client] Split some components to improve performance 2018-11-15 22:04:12 +09:00
Acid Chicken (硫酸鶏)
9d8f7b081d WIP: Add Discord auth (#3239) 
* Add Discord auth

* Apply review 175263424
 2018-11-15 19:15:04 +09:00
syuilo
2c2cd893b8
🎨 2018-11-15 07:03:46 +09:00
syuilo
93e95f56f4
Update src/client/app/admin/views/index.vue 2018-11-15 06:39:59 +09:00
syuilo
cd018db945
Update src/client/app/admin/views/index.vue 2018-11-15 06:23:40 +09:00
syuilo
50fe67b99b
[Client] Improve admin panel 2018-11-15 06:21:31 +09:00
syuilo
1dba82aae5
[API] Add /instances 2018-11-15 06:21:13 +09:00
syuilo
17c6d64750
[Client] Prevent cache locale file 2018-11-15 05:20:25 +09:00
syuilo
b4c04efa23
Improve usability 2018-11-15 05:00:30 +09:00
syuilo
0985f7f609
[Client] Fix bugs 2018-11-15 04:24:40 +09:00
syuilo
56d571c0f0
Moderator system 
Closes #2357
 2018-11-15 04:15:42 +09:00
syuilo
dc9a19b9c7
[Client] Add missing icon 2018-11-15 03:17:48 +09:00
syuilo
88a2c7715a
[Client] Add missing icon 2018-11-15 03:14:52 +09:00
syuilo
5f8a66fdb9
🎨 2018-11-15 01:45:13 +09:00
syuilo
57320a94f9
[Client] Add missing icon 2018-11-15 01:43:26 +09:00
syuilo
89f045d624
🎨 2018-11-15 01:43:06 +09:00
syuilo
1a77dea7ed
[Client] Fix icon 2018-11-15 01:09:50 +09:00
syuilo
d063d59a91
[Client] Improve UI 2018-11-15 00:01:49 +09:00
syuilo
7a2ef04ec3
[Client] Improve UI 2018-11-14 20:36:15 +09:00
syuilo
0a05a2d060
🎨 2018-11-14 20:23:51 +09:00
syuilo
a7e2ee3b0c
Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-11-14 20:21:45 +09:00
syuilo
40efa90dd5
🎨 2018-11-14 20:21:35 +09:00
MeiMei
4ca0a22bfc Fix: default order of users/notes (#3234) 2018-11-14 20:18:47 +09:00
syuilo
20a943b193
🎨 2018-11-14 20:17:12 +09:00
syuilo
552df8737d
[Client] Add missing icon 2018-11-14 18:07:38 +09:00
syuilo
e76bf5707a
[Client] Fix icons 2018-11-14 18:03:38 +09:00
syuilo
bf37a72f59
🎨 2018-11-14 18:00:23 +09:00
syuilo
840ad75830
[Client] Better thumbnail generation 2018-11-14 18:00:15 +09:00
syuilo
46a51addad
ServiceWorkerはメンテナンスされていないのでとりあえず無効化 2018-11-14 16:39:04 +09:00
Acid Chicken (硫酸鶏)
00bb403497 Fix #3228 (#3230) 
* Update index.ts

* fix sw.js path

* Revert "Update index.ts"

This reverts commit e0b1d4239f16b65512f5dbdd93c8765f708b5282.
 2018-11-14 16:35:00 +09:00
syuilo
11afa8140c
[Client] Improve alert component 2018-11-14 16:30:58 +09:00
syuilo
850396e9da
[Client] Add missing icons 2018-11-14 14:57:59 +09:00
syuilo
5ee75be49e
🎨 2018-11-14 14:47:18 +09:00
syuilo
e509b1f488 Update github-bot.ts 2018-11-14 05:33:48 +09:00
syuilo
df23504ccf
[Client] Fix #3227 2018-11-14 03:05:13 +09:00
syuilo
66e3cb8eda
Update src/client/app/init.ts 2018-11-14 02:04:24 +09:00
syuilo
6ddd2389dc
[Client] Add missing icons 2018-11-14 01:45:15 +09:00
syuilo
402efb8c50
[Client] Fix imports 2018-11-14 01:40:29 +09:00
syuilo
7b6eae0ce4
Fix error 2018-11-14 01:32:38 +09:00
syuilo
26ce9725ce
[Client] Fix #3009 2018-11-14 01:31:36 +09:00
syuilo
cc81d41a05
[Client] Some optimizations 2018-11-13 23:33:30 +09:00
syuilo
a63ec05e41
[Client] Some optimizations 2018-11-13 23:06:31 +09:00
syuilo
0dcb527bf3
[Client] Fix bug 2018-11-13 22:45:28 +09:00
syuilo
54710f17fc
[Client] Some performance optimizations 2018-11-13 22:43:09 +09:00
syuilo
e58a6593c0
[Client] Fix bug 2018-11-13 22:42:31 +09:00
syuilo
62132570e1
[Client] Split components to reduce bundle size 2018-11-13 20:21:52 +09:00
MeiMei
9f0b8ba2f8 Fix: notes/create hangs when rejected (#3221) 2018-11-13 19:34:09 +09:00
syuilo
7896242f57
[Client] Fix #3213 2018-11-13 16:19:46 +09:00
syuilo
4a6722b9e9
Merge branch 'master' into develop 2018-11-13 15:01:52 +09:00
syuilo
7c9fb5228b
Improve usability 2018-11-13 15:01:05 +09:00
MeiMei
81805b01cc sort user timeline by date (#3210) 2018-11-13 01:17:59 +09:00
syuilo
6f2953f3a7
[Client] Clear cached locale data when shouldFlush is true 2018-11-13 01:11:36 +09:00
syuilo
dd3f007582
[Client] Improve post-form widget 2018-11-13 01:04:15 +09:00
syuilo
a4b2b093fc
🎨 2018-11-13 00:21:49 +09:00
syuilo
0fbf56219f
[Client] Emoji picker 
Closes #3130
 2018-11-13 00:12:55 +09:00
syuilo
c84500d914
Clean up 2018-11-12 06:12:22 +09:00
syuilo
33e79e4bb8
[Client] Split some components to reduce bundle size 2018-11-12 05:35:09 +09:00
syuilo
fab389e624
[Client] Stop generate scripts for each languages 
Resolve #3172
 2018-11-12 05:03:12 +09:00
syuilo
b1b02d0e32
[Client] Enable code splitting 
And some optimizations
 2018-11-12 04:09:02 +09:00
syuilo
0b40194d31
🎨 2018-11-12 01:20:26 +09:00
syuilo
c2038bec73
Improve streaming 2018-11-12 00:31:09 +09:00
syuilo
2dff48167c
🎨 2018-11-11 21:18:24 +09:00
syuilo
71d42f64dc
[Client] Implement word mute 
Closes #1739
 2018-11-11 21:17:51 +09:00
syuilo
1b4072610a
[Client] Fix i18n 2018-11-11 19:15:08 +09:00
syuilo
3826a820bb
[Client] Fix i18n 
Closes #3192
 2018-11-11 19:13:10 +09:00
syuilo
72cbab6514
[Clinet] Fix i18n 2018-11-11 19:10:15 +09:00
syuilo
15a2881083
[API] Fix #3203 2018-11-11 18:26:09 +09:00
Aya Morisawa
b62203b1f1 Check MongoDB version (#3185) 
* Check MongoDB version

* Fix bug
 2018-11-11 14:27:00 +09:00
MeiMei
16136c252a fix self host detection (#3201) 2018-11-11 13:11:16 +09:00
syuilo
75864a5125
Fix #3190 2018-11-11 13:08:48 +09:00
syuilo
a59f53e6da
Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-11-11 12:43:52 +09:00
syuilo
2ceaccf9ab
Fix chart engine 2018-11-11 12:43:35 +09:00
MeiMei
036d46c459 show self host in unicode (#3200) 2018-11-11 12:35:30 +09:00
syuilo
5d3d78a73e
Better text 2018-11-11 02:44:54 +09:00
syuilo
6012e98ae6
Improve streaming API 2018-11-11 02:22:34 +09:00
syuilo
9c0e990568
Better chart generation 2018-11-10 23:25:09 +09:00
syuilo
d62c67208f
[Client] Show domain in admin page 2018-11-10 04:28:56 +09:00
syuilo
69eefc1425
[Client] Fix bug 2018-11-10 00:30:58 +09:00
syuilo
27bdb26202
Fix #3187 2018-11-10 00:28:50 +09:00
Aya Morisawa
fa4ea494bf Fix note menu (#3184) 2018-11-09 22:40:17 +09:00
Aya Morisawa
9f32713093 Eliminate mutable variable to construct menu items (#3183) 2018-11-09 22:35:33 +09:00
syuilo
5bcce97ff0
Fix bug 2018-11-09 22:19:43 +09:00
syuilo
825fdb2475
[Client] Fix bug 2018-11-09 22:11:11 +09:00
syuilo
460bb21c1e
Fix bug 2018-11-09 22:02:48 +09:00
syuilo
251cef3129
🎨 2018-11-09 21:46:35 +09:00
syuilo
d81c87af22
[Client] Fix bug 2018-11-09 21:42:36 +09:00
syuilo
cf0b7e26b5
Remove duplicated option 2018-11-09 21:30:12 +09:00
syuilo
3a1c3f9656
[Client] Fix bug 2018-11-09 21:27:27 +09:00
Aya Morisawa
035bdd0279 Add showVia option (#3182) 
* Resolve #3160

* Fix bug

* Fix bug
 2018-11-09 21:10:21 +09:00
syuilo
ac8817ef34
[Client] Fix bug 2018-11-09 18:38:10 +09:00
syuilo
372db65604
[Client] Fix i18n 2018-11-09 18:34:32 +09:00
syuilo
4a92635eae
🎨 2018-11-09 18:32:09 +09:00
syuilo
5e140d9a11
🎨 2018-11-09 18:25:30 +09:00
syuilo
0b53ef9bae
[Client] Fix bug 2018-11-09 18:25:21 +09:00
syuilo
3f79c9ae49
Refactor client (#3178) 
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip
 2018-11-09 16:00:29 +09:00
syuilo
5d882dc3df
[Client] Fix bug 2018-11-09 14:19:30 +09:00
syuilo
5b4205bdbc
Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-11-09 14:15:52 +09:00
syuilo
20cf2b3f77
[Client] Fix i18n 2018-11-09 14:15:29 +09:00
Aya Morisawa
3c0d2db3bc
Rename: setDifference -> difference (#3177) 
* Improve setDifference

* Rename: setDifference -> difference
 2018-11-09 14:14:53 +09:00
syuilo
9aa65fb600
[Client] Fix bug 2018-11-09 14:13:40 +09:00
syuilo
4dcb15ef0d
[Client] Fix bug 2018-11-09 14:10:50 +09:00
syuilo
ae6293cb6b
[Client] Improve usability 2018-11-09 14:10:23 +09:00
syuilo
2614771a7c
🎨 2018-11-09 13:54:00 +09:00
syuilo
ba2ebfad4f
[Client] Fix error 2018-11-09 13:53:44 +09:00
syuilo
51ba738c4b
Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-11-09 13:47:28 +09:00
syuilo
c8081ed353
Fix i18n 2018-11-09 13:47:22 +09:00
Aya Morisawa
500fc47618 Add group function (#3175) 2018-11-09 13:03:46 +09:00
Aya Morisawa
276edd7cc2 Use sum function (#3174) 2018-11-09 11:02:23 +09:00
Aya Morisawa
a9436306ab Fix #3170 (#3173) 2018-11-09 11:01:55 +09:00
MeiMei
5b684c6deb On remote notes, not use content for detecting mentions (#3170) 
* On remote note, detect mentioned users from to/cc

* fix
 2018-11-09 08:44:19 +09:00
syuilo
5ef8a8b5f0
[Client] Fix #3168 2018-11-09 08:41:06 +09:00
syuilo
10fa824f95
[Client] Fix #2759 2018-11-09 08:31:05 +09:00
syuilo
fccbecf159
[Client] Fix bug 2018-11-09 08:26:32 +09:00
syuilo
60ef3e3563
Refactor & Clean up 2018-11-09 08:13:34 +09:00
syuilo
f05a688ac2
[API] Fix #3169 2018-11-09 03:52:03 +09:00
syuilo
25a69ec1b6
Refactoring of i18n (#3165) 
Refactoring of i18n
 2018-11-09 03:44:35 +09:00
syuilo
f052d8912b
wip: フォロー/フォロワーページ (#3157) 
フォロー/フォロワーページ
 2018-11-08 15:16:39 +09:00
Xeltica
6c95120023 via の表示を改善 (#3161) 2018-11-08 13:54:59 +09:00
syuilo
24766fb79e
🎨 2018-11-08 11:20:50 +09:00
syuilo
3261d54cd3
Resolve #2320 2018-11-08 02:09:15 +09:00
syuilo
e0ec56abb5
Fix bug 2018-11-08 01:42:02 +09:00
syuilo
1056a7167d
[Client] Improve usabiliy 2018-11-07 23:04:59 +09:00
syuilo
4c81e400c4
[MFM] Fix title parsing 2018-11-07 21:17:27 +09:00
syuilo
d5408c429b
Fix bug 2018-11-07 20:59:40 +09:00
syuilo
a8d05cba5a
Fix #3149 2018-11-07 19:43:21 +09:00
syuilo
cb6f390fb6
GitHub / Twitter連携の設定をDBに保存するように 2018-11-07 13:14:52 +09:00
syuilo
5675ecead9
Fix 2018-11-07 12:30:56 +09:00
syuilo
001bb7bbcd
インスタンスの対象言語の設定を実装 2018-11-07 12:28:53 +09:00
syuilo
1585bb12cf
🎨 2018-11-07 12:17:57 +09:00
syuilo
26b47c18fd
[Client] Fix #2737 2018-11-07 12:15:28 +09:00
syuilo
665fa7f2aa
[API] Improve drive/files/upload_from_url 2018-11-07 12:12:43 +09:00
syuilo
8f39655fef
Fix bug 2018-11-07 12:09:24 +09:00
syuilo
b72d15b56c
[Client] Improve usability 2018-11-07 03:48:58 +09:00
syuilo
06b66f0209
メンテナ情報をDBに保存するように 2018-11-07 01:12:26 +09:00
syuilo
2de48110bb
ghostの設定をDBに保存するように 2018-11-07 00:44:56 +09:00
syuilo
328fc64ca9
🎨 2018-11-07 00:16:08 +09:00
syuilo
a6f8327aa2
reCAPTCHAの設定をDBに保存するように 2018-11-07 00:08:21 +09:00
syuilo
ffdd0b7de7
[API] 文字列での真理値表現に対応 
multipart/formdata では文字列しか送れないっぽい？
 2018-11-06 20:53:50 +09:00
syuilo
438563b505
[API] Fix bug 2018-11-06 20:47:56 +09:00
syuilo
92dfcdad57
Fix #3141 2018-11-06 20:47:07 +09:00
syuilo
260e4c955d
🎨 2018-11-06 15:51:18 +09:00
syuilo
0c46f5ce70
Clean up 2018-11-06 15:51:05 +09:00
syuilo
6d67cd07a0
[Client] Use dynamic import to reduce bundle size 2018-11-06 15:37:41 +09:00
syuilo
fb8af53751
[Client] Improve usability & Refactoring 2018-11-06 15:08:22 +09:00
syuilo
37999f4af7
[API] Implement notes/watching/ 2018-11-06 14:58:20 +09:00
MeiMei
3b6ab327c1 Twemojiで合字に対応 (#3140) 
* Twemojiで合字に対応

* split emoji regex
 2018-11-06 14:09:40 +09:00
syuilo
cf36106520
🎨 2018-11-06 08:04:34 +09:00
syuilo
1642fbec31
[Client] カスタム絵文字サジェストの結果をアルファベット順にソートするように 2018-11-06 08:02:19 +09:00
syuilo
b195fd8145
🎨 2018-11-06 07:57:16 +09:00
MeiMei
5f59b980a7 Fix: download file (#3138) 
* Fix: url download

* not explicitly close on end

* resolve on stream finish

* remove unnecessary code

* reject on file error
 2018-11-06 07:53:03 +09:00
syuilo
2a5c19cd01
リモートのファイルをキャッシュするかどうかの設定をDBに保存するように 2018-11-06 07:52:13 +09:00
syuilo
42e007ddb7
🎨 2018-11-06 07:28:49 +09:00
syuilo
756dc397d9
🎨 2018-11-06 07:22:39 +09:00
syuilo
8f714b5b12
ドライブ容量の設定をDBに保存するようにしたりリファクタリングしたり 2018-11-06 07:14:43 +09:00
syuilo
06bb2a1c7c
Clean up 2018-11-06 06:25:35 +09:00
syuilo
ac50bb9225
Resolve #3137 2018-11-06 06:24:31 +09:00
syuilo
5e0f2a5b06
[Client] Fix bug 2018-11-06 04:10:30 +09:00
syuilo
af32d1f81e
[Client] Fix bug 2018-11-06 04:01:22 +09:00
syuilo
67d8773e38
[Client] Fix bug 2018-11-06 03:59:58 +09:00
syuilo
e445d39c2f
[Client] Use v-if instaed of v-show 2018-11-06 03:59:02 +09:00
syuilo
961ed969db
メッセージでのカスタム絵文字対応 2018-11-06 03:57:02 +09:00
syuilo
e9a3495225
Resolve #3132 2018-11-06 03:48:23 +09:00
Aya Morisawa
6c5a78aeb2 Fix #3133 (#3134) 2018-11-06 03:31:16 +09:00
syuilo
6d8ea89f09
Resolve #3126 2018-11-06 02:05:16 +09:00
syuilo
64f89ba13e
Better error code 2018-11-06 01:57:31 +09:00
syuilo
1235bef038
[API] Fix bug 2018-11-06 01:51:42 +09:00
syuilo
2e11f3a843
Clean up 2018-11-06 01:49:35 +09:00
syuilo
84b7e0bb7d
🎨 2018-11-06 01:48:33 +09:00
syuilo
9f5dc2c0df
[WIP] Use FontAwesome Component for Vue (#3127) 
* wip

* Rename

* Clean up

* Clean up

* wip

* wip

* Enable tree shaking

* ✌️

* ✌️

* wip

* wip

* Clean up
 2018-11-06 01:40:11 +09:00
syuilo
e640dbc501
🎨 2018-11-05 22:45:45 +09:00
syuilo
85db090d9f
🎨 2018-11-05 22:42:08 +09:00
syuilo
0c98a90b75
[Client] カスタム絵文字にホバーしたときに拡大するエフェクトを追加 2018-11-05 21:04:19 +09:00