Commit Graph

5082 Commits

Author SHA1 Message Date
syuilo
6d115fd142 Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-12-13 01:18:29 +09:00
syuilo
1da6abb461 🎨 2018-12-13 01:18:17 +09:00
MeiMei
d22c468e3d Hide unavailable integration settings (#3604) 2018-12-12 23:21:02 +09:00
Acid Chicken (硫酸鶏)
535e37e409 Update url-preview.vue (#3602) 2018-12-12 21:19:52 +09:00
MeiMei
4a22b01ea0 No @ for account name (#3586)
* No @ for account name

* Use @ for GitHub
2018-12-12 17:33:08 +09:00
syuilo
37a492c5b2 Improve mention display 2018-12-12 13:06:05 +09:00
syuilo
334fd6b225 Fix bug 2018-12-12 13:05:37 +09:00
MeiMei
4b729421fe Fix htmlToMfm (#3600) 2018-12-12 11:47:07 +09:00
MeiMei
62859788e7 Fix URL after deleting remote file (#3597)
* Fix URL after deleting remote file

* expired only

* delete space
2018-12-12 11:46:35 +09:00
Acid Chicken (硫酸鶏)
bdace5b18d Update settings.2fa.vue (#3593) 2018-12-12 10:07:30 +09:00
MeiMei
f3983f48ab Fix fields (#3596) 2018-12-12 02:46:40 +09:00
Acid Chicken (硫酸鶏)
2a8172e58d Update settings.2fa.vue (#3595) 2018-12-11 23:41:27 +09:00
syuilo
7bcd445b36 Fix bug 2018-12-11 21:17:57 +09:00
syuilo
dd4ec2b035 [Client] Fix bug 2018-12-11 20:59:25 +09:00
syuilo
edc0ae9eef Fix bug 2018-12-11 20:47:07 +09:00
Aya Morisawa
b954245a4d Use for-of instead of forEach (#3583)
Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2018-12-11 20:36:55 +09:00
syuilo
a9adb00420 Fix error 2018-12-11 20:33:52 +09:00
Acid Chicken (硫酸鶏)
469c773eec Resolve #3581 (#3589)
* Update ja-JP.yml

* Create 404.vue

* Update script.ts

* Update script.ts

* Update script.ts

* Update script.ts

* Update script.ts

* Update script.ts

* Update 404.vue

* Update meta.ts

* Update instance.vue

* Update update-meta.ts
2018-12-11 20:19:13 +09:00
MeiMei
b9ec3795f7 Show user fields (#3590) 2018-12-11 20:18:12 +09:00
syuilo
83b2d06b0a 🎨 2018-12-11 04:29:47 +09:00
syuilo
b908375659 Fix #3325 2018-12-10 23:13:50 +09:00
Aya Morisawa
ac9ea9fafd Use && and || to eliminate if-statement (#3559)
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2018-12-10 17:08:48 +09:00
syuilo
d3ddf1f787 [Client] Fix #3396 2018-12-10 12:31:04 +09:00
syuilo
3bebf7fba1 Fix bug 2018-12-10 01:44:43 +09:00
Aya Morisawa
dd4d30cf09 Use primitive type string instead of String (#3578) 2018-12-09 23:26:32 +09:00
syuilo
5b74f2591b Fix bug? 2018-12-09 23:12:08 +09:00
syuilo
e207c30ce6 Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-12-09 23:10:06 +09:00
syuilo
ab5b39614a Use camelCase 2018-12-09 23:10:02 +09:00
Acid Chicken (硫酸鶏)
f82cede5a9 Re: #3556 (#3568)
* Update index.ts

* Update index.ts
2018-12-09 18:39:13 +09:00
MeiMei
12ad1e9ced Fix mobile following/followed list (#3574) 2018-12-09 16:00:32 +09:00
MeiMei
ea1b5596e2 Improve tags settings (#3569) 2018-12-09 14:24:24 +09:00
syuilo
123c8a8936 🎨 2018-12-09 13:25:46 +09:00
syuilo
3fc3893abc Revert "Eliminate if-statement (#3556)"
This reverts commit fb8b0c291dff0bec2aca85fda34ebff9c8c49b91.
2018-12-09 13:21:42 +09:00
tamaina
7bd67daf07 #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
8d18125cae Eliminate if-statement (#3556) 2018-12-09 13:13:00 +09:00
Aya Morisawa
4635f73fee #2501 (#3560)
* #2501

* Update stream.ts
2018-12-09 13:09:31 +09:00
Aya Morisawa
ae6d63f9ef Refactor getChildrenCount (#3554)
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2018-12-09 09:44:51 +09:00
Aya Morisawa
d81453271a Refactor getTextCount (#3553)
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2018-12-09 09:44:24 +09:00
Aya Morisawa
cc06ef23ff Eliminate if-statement (#3564) 2018-12-09 03:45:47 +09:00
Aya Morisawa
e649ec557b Eliminate duplicated condition on if-statement (#3563) 2018-12-09 03:45:07 +09:00
Aya Morisawa
2b7e219efe Eliminate if-statement (#3562) 2018-12-09 03:44:37 +09:00
Aya Morisawa
e9d519ea9a Eliminate if-statement (#3561)
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2018-12-09 03:43:58 +09:00
Aya Morisawa
8608465864 Use && to eliminate if-statement (#3558) 2018-12-09 03:41:18 +09:00
Aya Morisawa
dece0c2bfb Eliminate if-statement (#3555) 2018-12-09 03:40:40 +09:00
Aya Morisawa
f301e914c8 #2501 2018-12-09 01:05:55 +09:00
MeiMei
07218ce03c Fix follow duplicate (#3548)
* フォローとリクエスト両方存在しても解除する

* 既にフォローしてても承認できるように
2018-12-08 18:55:00 +09:00
tamaina
3b7be81491 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 (硫酸鶏)
8a311c2e6a Update server-stats.ts (#3512) 2018-12-08 10:40:45 +09:00
syuilo
fcc8ec1609 [Client] Improve cw-button 2018-12-08 10:36:26 +09:00
syuilo
3dd5cf4f3b Add comment 2018-12-08 10:20:43 +09:00