Commit graph

17846 commits

Author SHA1 Message Date
syuilo
0353a7f617 Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2020-03-22 09:43:32 +09:00
syuilo
535f37e168 🎨 2020-03-22 09:43:19 +09:00
MeiMei
9ccca14325 CI通らないの修正 (#6173)
* CI通らないの修正

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

This reverts commit 3eab7eab90050d60f0222ac0d08da7be0a53c300.

* ts-ignore

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

* 言語ファイルを更新

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

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

This reverts commit f23f7f8d784b28f3d365c8f5aecf81001577c672.

* リプライとリノートも復元する
2020-03-21 18:58:05 +09:00
syuilo
3c2245e1ec 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
7b7d5d749c Merge branch 'develop' 2020-03-21 13:36:41 +09:00
syuilo
853897a12f 12.22.0 2020-03-21 13:36:21 +09:00
syuilo
5f6110d6da Fix bug 2020-03-21 13:21:32 +09:00
syuilo
ef547887c1 🎨 2020-03-21 13:19:42 +09:00
syuilo
821692818e Fix bug 2020-03-21 13:10:44 +09:00
syuilo
1afa8e3aaf リモートユーザーでも投稿数とか見れるように 2020-03-21 13:07:15 +09:00
syuilo
c3a3c04355 Resolve #6145 2020-03-21 13:07:02 +09:00
syuilo
c521685f3b Resolve #6110 2020-03-21 12:48:25 +09:00
syuilo
f8d68f72e3 wip 2020-03-21 12:32:40 +09:00
syuilo
4e4fb29bc4 wip 2020-03-21 00:21:33 +09:00
syuilo
f18c2e45df wip 2020-03-20 23:08:45 +09:00
syuilo
9f6b6d211c wip 2020-03-20 22:42:35 +09:00
syuilo
500518348b wip 2020-03-20 22:37:44 +09:00
syuilo
3d40b7e822 wip 2020-03-20 21:58:04 +09:00
syuilo
20775f7b73 wip 2020-03-20 19:19:28 +09:00
syuilo
b27e74c25f wip 2020-03-20 19:06:50 +09:00
syuilo
5763fe412c wip 2020-03-20 18:58:17 +09:00
syuilo
2dcd3f415b wip 2020-03-20 18:55:15 +09:00
syuilo
ea5c02bcd4 wip 2020-03-20 18:11:39 +09:00
syuilo
737f963d3d Fix bug 2020-03-20 18:00:42 +09:00
Oni-Men
3374312818 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
a919a61b2f ElasticSearchで認証ができるように (#6158) 2020-03-20 14:00:34 +09:00
Oni-Men
d456425b81 use username if name was empty (#6166) 2020-03-20 13:57:55 +09:00
MeiMei
1b694f1e0c 連携ログインができないのなどを修正 (#6162)
* 連携ログインができないのを修正

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

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

* 2回目以降Discordログインできなくなるのを修正
2020-03-20 13:56:22 +09:00
MeiMei
7eb0fd0c49 Revert "Update dependencies (#6167)" (#6168)
This reverts commit 0420c548dade2c5b00353b4a5f20606667fc4253.
2020-03-20 02:46:13 +09:00
MeiMei
61b83fa572 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 (硫酸鶏)
79b90cb5ad Merge pull request #6165 from syuilo/patch/autogen/v11
[AUTOMATED] Update README.md
2020-03-19 12:54:00 +09:00
Acid Chicken (硫酸鶏)
ef2b99adb7 Update README.md [AUTOGEN] 2020-03-18 03:57:08 +09:00
Yuiga Wada
c89a10b40e Auth認証画面から正常にログインできるよう修正 (#6154)
* Fix #6095

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

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

* 表記揺れ

* more simply

* S3ならばs3ForcePathStyleしない
2020-03-14 11:33:19 +09:00
tamaina
b71662b08d fix gif badge (#6153) 2020-03-14 11:31:03 +09:00
syuilo
f401ebe7c1 Update test 2020-03-07 11:25:39 +09:00
syuilo
755a9e2ea7 wip #6140 2020-03-07 11:23:31 +09:00
syuilo
6ae9c83fa1 Refactor: Better arg name 2020-03-07 09:56:13 +09:00
syuilo
a681e5044d Add test 2020-03-07 01:10:13 +09:00
syuilo
3593015993 Resolve #6137 2020-03-07 01:04:36 +09:00
syuilo
598789e5a5 Refactor 2020-03-07 00:35:00 +09:00
Oni-Men
326abb4672 note overflow: hidden (#6138) 2020-03-07 00:31:48 +09:00
syuilo
ad267d2ce0 Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2020-03-07 00:29:27 +09:00