1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-27 13:08:19 +09:00
Commit Graph

18372 Commits

Author SHA1 Message Date
syuilo
7b44727b23
Merge branch 'develop' 2019-04-18 22:01:45 +09:00
syuilo
debe648a98
11.2.0 2019-04-18 22:00:53 +09:00
syuilo
fda8cf77ed
Improve warp 2019-04-18 22:00:11 +09:00
syuilo
8aaab195c6
Fix bug 2019-04-18 21:40:36 +09:00
syuilo
4096ddcbd0
Use - 2019-04-18 21:36:44 +09:00
syuilo
ae6cc11ad2
Fix icon 2019-04-18 21:34:56 +09:00
tamaina
dab7e527de Improve user lists index (#4605)
* wip

* Revert "wip"

This reverts commit 6212831ce3bdae5ce17f8ace9945710ba7696185.

* improve list index

* Update user-lists.vue
2019-04-18 21:33:24 +09:00
syuilo
8b92feac71
Resolve #4732 2019-04-18 21:29:19 +09:00
tamaina
4beb3e5755 Fix #4734 (#4745) 2019-04-18 20:46:59 +09:00
syuilo
55f63229cd
Update timemachine.vue 2019-04-18 19:42:40 +09:00
syuilo
7827aeb695
Resolve #4735 2019-04-18 19:40:23 +09:00
syuilo
cce768aaac
Fix API definition 2019-04-18 14:58:43 +09:00
syuilo
80b83c0624
間違えた 2019-04-18 14:41:51 +09:00
syuilo
73b683bb4d
Add test 2019-04-18 14:39:49 +09:00
syuilo
d78a5c0863
Fix #4703 2019-04-18 14:34:47 +09:00
syuilo
683e5b6abe
Add type annotations 2019-04-18 14:29:17 +09:00
MeiMei
653b8f6352 スプラッシュがクリックに反応するように (#4561)
* confirm silence

* Resolve #4554

* Revert "confirm silence"

This reverts commit e1dbdc2bfc0f41c2b308b142c70e9e4573c98cf9.
2019-04-18 03:37:49 +09:00
MeiMei
9ec6afa375 confirm on user menu (#4553) 2019-04-18 03:36:06 +09:00
MeiMei
adff5382ca confirm silence (#4560) 2019-04-18 03:33:51 +09:00
tamaina
704aabd703 Use menu instead of prompt Fix #4540, Fix #342 (#4575)
* Use menu instead prompt

* fix

* https://bit.ly/2U0JuVt

* fix
2019-04-18 03:32:45 +09:00
MeiMei
f7b1ef0690 アンケートウィジットでもMFMを使用するように v11 (#4741)
* MFM in poll

* use mfm
2019-04-18 03:14:04 +09:00
syuilo
929982117f
Merge branch 'develop' 2019-04-18 01:12:21 +09:00
syuilo
56a530d769
11.1.6 2019-04-18 01:12:03 +09:00
syuilo
7ef75fb06b
New Crowdin translations (#4692)
* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Dutch)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Norwegian)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Czech)
2019-04-18 01:11:06 +09:00
かひわし4(バージョン1)
112a72abdf Docker: Back to npm from yarn (#4730)
This commit reverts "Fix Dockerfile #4214" which uses yarn instead of npm.
The cause of the build error is that binding.gyp and src/crypto_key.cc
are missing when installing dependencies.
In other words, yarn did not fix build error.

There is no reason to use yarn, so go back to npm.
2019-04-18 01:09:31 +09:00
syuilo
71813e03ee
Fix bug 2019-04-18 01:05:40 +09:00
syuilo
9b05b6ef28
Improve readability 2019-04-18 00:57:06 +09:00
syuilo
54a87b25b3
Remove unused imports 2019-04-18 00:56:10 +09:00
MeiMei
55e97864bd Fix: v11で未認知ユーザーからActivityが飛んできた場合に処理できない (#4733)
* Fix: inboxに未知のユーザーが来ると処理できない

* こうかな
2019-04-18 00:53:00 +09:00
syuilo
95733c9490
[MFM] Better hashtag parsing 2019-04-18 00:40:56 +09:00
syuilo
e19ae644f1
Fix indent 2019-04-18 00:13:31 +09:00
syuilo
ac4ea25267
Better error handling 2019-04-18 00:09:08 +09:00
syuilo
611e4f34dc
Merge branch 'develop' 2019-04-17 19:37:32 +09:00
syuilo
faf017f333
11.1.5 2019-04-17 19:36:58 +09:00
syuilo
5eec896615
Better avgColor 2019-04-17 17:13:49 +09:00
syuilo
17f35174ea
🎨 2019-04-17 17:01:57 +09:00
syuilo
bf71b31123
Update CONTRIBUTING.md 2019-04-17 16:59:39 +09:00
syuilo
9399a44c82
Fix error 2019-04-17 16:50:50 +09:00
syuilo
c96418806f
Disable sql log 2019-04-17 16:45:31 +09:00
syuilo
7945eddef6
Clean up 2019-04-17 14:39:45 +09:00
syuilo
0ede390fef
Refactor 2019-04-17 14:32:59 +09:00
syuilo
85959a3b9b
Fix #4721 Fix #4722 2019-04-17 14:30:31 +09:00
syuilo
946c3a25b9
Clean up 2019-04-17 07:25:34 +09:00
syuilo
f9d697128a
Update schemas.ts 2019-04-17 04:32:04 +09:00
syuilo
532ef744f4
Merge branch 'develop' 2019-04-17 02:58:09 +09:00
syuilo
27a961814b
11.1.4 2019-04-17 02:57:48 +09:00
syuilo
5a5b65e9bf
Clean up 2019-04-17 02:57:36 +09:00
syuilo
96673ad610
Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2019-04-17 02:51:19 +09:00
syuilo
a9025aea0d
Better response 2019-04-17 02:51:12 +09:00
syuilo
f38ab0b973
Update delete-file.ts 2019-04-17 02:37:37 +09:00