Squashed commit of the following:

mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-27 08:53:08 +02:00

commit 3658f19d98
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Apr 23 19:54:09 2022 +0900

    12.110.1

commit e213c2e844
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Apr 16 13:31:12 2022 +0900

    remove unused locale

commit dd86397e85
Author: xianon <xianon@hotmail.co.jp>
Date:   Tue Apr 19 22:59:39 2022 +0900

    fix: アンテナ、クリップ、リストの表示を速くする (#8518)

    * アンテナノートを取得するクエリがタイムアウトしないように速くする

    * テーブル名を直接指定しないようにする

    * クリップの取得を速くする

    * リストの取得を速くする

commit 6d33b366f8
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sun Apr 17 21:18:18 2022 +0900

    fix ogp rendering and refactor

commit 33c22b5f3e
Merge: 090f8eff6 16c7ef41f
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Mon Apr 11 23:13:18 2022 +0900

    Merge branch 'develop'

commit 090f8eff67
Merge: 5abe05d57 395fe7eb4
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sun Apr 3 14:01:19 2022 +0900

    Merge branch 'develop'

commit 5abe05d572
Merge: 2375359d1 7722fc4d3
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Apr 2 16:56:35 2022 +0900

    Merge branch 'develop'

commit 2375359d12
Merge: 2cd2d6522 68d462b30
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Apr 2 15:34:03 2022 +0900

    Merge branch 'develop'

commit 2cd2d6522e
Merge: 6fc35868f b81b66912
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Mar 12 19:35:17 2022 +0900

    Merge branch 'develop'

commit 6fc35868ff
Merge: 6e7e11e06 6cd3ff584
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Wed Mar 9 23:04:16 2022 +0900

    Merge branch 'develop'

commit 6e7e11e061
Merge: 0589171ce 8d568d533
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Feb 12 17:36:42 2022 +0900

    Merge branch 'develop'

commit 0589171ceb
Merge: eef8f63dc 3cf9c3097
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Fri Feb 11 22:17:17 2022 +0900

    Merge branch 'develop'

commit eef8f63dc6
Merge: 32500faf6 de6e3d64b
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Fri Feb 11 21:40:15 2022 +0900

    Merge branch 'develop'

commit 32500faf6d
Merge: 1ce8da66c fd5a30482
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Fri Feb 11 19:47:41 2022 +0900

    Merge branch 'develop'

commit 1ce8da66c2
Merge: 08da5e9e0 c07e4c347
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Fri Feb 11 17:58:04 2022 +0900

    Merge branch 'develop'

commit 08da5e9e0d
Merge: 5f985ee83 25cac3307
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Wed Feb 9 21:44:39 2022 +0900

    Merge branch 'develop'

commit 5f985ee832
Merge: 1fd6c9753 419072059
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Wed Feb 9 14:50:38 2022 +0900

    Merge branch 'develop'

commit 1fd6c97532
Merge: 9c2f5ee04 74cef67e9
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Wed Feb 2 01:33:18 2022 +0900

    Merge branch 'develop'

commit 9c2f5ee041
Merge: 97885d3de c6a15024f
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Wed Feb 2 00:40:00 2022 +0900

    Merge branch 'develop'

commit 97885d3def
Merge: 5f5f68cdc 990fef599
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Thu Jan 27 18:00:32 2022 +0900

    Merge branch 'develop'

commit 5f5f68cdcd
Merge: af6d52e4c 40b7230bd
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Thu Jan 27 00:17:13 2022 +0900

    Merge branch 'develop'

commit af6d52e4c8
Merge: 621fc5a71 99eb919f4
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Wed Dec 29 17:25:24 2021 +0900

    Merge branch 'develop'

commit 621fc5a715
Merge: 1b956af85 b14e347da
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Wed Dec 29 13:42:15 2021 +0900

    Merge branch 'develop'

commit 1b956af855
Merge: 80c88e13f a3dceee7c
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Dec 18 20:59:16 2021 +0900

    Merge branch 'develop'

commit 80c88e13ff
Merge: ad9e6a4ec 35cd9e621
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Fri Dec 17 19:43:00 2021 +0900

    Merge branch 'develop'

commit ad9e6a4ec5
Merge: 504f18244 ac8243501
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Fri Dec 17 16:18:29 2021 +0900

    Merge branch 'develop'

commit 504f182448
Merge: fd5999378 cf5fe2d10
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Tue Dec 14 23:28:29 2021 +0900

    Merge branch 'develop'

commit fd5999378b
Merge: 8451436cb 1894df882
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Tue Dec 14 23:13:41 2021 +0900

    Merge branch 'develop'

commit 8451436cb8
Merge: 37628953c 6319dd1bf
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Tue Dec 14 23:03:56 2021 +0900

    Merge branch 'develop'

commit 37628953c5
Merge: 83a77f106 13288e1ed
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Tue Dec 14 22:38:31 2021 +0900

    Merge branch 'develop'

commit 83a77f1064
Merge: 99640a35a 75c087b79
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Fri Dec 3 22:30:10 2021 +0900

    Merge branch 'develop'

commit 99640a35a3
Merge: 88cdbc2ad 24681bbe1
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Fri Nov 19 20:41:40 2021 +0900

    Merge branch 'develop'

commit 88cdbc2ad6
Merge: db10103d8 a0c6ae2cb
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Fri Nov 19 20:39:59 2021 +0900

    Merge branch 'develop'

commit db10103d8e
Merge: 2795fe457 7f5299cf4
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Nov 13 17:08:15 2021 +0900

    Merge branch 'develop'

commit 2795fe4579
Merge: 54631026d 4ab773eb9
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Nov 13 12:23:49 2021 +0900

    Merge branch 'develop'

commit 54631026de
Merge: 80783199a 944250f7f
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sun Oct 31 20:21:50 2021 +0900

    Merge branch 'develop'

commit 80783199a9
Merge: 6d557269c f418eaecf
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Mon Oct 25 03:57:09 2021 +0900

    Merge branch 'develop'

commit 6d557269c1
Merge: 26b268588 a905188e9
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Mon Oct 25 02:34:58 2021 +0900

    Merge branch 'develop'

commit 26b268588f
Merge: a1af83c0a 781b57585
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Oct 23 11:36:50 2021 +0900

    Merge branch 'develop'

commit a1af83c0ab
Merge: d0d5068f7 4168addbb
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Oct 23 02:46:44 2021 +0900

    Merge branch 'develop'

commit d0d5068f72
Merge: 8a1f3a4c0 d70b8275b
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Oct 23 01:08:45 2021 +0900

    Merge branch 'develop'

commit 8a1f3a4c0b
Merge: 338793d89 8b646822f
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Oct 16 19:55:44 2021 +0900

    Merge branch 'develop'

commit 338793d891
Merge: c82ce9233 78ac41a61
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Wed Sep 22 22:53:41 2021 +0900

    Merge branch 'develop'

commit c82ce9233b
Merge: 4b48ba4e8 cc7562097
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sun Sep 5 16:26:34 2021 +0900

    Merge branch 'develop'

commit 4b48ba4e8c
Merge: 7115bd46f bf7baccea
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Sep 4 20:38:20 2021 +0900

    Merge branch 'develop'

commit 7115bd46ff
Merge: e967d9ded f84483896
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Tue Aug 24 14:40:22 2021 +0900

    Merge branch 'develop'

commit e967d9ded3
Merge: f00ceedae c3b55b684
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Tue Aug 24 13:20:30 2021 +0900

    Merge branch 'develop'

commit f00ceedae4
Merge: df67836c1 7387e010c
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Aug 21 17:59:29 2021 +0900

    Merge branch 'develop'

commit df67836c1a
Merge: 9fd0e9085 6a3a8ba4d
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Tue Aug 17 22:01:46 2021 +0900

    Merge branch 'develop'

commit 9fd0e90850
Merge: 42c4ea38c ab01cf188
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Thu Aug 12 12:48:58 2021 +0900

    Merge branch 'develop'

commit 42c4ea38cc
Merge: df5396830 c0ba71c36
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Wed Aug 11 22:36:59 2021 +0900

    Merge branch 'develop'

commit df53968306
Merge: df530bb66 19f753c15
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Mon Aug 9 21:47:52 2021 +0900

    Merge branch 'develop'

commit df530bb66d
Merge: c52e30e8e fa49427df
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Mon Aug 9 21:47:23 2021 +0900

    Merge branch 'develop'

commit c52e30e8e0
Merge: 5e6e1e237 0cb04ded3
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sun Aug 8 23:25:21 2021 +0900

    Merge branch 'develop'

commit 5e6e1e237a
Merge: 943a1940e 41fe364b4
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Mon Jul 26 11:15:42 2021 +0900

    Merge branch 'develop'

commit 943a1940e2
Merge: 12913a16f 15d166e30
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Fri Jul 23 22:43:47 2021 +0900

    Merge branch 'develop'

commit 12913a16fd
Merge: acb924420 e23ad7833
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Fri Jul 23 21:37:09 2021 +0900

    Merge branch 'develop'

commit acb9244205
Merge: d04014f87 3182606e9
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Tue Jul 20 12:11:07 2021 +0900

    Merge branch 'develop'

commit d04014f875
Merge: 929e54551 e1247b3e4
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Thu Jun 10 14:03:28 2021 +0900

    Merge branch 'develop'

commit 929e545514
Merge: 942c80243 3e7a87f75
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Mon May 31 13:06:40 2021 +0900

    Merge branch 'develop'

commit 942c802431
Merge: 70d02cf1b e6754eb88
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Fri May 21 17:28:39 2021 +0900

    Merge branch 'develop'

commit 70d02cf1be
Merge: f96c60c1a ef646b957
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Fri May 21 17:27:47 2021 +0900

    Merge branch 'develop'

commit f96c60c1a0
Merge: 8accb78fa 99234632b
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Tue May 11 14:39:40 2021 +0900

    Merge branch 'develop'

commit 8accb78fa9
Merge: 05203e2cf 3d7c3c39f
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Wed May 5 19:05:50 2021 +0900

    Merge branch 'develop'

commit 05203e2cf0
Merge: b6c9ab0c1 80f8c2de7
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Wed May 5 15:17:53 2021 +0900

    Merge branch 'develop'

commit b6c9ab0c15
Merge: cdef5cd1a 1a8f41010
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Tue May 4 23:12:53 2021 +0900

    Merge branch 'develop'

commit cdef5cd1ad
Merge: ea7d4d323 2efae80b9
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Tue May 4 22:53:25 2021 +0900

    Merge branch 'develop'

commit ea7d4d323e
Merge: 17fff8c66 18da55bd8
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Wed Apr 28 18:37:48 2021 +0900

    Merge branch 'develop'

commit 17fff8c665
Merge: 92977f303 fa9f0d9ff
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Mon Apr 26 13:00:10 2021 +0900

    Merge branch 'develop'

commit 92977f303d
Merge: 8043409d3 0038f3b24
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sun Apr 25 15:20:39 2021 +0900

    Merge branch 'develop'

commit 8043409d38
Merge: 37dc1c9a8 6d145bc4c
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Apr 24 23:04:59 2021 +0900

    Merge branch 'develop'

commit 37dc1c9a82
Merge: 631091940 3286c93c8
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Fri Apr 23 18:25:44 2021 +0900

    Merge branch 'develop'

commit 631091940b
Merge: 938fcb3e5 53d257ef0
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sun Apr 18 23:25:55 2021 +0900

    Merge branch 'develop'

commit 938fcb3e5e
Merge: 5e1d17dff 3553f3be4
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sun Apr 18 00:07:33 2021 +0900

    Merge branch 'develop'

commit 5e1d17dff2
Merge: 449dc17df 526838c77
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Fri Apr 16 00:21:56 2021 +0900

    Merge branch 'develop'

commit 449dc17df8
Merge: 3e1101122 5cb3d86a1
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Wed Apr 14 16:39:53 2021 +0900

    Merge branch 'develop'

commit 3e11011229
Merge: 52d577c7d e5ba47514
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Wed Mar 24 11:34:29 2021 +0900

    Merge branch 'develop'

commit 52d577c7dd
Merge: 18693fb38 cf757ed01
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Mon Mar 22 15:27:08 2021 +0900

    Merge branch 'develop'

commit 18693fb380
Merge: f7e9725e5 cf9242053
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sun Mar 7 14:43:00 2021 +0900

    Merge branch 'develop'

commit f7e9725e59
Merge: 9a4a534c9 17dc50c24
Author: syuilo <Syuilotan@yahoo.co.jp>
Date:   Sat Mar 6 23:23:54 2021 +0900

    Merge branch 'develop'

commit 9a4a534c92
Merge: b090ff999 0e89a9f41
Author: syuilo <syuilotan@yahoo.co.jp>
Date:   Wed Mar 3 01:04:45 2021 +0900

    Merge branch 'develop'

commit b090ff9994
Merge: 3d68a0988 68ace4a31
Author: syuilo <syuilotan@yahoo.co.jp>
Date:   Sun Feb 28 13:14:26 2021 +0900

    Merge branch 'develop'

commit 3d68a0988b
Merge: d6c8b9b99 3c7a02af1
Author: syuilo <syuilotan@yahoo.co.jp>
Date:   Sun Feb 21 13:38:29 2021 +0900

    Merge branch 'develop'

commit d6c8b9b994
Merge: 49e6c2ed7 8bd80eb2a
Author: syuilo <syuilotan@yahoo.co.jp>
Date:   Fri Feb 19 21:42:47 2021 +0900

    Merge branch 'develop'

commit 49e6c2ed75
Merge: e4bcdd7b4 f24c7c81c
Author: syuilo <syuilotan@yahoo.co.jp>
Date:   Sun Feb 7 18:23:23 2021 +0900

    Merge branch 'develop'

commit e4bcdd7b4d
Merge: 7747ec5b6 bce65e214
Author: syuilo <syuilotan@yahoo.co.jp>
Date:   Sat Jan 23 20:06:22 2021 +0900

    Merge branch 'develop'

commit 7747ec5b6d
Author: syuilo <syuilotan@yahoo.co.jp>
Date:   Sat Jan 23 20:05:44 2021 +0900

    Update ja-JP.yml

This commit is contained in:

syuilo

2022-04-23 19:56:17 +09:00

parent eac71ae1d7

commit f23d5a75f4

2 changed files with 7 additions and 1 deletions

6

CHANGELOG.md

View file

 @ -20,6 +20,12 @@ You should also include the user name that made the change.
 ### Bugfixes
 -
 ## 12.110.1 (2022/04/23)
 ### Bugfixes
 - Fix GOP rendering @syuilo
 - Improve performance of antenna, clip, and list @xianon
 ## 12.110.0 (2022/04/11)
 ### Improvements

									
										2

package.json
									
										View file
										
				@ -1,6 +1,6 @@

				{

					"name": "misskey",

					"version": "12.110.0",

					"version": "12.110.1",

					"codename": "indigo",

					"repository": {

						"type": "git",

Squashed commit of the following:

6 CHANGELOG.md Unescape Escape View file

2 package.json Unescape Escape View file

6

CHANGELOG.md

View file

2

package.json

View file