0
0
Commit Graph

20050 Commits

Author SHA1 Message Date
syuilo
dd8cb7846f
Update CONTRIBUTING.md 2022-05-05 18:38:30 +09:00
syuilo
56436b99bb
Update CONTRIBUTING.md 2022-05-05 18:36:30 +09:00
syuilo
a36f54dec2
Update CONTRIBUTING.md 2022-05-05 18:33:24 +09:00
Andreas Nedbal
d075ead80a
fix(client): fix duplicate token request dialog in plugin install (#8612) 2022-05-05 18:21:38 +09:00
Andreas Nedbal
9230334a31
Refactor settings/notifications to use Composition API (#8587)
* refactor(client): refactor settings/notifications to use Composition API

* fix(client): use async/await for API methods
2022-05-04 12:25:19 +09:00
Andreas Nedbal
7154ad5a73
Refactor account-info to use Composition API (#8568)
* refactor(client): refactor account-info  to use Composition API

* fix(client): use mounted hook for initial data

* fix(client): switch to non-null assertion for account check
2022-05-04 10:16:14 +09:00
Andreas Nedbal
c72f5e2773
refactor(client): refactor settings/api to use Composition API (#8569) 2022-05-04 10:15:43 +09:00
Andreas Nedbal
6226e8d902
refactor(client): refactor settings/apps to use Composition API (#8570) 2022-05-04 10:15:24 +09:00
Andreas Nedbal
80355fb08e
Refactor delete-account to use Composition API (#8572)
* refactor(client): refactor delete-account to use Composition API

* Apply review suggestion from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-04 10:15:06 +09:00
Andreas Nedbal
fc02f8fc93
refactor(client): refactor settings/drive to use Composition API (#8573) 2022-05-04 10:14:48 +09:00
Andreas Nedbal
7a51f0ac94
Refactor settings/email to use Composition API (#8576)
* refactor(client): refactor settings/email to use Composition API

* fix(client): switch to non-null assertion for settings values
2022-05-04 10:14:26 +09:00
Andreas Nedbal
247a9deb02
Refactor settings/general to use Composition API (#8578)
* refactor(client): refactor settings/general to use Composition API

* fix(client): turn watcher callback asynchronous
2022-05-04 10:13:51 +09:00
Andreas Nedbal
60010bdb0f
Refactor settings/menu to use Composition API (#8586)
* refactor(client): refactor settings/menu to use Composition API

* Apply review suggestion from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

* Apply review suggestion from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-04 10:12:40 +09:00
Andreas Nedbal
8489afa3d7
Refactor settings/other to use Composition API (#8589)
* refactor(client): refactor settings/other to use Composition API

* fix(client): fix 'show featured notes' checkbox
2022-05-04 10:12:08 +09:00
Andreas Nedbal
81e5ff7dce
refactor(client): refactor settings/plugin to use Composition API (#8590) 2022-05-04 10:11:35 +09:00
Andreas Nedbal
4e1b5038fb
refactor(client): refactor settings/plugin/install to use Composition API (#8591) 2022-05-04 10:10:52 +09:00
Andreas Nedbal
f8c66be130
refactor(client): refactor settings/security to use Composition API (#8592) 2022-05-04 10:10:34 +09:00
Andreas Nedbal
1f222e6cd1
refactor(client): refactor settings/theme to use Composition API (#8595) 2022-05-03 20:34:48 +09:00
Andreas Nedbal
0e26fae3bb
refactor(client): refactor settings/accounts to use Composition API (#8604) 2022-05-03 20:33:40 +09:00
tamaina
8a5a99f01b
Merge pull request #8593 from pixeldesu/fix/os-defineasync
Fix missing import of defineAsyncComponent in os.ts
2022-05-02 13:40:42 +09:00
Andreas Nedbal
49b63154df
fix(client): fix missing import of defineAsyncComponent in os.ts 2022-05-01 17:55:17 +02:00
dependabot[bot]
38e6202bdc
chore(deps): bump postcss from 8.2.8 to 8.4.13 in /packages/client (#8588)
Bumps [postcss](https://github.com/postcss/postcss) from 8.2.8 to 8.4.13.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.2.8...8.4.13)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-01 22:52:11 +09:00
tamaina
a89003b57a
refactor: use Vite to build instead of webpack (#8575)
* update stream.ts

* https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339

* fix lint

* clean up?

* add app

* fix

* nanka iroiro

* wip

* wip

* fix lint

* fix loginId

* fix

* refactor

* refactor

* remove follow action

* clean up

* Revert "remove follow action"

This reverts commit defbb416480905af2150d1c92f10d8e1d1288c0a.

* Revert "clean up"

This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2.

* remove fetch specification

* renoteの条件追加

* apiFetch => cli

* bypass fetch?

* fix

* refactor: use path alias

* temp: add submodule

* remove submodule

* enhane: unison-reloadに指定したパスに移動できるように

* null

* null

* feat: ログインするアカウントのIDをクエリ文字列で指定する機能

* null

* await?

* rename

* rename

* Update read.ts

* merge

* get-note-summary

* fix

* swパッケージに

* add missing packages

* fix getNoteSummary

* add webpack-cli

* ✌️

* remove plugins

* sw-inject分離したがテストしてない

* fix notification.vue

* remove a blank line

* disconnect intersection observer

* disconnect2

* fix notification.vue

* remove a blank line

* disconnect intersection observer

* disconnect2

* fix

* ✌️

* clean up config

* typesを戻した

* Update packages/client/src/components/notification.vue

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

* disconnect

* oops

* Failed to load the script unexpectedly回避
sw.jsとlib.tsを分離してみた

* truncate notification

* Update packages/client/src/ui/_common_/common.vue

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* clean up

* clean up

* キャッシュ対策

* Truncate push notification message

* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正

* components/drive-file-thumbnail.vue

* components/drive-select-dialog.vue

* components/drive-window.vue

* merge

* fix

* Service Workerのビルドにesbuildを使うようにする

* return createEmptyNotification()

* fix

* i18n.ts

* update

* ✌️

* remove ts-loader

* fix

* fix

* enhance: Service Workerを常に登録するように

* pollEnded

* URLをsw.jsに戻す

* clean up

* wip

* wip

* wip

* wip

* wip

* wip

* ✌️

* use import

* fix

* install rollup

* use defineAsyncComponent.

* fix emojilist

* wip use defineAsyncComponent

* popup(import -> popup(defineAsyncComponent(() => import

* draggable?

* fix init import

* clean up

* fix router

* add comment

* ✌️

* ✌️

* ✌️

* remove webpack

* update vite

* fix boot sequence

* Revert "fix boot sequence"

This reverts commit e893dbf37aed83bf9f12e427d98c78a7065b4a39.

* revert boot import

* never make two app div

* ;

* remove console.log

* change clientEntry sequence

* fix

* Revert "fix"

This reverts commit 12741b3d89950a31dbb1bb81477ddb27b0e9951a.

* fix

* add comment https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210

* add log

* add comment

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-05-01 22:51:07 +09:00
Johann150
6ed010b192
fix _misskey_content of quote renotes (#8533) 2022-05-01 19:23:34 +09:00
MeiMei
60391ff37e
fix: Add rel attribute to host-meta (#8583)
* Add rel attribute to host-meta

* CHANGELOG
2022-05-01 19:14:14 +09:00
tamaina
e083205824 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-05-01 06:59:47 +00:00
tamaina
b00bf5740a modify CHANGELOG.md 2022-05-01 06:59:43 +00:00
Andreas Nedbal
a00a1fd6b5
Refactor custom-css to use Composition API (#8571)
* refactor(client): refactor custom-css to use Composition API

* Apply review suggestion from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-01 15:50:09 +09:00
Andreas Nedbal
274ca6f7e6
refactor(client): refactor import-export to use Composition API (#8579) 2022-05-01 11:55:15 +09:00
Andreas Nedbal
475b7556d8
Refactor instance-mute to use Composition API (#8580)
* refactor(client): refactor instance-mute to use Composition API

* Apply review suggestion from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

* Apply review suggestion from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-01 11:52:19 +09:00
Andreas Nedbal
3dc027bcd5
Refactor integration to use Composition API (#8581)
* refactor(client): refactor integration to use Composition API

* fix(client): drop superfluous enable* constants

* refactor(client): deduplicate window opening for services
2022-05-01 11:23:12 +09:00
tamaina
766559c6e9
feat: Improve Push Notification (#7667)
* clean up

* ev => data

* refactor

* clean up

* add type

* antenna

* channel

* fix

* add Packed type

* add PackedRef

* fix lint

* add emoji schema

* add reversiGame

* add reversiMatching

* remove signin schema (use Signin entity)

* add schemas refs, fix Packed type

* wip PackedHoge => Packed<'Hoge'>

* add Packed type

* note-reaction

* user

* user-group

* user-list

* note

* app, messaging-message

* notification

* drive-file

* drive-folder

* following

* muting

* blocking

* hashtag

* page

* app (with modifying schema)

* import user?

* channel

* antenna

* clip

* gallery-post

* emoji

* Packed

* reversi-matching

* update stream.ts

* https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339

* fix lint

* clean up?

* add app

* fix

* nanka iroiro

* wip

* wip

* fix lint

* fix loginId

* fix

* refactor

* refactor

* remove follow action

* clean up

* Revert "remove follow action"

This reverts commit defbb416480905af2150d1c92f10d8e1d1288c0a.

* Revert "clean up"

This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2.

* remove fetch specification

* renoteの条件追加

* apiFetch => cli

* bypass fetch?

* fix

* refactor: use path alias

* temp: add submodule

* remove submodule

* enhane: unison-reloadに指定したパスに移動できるように

* null

* null

* feat: ログインするアカウントのIDをクエリ文字列で指定する機能

* null

* await?

* rename

* rename

* Update read.ts

* merge

* get-note-summary

* fix

* swパッケージに

* add missing packages

* fix getNoteSummary

* add webpack-cli

* ✌️

* remove plugins

* sw-inject分離したがテストしてない

* fix notification.vue

* remove a blank line

* disconnect intersection observer

* disconnect2

* fix notification.vue

* remove a blank line

* disconnect intersection observer

* disconnect2

* fix

* ✌️

* clean up config

* typesを戻した

* Update packages/client/src/components/notification.vue

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

* disconnect

* oops

* Failed to load the script unexpectedly回避
sw.jsとlib.tsを分離してみた

* truncate notification

* Update packages/client/src/ui/_common_/common.vue

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* clean up

* clean up

* キャッシュ対策

* Truncate push notification message

* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正

* components/drive-file-thumbnail.vue

* components/drive-select-dialog.vue

* components/drive-window.vue

* merge

* fix

* Service Workerのビルドにesbuildを使うようにする

* return createEmptyNotification()

* fix

* i18n.ts

* update

* ✌️

* remove ts-loader

* fix

* fix

* enhance: Service Workerを常に登録するように

* pollEnded

* URLをsw.jsに戻す

* clean up

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-04-30 21:52:07 +09:00
dependabot[bot]
1c6d5ddf81
chore(deps): bump ejs from 3.1.6 to 3.1.7 in /packages/backend (#8560)
Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.7.
- [Release notes](https://github.com/mde/ejs/releases)
- [Changelog](https://github.com/mde/ejs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mde/ejs/compare/v3.1.6...v3.1.7)

---
updated-dependencies:
- dependency-name: ejs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-30 00:16:40 +09:00
Andreas Nedbal
5ad42d1d85
refactor(client): refactor scratchpad to use Composition API (#8565) 2022-04-29 12:26:24 +09:00
Andreas Nedbal
8f32064fea
refactor(client): refactor api-console to use Composition API (#8566) 2022-04-29 10:21:02 +09:00
Balazs Nadasdi
6a44616725
chore(deps): Update github actions to use the same version as defined in .node-version (#8563) 2022-04-29 10:17:03 +09:00
Johann150
9fe0452016
update changelog
add user facing changes to changelog
2022-04-28 08:51:47 +02:00
Kainoa Kanter
74079c7a0c
Remove patreon section from README (#8476)
Patrons are now mentioned in Misskey itself, and the list hasn't been updated for 2 years.
2022-04-28 11:49:43 +09:00
tamaina
12a3c6872f
enhance: ドライブに画像ファイルをアップロードするときオリジナル画像を破棄してwebpublicのみ保持するオプション (#8216)
* wip

* Update packages/client/src/os.ts

Co-authored-by: tamaina <tamaina@hotmail.co.jp>

* メニューをComposition API化、switchアイテム追加
クライアントサイド画像圧縮の準備

* メニュー型定義を分離 (TypeScriptの型支援が効かないので)

* disabled

* make keepOriginal to follow setting value

* ✌️

* fix

* fix

* ✌️

* WEBP

* aaa

* ✌️

* webp

* lazy load browser-image-resizer

* rename

* rename 2

* Fix

* clean up

* add comment

* clean up

* jpeg, pngにもどす

* fix

* fix name

* webpでなくする ただしサムネやプレビューはwebpのまま (テスト)

* 動画サムネイルはjpegに

* エラーハンドリング

* ✌️

* v2.2.1-misskey-beta.2

* browser-image-resizer#v2.2.1-misskey.1

* ✌️

* fix alert

* update browser-image-resizer to v2.2.1-misskey.2

* lockfile

Co-authored-by: mei23 <m@m544.net>
Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>
2022-04-28 11:14:03 +09:00
Andreas Nedbal
d0443f9de1
fix(client): fix lint issues in autocomplete (#8548) 2022-04-28 10:56:18 +09:00
Johann150
a99cd645bb
refactor: use composition API (#8541) 2022-04-27 15:17:49 +09:00
tamaina
065324d30b
Fix #8535 Excessive stack ... 'SchemaTypeDef<?>' (#8547)
* Fix #8535 Excessive stack ... 'SchemaTypeDef<?>'

Co-authored-by: acid-chicken <root@acid-chicken.com>

* add comment

* clean up

Co-authored-by: acid-chicken <root@acid-chicken.com>
2022-04-27 10:49:00 +09:00
Johann150
b9e3267198
fix: Promises -> Promise (#8545) 2022-04-25 15:14:13 +09:00
futchitwo
3f9a914718
Fix(client): fix profile tab link (#8536) 2022-04-24 14:21:46 +09:00
Johann150
7e28c396b9
enhance: only render public notes in HTML template (#8527)
* only render public notes in HTML template

* fix missing import
2022-04-24 14:17:09 +09:00
tamaina
1b2ba09be0
fix: Fix schema key type error #8517 (#8538) 2022-04-24 11:43:15 +09:00
syuilo
f23d5a75f4 Squashed commit of the following:
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
2022-04-23 19:56:17 +09:00
tamaina
eac71ae1d7
fix: Fix settings page (#8508)
* Fix settings page

* nanka iroiro

* clean up

* clean up

* インデックスに戻ってもタイトルが残ってしまうのを修正
2022-04-23 19:17:15 +09:00
syuilo
c2cae877ce chore: fix lint command for windows 2022-04-23 12:50:37 +09:00
syuilo
fd13173eaf bump jsrsasign 2022-04-23 12:48:26 +09:00