graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-09-20 07:22:00 +03:00
Code Issues Packages Projects Releases Wiki Activity
12609 commits 62 branches 916 tags 154 MiB
Commit graph

5057 commits

Author SHA1 Message Date
syuilo fc05540404
Fix bug? 2018-12-09 23:12:08 +09:00
syuilo 1c589c7c18
Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-12-09 23:10:06 +09:00
syuilo 284df27435
Use camelCase 2018-12-09 23:10:02 +09:00
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