Commit graph

5084 commits

Author SHA1 Message Date
和風ドレッシング
a78eebc43f ていねい (#3608)
「古い」という表現でキレる方もいるので、丁寧な言葉づかいに変更
2018-12-13 09:42:14 +09:00
Acid Chicken (硫酸鶏)
7fe937026b Update html.ts (#3603) 2018-12-13 01:33:18 +09:00
syuilo
656cec65b9
Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-12-13 01:18:29 +09:00
syuilo
8045bbff1c
🎨 2018-12-13 01:18:17 +09:00
MeiMei
c1a7a21746 Hide unavailable integration settings (#3604) 2018-12-12 23:21:02 +09:00
Acid Chicken (硫酸鶏)
f3ee63fcbe
Update url-preview.vue (#3602) 2018-12-12 21:19:52 +09:00
MeiMei
7645c212a3
No @ for account name (#3586)
* No @ for account name

* Use @ for GitHub
2018-12-12 17:33:08 +09:00
syuilo
709290d2da
Improve mention display 2018-12-12 13:06:05 +09:00
syuilo
eb3180f3b6
Fix bug 2018-12-12 13:05:37 +09:00
MeiMei
79ff5888fd Fix htmlToMfm (#3600) 2018-12-12 11:47:07 +09:00
MeiMei
9ee9cf8d81 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 (硫酸鶏)
ee3c0f6f18
Update settings.2fa.vue (#3593) 2018-12-12 10:07:30 +09:00
MeiMei
df297d0031 Fix fields (#3596) 2018-12-12 02:46:40 +09:00
Acid Chicken (硫酸鶏)
d18d1cb958 Update settings.2fa.vue (#3595) 2018-12-11 23:41:27 +09:00
syuilo
69f246ce7f
Fix bug 2018-12-11 21:17:57 +09:00
syuilo
6a97f0b7f6
[Client] Fix bug 2018-12-11 20:59:25 +09:00
syuilo
d885b872f3
Fix bug 2018-12-11 20:47:07 +09:00
Aya Morisawa
125849673a
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
30c53e9ee0
Fix error 2018-12-11 20:33:52 +09:00
Acid Chicken (硫酸鶏)
08142ead67 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
638d81b66e Show user fields (#3590) 2018-12-11 20:18:12 +09:00
syuilo
bca3c6f8bf
🎨 2018-12-11 04:29:47 +09:00
syuilo
a6dc0f3684
Fix #3325 2018-12-10 23:13:50 +09:00
Aya Morisawa
6120474548 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
121dd86299
[Client] Fix #3396 2018-12-10 12:31:04 +09:00
syuilo
98a2953c9c
Fix bug 2018-12-10 01:44:43 +09:00
Aya Morisawa
6967def6c8
Use primitive type string instead of String (#3578) 2018-12-09 23:26:32 +09:00
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