1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-23 02:58:22 +09:00
Commit Graph

17148 Commits

Author SHA1 Message Date
syuilo
e2c0ee66e4 Resolve #6170 2020-03-22 10:39:12 +09:00
syuilo
c6c62f956b 🎨 2020-03-22 09:44:02 +09:00
syuilo
8fa27fea6c Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2020-03-22 09:43:32 +09:00
syuilo
03c56f388c 🎨 2020-03-22 09:43:19 +09:00
MeiMei
4090922e7e
CI通らないの修正 (#6173)
* CI通らないの修正

* Revert "CI通らないの修正"

This reverts commit 3eab7eab90050d60f0222ac0d08da7be0a53c300.

* ts-ignore

* んー
2020-03-22 09:21:21 +09:00
syuilo
8061dedba1 Update collaborators 2020-03-21 23:33:39 +09:00
syuilo
da2112b659 基底テーマ分離 2020-03-21 23:28:17 +09:00
syuilo
ed5386771a 招待コードが発行できない問題を修正 2020-03-21 23:27:54 +09:00
Xeltica
d248828523
Update CHANGELOG.md 2020-03-21 22:32:58 +09:00
syuilo
fc0b86fe19 Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2020-03-21 20:14:41 +09:00
syuilo
346036ec88 Fix #6110
updatedAt が null なユーザーは検索に出てこなくなる副作用あり
2020-03-21 20:14:26 +09:00
Xeltica
a5e1ce0e0b
Add 削除して編集 (#6147)
* Add 削除して編集

* 言語ファイルを更新

* リプライとリノートも復元する

* Revert "リプライとリノートも復元する"

This reverts commit f23f7f8d784b28f3d365c8f5aecf81001577c672.

* リプライとリノートも復元する
2020-03-21 18:58:05 +09:00
syuilo
67b39b1a98
New Crowdin translations (#6062)
* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

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

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

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

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (English)

* 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 (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 (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 (Chinese Simplified)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (French)

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

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

* 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 (French)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (French)
2020-03-21 15:56:07 +09:00
syuilo
6fb7721798 Merge branch 'develop' 2020-03-21 13:36:41 +09:00
syuilo
0018fd469e 12.22.0 2020-03-21 13:36:21 +09:00
syuilo
019f7480e8 Fix bug 2020-03-21 13:21:32 +09:00
syuilo
8e0b088deb 🎨 2020-03-21 13:19:42 +09:00
syuilo
452005381f Fix bug 2020-03-21 13:10:44 +09:00
syuilo
9722ed99a3 リモートユーザーでも投稿数とか見れるように 2020-03-21 13:07:15 +09:00
syuilo
ee6311e83d Resolve #6145 2020-03-21 13:07:02 +09:00
syuilo
1471e52307 Resolve #6110 2020-03-21 12:48:25 +09:00
syuilo
f1fc12d9cc wip 2020-03-21 12:32:40 +09:00
syuilo
ebbc42bebc wip 2020-03-21 00:21:33 +09:00
syuilo
4785ee8c32 wip 2020-03-20 23:08:45 +09:00
syuilo
ab40756c1a wip 2020-03-20 22:42:35 +09:00
syuilo
c88e737a84 wip 2020-03-20 22:37:44 +09:00
syuilo
def5ea7978 wip 2020-03-20 21:58:04 +09:00
syuilo
e69ab45044 wip 2020-03-20 19:19:28 +09:00
syuilo
25d0b4bbf1 wip 2020-03-20 19:06:50 +09:00
syuilo
f86f5ac6cc wip 2020-03-20 18:58:17 +09:00
syuilo
07ce365bfd wip 2020-03-20 18:55:15 +09:00
syuilo
f31c94e2ea wip 2020-03-20 18:11:39 +09:00
syuilo
933638d035 Fix bug 2020-03-20 18:00:42 +09:00
Oni-Men
b0151afa9a
Add range component, 音量設定で使用する (#6146)
* add range component, use range component at volume setting

* refactor

* refactor 2

* Update range.vue

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2020-03-20 14:30:37 +09:00
MeiMei
5bbd4ae703
ElasticSearchで認証ができるように (#6158) 2020-03-20 14:00:34 +09:00
Oni-Men
f2f7f532a0
use username if name was empty (#6166) 2020-03-20 13:57:55 +09:00
MeiMei
80eedf7449
連携ログインができないのなどを修正 (#6162)
* 連携ログインができないのを修正

* Cookie名変更, セッションに

* igiはやっぱり非セッションCookieで

* 2回目以降Discordログインできなくなるのを修正
2020-03-20 13:56:22 +09:00
MeiMei
1b48e0d6e0
Revert "Update dependencies (#6167)" (#6168)
This reverts commit 0420c548da.
2020-03-20 02:46:13 +09:00
MeiMei
0420c548da
Update dependencies (#6167)
* Update CI (#11)

* Update nodejs.yml

* Fix time

* no docker

* no CI

* build only

* Update dependencies
2020-03-20 02:40:35 +09:00
Acid Chicken (硫酸鶏)
6e98b75d13
Merge pull request #6165 from syuilo/patch/autogen/v11
[AUTOMATED] Update README.md
2020-03-19 12:54:00 +09:00
Acid Chicken (硫酸鶏)
e772cb00d1 Update README.md [AUTOGEN] 2020-03-18 03:57:08 +09:00
Yuiga Wada
b5d5275e9b
Auth認証画面から正常にログインできるよう修正 (#6154)
* Fix #6095

Auth認証画面から正常にログインできるよう修正

* Fix #6095
2020-03-14 15:59:02 +09:00
MeiMei
a2d3d22b6e
オブジェクトストレージでS3のvirtual-host形式のサポートなど (#6148)
* オブジェクトストレージでS3のvirtual-host形式のサポートなど

* 表記揺れ

* more simply

* S3ならばs3ForcePathStyleしない
2020-03-14 11:33:19 +09:00
tamaina
1ad8603cc2
fix gif badge (#6153) 2020-03-14 11:31:03 +09:00
syuilo
aeaf535ea2 Update test 2020-03-07 11:25:39 +09:00
syuilo
917726fecc wip #6140 2020-03-07 11:23:31 +09:00
syuilo
49a5b4eb14 Refactor: Better arg name 2020-03-07 09:56:13 +09:00
syuilo
8946f3ea18 Add test 2020-03-07 01:10:13 +09:00
syuilo
1947835c51 Resolve #6137 2020-03-07 01:04:36 +09:00
syuilo
c7c537c8b8 Refactor 2020-03-07 00:35:00 +09:00