24909 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mar0xy	6c982ea4fe	merge: bring stable and develop on same commit history	2023-10-19 10:35:41 +02:00
Mar0xy	6390c829ab	upd: apply all minor changes to stable	2023-10-18 23:57:09 +02:00
Mar0xy	e1f13f641e	fix: all users being marked as not approved on cards	2023-10-18 23:50:43 +02:00
Mar0xy	6e2eabbbc9	upd: show warning in control panel if users are awaiting approval	2023-10-18 23:39:48 +02:00
Mar0xy	961d53d0f0	upd: add color to non-approved user cards	2023-10-18 23:30:44 +02:00
Marie	a6c04019f0	release: 2023.10.2 (#101)	2023-10-18 21:39:12 +02:00
Marie	5e7cac0d37	Merge branch 'stable' into release/2023.10.2	2023-10-18 21:38:42 +02:00
Marie	4da9faaa86	chore: set version	2023-10-18 21:37:23 +02:00
Mar0xy	c79abfa8d9	fix: set remote users to approved on updates	2023-10-18 21:32:28 +02:00
Mar0xy	07b72c65b9	fix: modlog not showing text on approve	2023-10-18 21:24:34 +02:00
Marie	887f422511	merge: approve signup system (#93)	2023-10-18 21:07:53 +02:00
Mar0xy	20e0d0b2e2	upd: mark remote users as approved	2023-10-18 20:56:41 +02:00
Mar0xy	4e121892e6	add: type for approve-user endpoint	2023-10-18 19:57:03 +02:00
Mar0xy	cf6e720139	merge: branch develop	2023-10-18 19:56:42 +02:00
Mar0xy	bb54909d8e	upd: filter fallback to db for silenced users	2023-10-18 19:51:10 +02:00
Mar0xy	4b230d792c	merge: upstream changes	2023-10-18 19:48:03 +02:00
dependabot[bot]	c4b0f47ba1	Merge pull request #98 from transfem-org/dependabot/github_actions/actions/checkout-4.1.1	2023-10-18 17:17:02 +00:00
Marie	8debea7161	merge: timeline changes, new options, silence users (#97)	2023-10-18 19:15:53 +02:00
Mar0xy	5ddf7e008d	add: locales for toggles	2023-10-18 19:01:50 +02:00
dependabot[bot]	9721801c9b	chore(deps): bump actions/checkout from 4.1.0 to 4.1.1 ... Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-10-18 12:37:13 +00:00
Mar0xy	1e3e50ae0f	fix: type for nsfw endpoint	2023-10-18 13:35:38 +02:00
Mar0xy	a4a1b8bb8b	add: isSilenced handling to user and timeline	2023-10-18 13:34:16 +02:00
syuilo	de6e15e36d	Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop	2023-10-18 17:41:56 +09:00
syuilo	01f294bd91	Update CHANGELOG.md	2023-10-18 17:41:48 +09:00
syuilo	92b49b6ebb	New Crowdin updates (#12036) ... * New translations ja-jp.yml (Italian) * New translations ja-jp.yml (Italian) * New translations ja-jp.yml (Italian) * New translations ja-jp.yml (German) * New translations ja-jp.yml (Chinese Traditional) * New translations ja-jp.yml (English) * New translations ja-jp.yml (Italian) * New translations ja-jp.yml (German) * New translations ja-jp.yml (English) * New translations ja-jp.yml (Thai) * New translations ja-jp.yml (Thai) * 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 (Thai) * New translations ja-jp.yml (Thai)	2023-10-18 17:41:32 +09:00
syuilo	524b669f5a	2023.10.2-beta.1	2023-10-18 17:22:13 +09:00
syuilo	5b244cc6eb	update test	2023-10-18 17:20:43 +09:00
syuilo	ae1e276085	fix of 6cc02fee99	2023-10-18 17:17:56 +09:00
syuilo	6b5ee43800	enhance(backend): improve fanout tl for stl	2023-10-18 15:51:50 +09:00
syuilo	6b7efb6f1d	fix(backend): fix admin/get-user-ips error	2023-10-18 15:32:35 +09:00
Marie	95b2689a21	fix: default for bottrending in model	2023-10-18 07:31:08 +02:00
Mar0xy	c21d255604	add: Bot Trending Toggle, Hide Bot in Timeline client option	2023-10-18 07:29:16 +02:00
Mar0xy	fa5cf36602	fix: reports not sending email ... Closes transfem-org/Sharkey#81	2023-10-18 06:14:12 +02:00
Marie	182bf7e7d6	Merge branch 'develop' into feature/approval	2023-10-18 05:40:32 +02:00
Mar0xy	cb9bd6a004	add: mark all media from user as NSFW ... Closes transfem-org/Sharkey#69	2023-10-18 05:32:47 +02:00
syuilo	3c5bcdd7b3	Update CHANGELOG.md	2023-10-18 12:27:15 +09:00
syuilo	6cc02fee99	enhance(backend): improve fanout tl ... Resolve #11958 Resolve #12061	2023-10-18 12:26:16 +09:00
syuilo	2a88d8ee2d	refactor(backend): rename service	2023-10-18 12:07:18 +09:00
Mar0xy	288fa1143d	upd: display correct approval_required value on masto instance endpoint	2023-10-18 04:32:40 +02:00
Mar0xy	cab0ec5de1	upd: add Not Approved state sorter to Users tab	2023-10-18 03:40:51 +02:00
Mar0xy	32fc540df4	upd: handle email signups properly with approval enabled	2023-10-18 03:21:06 +02:00
syuilo	52a82ac193	Update about-misskey.vue	2023-10-18 10:07:21 +09:00
nryeouo	d82b3a08e2	Update ja-JP.yml (#12053) ... ポスト	2023-10-18 10:01:50 +09:00
Mar0xy	3f0cc256dc	add: locales for approval feature	2023-10-18 03:00:48 +02:00
taichan	f6e1ee1d40	users/notesでDBから参照した際にチャンネル投稿のみ取得される問題を修正 (#12056) ... * fix(backend): ユーザーのノート取得でDBにfallbackした際にチャンネルノートのみになる * Update CHANGELOG --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>	2023-10-18 09:55:15 +09:00
woxtu	0bddd0ceae	Remove unnecessary nullish coalescing (#12058)	2023-10-18 09:54:18 +09:00
かっこかり	53099cad5a	fix: admin/update-meta が保存できない (#12057) ... * Fix: invalid param impressumUrl * Update CHANGELOG.md	2023-10-18 09:48:49 +09:00
syuilo	145c5c8b2b	update deps	2023-10-18 09:43:59 +09:00
Mar0xy	2f2d88dcfc	add: Require Approval for Signup	2023-10-18 02:41:36 +02:00
Mar0xy	5c7f517895	chore: change some misskey references to sharkey	2023-10-17 23:55:53 +02:00