mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-15 15:18:22 +09:00
Code
12,854 Commits 30 Branches 126 Tags 136 MiB
51b915428e
Commit Graph

5154 Commits

Author SHA1 Message Date
Acid Chicken (硫酸鶏)
cd80e02ebf Re: #3556 (#3568) 
* Update index.ts

* Update index.ts
 2018-12-09 18:39:13 +09:00
MeiMei
dffcefb81f Fix mobile following/followed list (#3574) 2018-12-09 16:00:32 +09:00
MeiMei
7e1cad3e12 Improve tags settings (#3569) 2018-12-09 14:24:24 +09:00
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