1
0
Commit Graph

501 Commits

Author SHA1 Message Date
Hazelnoot 00cfeca3d7 merge: Add "is from local bubble instance" role condition (!1011)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1011

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-05-12 20:08:56 +00:00
Hazelnoot 7c5e0ce4ab add hint about bubble timeline roles 2025-05-12 14:01:30 -04:00
Hazelnoot 33e0b13916 remove unused bubbleTimelineEnabled variable 2025-05-12 13:58:08 -04:00
Hazelnoot 022337c1e7 translate bubble timeline controls 2025-05-12 13:57:37 -04:00
Hazelnoot 05884cb83d always show bubble timeline controls 2025-05-12 13:57:20 -04:00
Hazelnoot 655290f8a4 add "is from local bubble instance" role condition 2025-05-12 13:31:16 -04:00
Hazelnoot 835e76152e merge: Add pattern checker for word mutes (resolves #1003) (!1020)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1020

Closes #1003

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-05-12 10:33:25 +00:00
Hazelnoot c6ef944fc6 rename SkWordMuteTest to SkPatternTest 2025-05-10 22:49:23 -04:00
Hazelnoot f6796a99ec add SkWordMuteTest to moderation control panel 2025-05-10 22:48:50 -04:00
Hazelnoot da769846eb reset default value for new followers role conditions 2025-05-10 14:44:29 -04:00
Hazelnoot 7f3dc6066d add warning for role conditions that are dependent on remote data 2025-05-10 14:44:27 -04:00
Hazelnoot 40a73bfcbe add new role conditions for local/remote followers/followees 2025-05-10 14:44:17 -04:00
Hazelnoot 56a8ff4f50 add isFromInstance role condition 2025-05-09 21:03:05 -04:00
dakkar 42f3976b16 add scheduleNotePost queue to dashboard 2025-05-08 16:43:52 +01:00
Hazelnoot 8dce293dff add setting to disable proxy account (resolves #766) 2025-05-01 12:07:38 -04:00
Hazelnoot 9c301fa5aa Merge branch 'misskey-develop' into merge/2025-03-24
# Conflicts:
#	.github/workflows/api-misskey-js.yml
#	.github/workflows/changelog-check.yml
#	.github/workflows/check-misskey-js-autogen.yml
#	.github/workflows/get-api-diff.yml
#	.github/workflows/lint.yml
#	.github/workflows/locale.yml
#	.github/workflows/on-release-created.yml
#	.github/workflows/storybook.yml
#	.github/workflows/test-backend.yml
#	.github/workflows/test-federation.yml
#	.github/workflows/test-frontend.yml
#	.github/workflows/test-misskey-js.yml
#	.github/workflows/test-production.yml
#	.github/workflows/validate-api-json.yml
#	package.json
#	packages/backend/package.json
#	packages/backend/src/server/api/ApiCallService.ts
#	packages/backend/src/server/api/endpoints/drive/files/create.ts
#	packages/frontend-shared/js/url.ts
#	packages/frontend/package.json
#	packages/frontend/src/components/MkFileCaptionEditWindow.vue
#	packages/frontend/src/components/MkInfo.vue
#	packages/frontend/src/components/MkLink.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkNotes.vue
#	packages/frontend/src/components/MkPageWindow.vue
#	packages/frontend/src/components/MkReactionsViewer.vue
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/components/MkUrlPreview.vue
#	packages/frontend/src/components/MkUserPopup.vue
#	packages/frontend/src/components/global/MkPageHeader.vue
#	packages/frontend/src/components/global/MkUrl.vue
#	packages/frontend/src/components/global/PageWithHeader.vue
#	packages/frontend/src/pages/about-misskey.vue
#	packages/frontend/src/pages/announcements.vue
#	packages/frontend/src/pages/antenna-timeline.vue
#	packages/frontend/src/pages/channel.vue
#	packages/frontend/src/pages/instance-info.vue
#	packages/frontend/src/pages/note.vue
#	packages/frontend/src/pages/page.vue
#	packages/frontend/src/pages/role.vue
#	packages/frontend/src/pages/tag.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/pages/user-list-timeline.vue
#	packages/frontend/src/pages/user/followers.vue
#	packages/frontend/src/pages/user/following.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/pages/user/index.vue
#	packages/frontend/src/ui/deck.vue
#	packages/misskey-js/generator/package.json
#	pnpm-lock.yaml
#	scripts/changelog-checker/package-lock.json
#	scripts/changelog-checker/package.json
2025-04-29 15:54:11 -04:00
syuilo e0fd1c8f48 tweak custom-emojis-manager 2025-04-28 08:49:37 +09:00
syuilo 83893ce52f fix syntax errors 2025-04-27 20:04:13 +09:00
syuilo 0a1ff77f23 perf(frontend): use css-native implementation for spacer rather than vue component 2025-04-27 19:55:56 +09:00
syuilo 73b86d9276 enhance(frontend): improve new emojis manager 2025-04-27 13:31:07 +09:00
syuilo 9481b5a6e8 feat: アップロード可能な最大ファイルサイズをロールごとに設定可能に 2025-04-27 09:35:44 +09:00
Hazelnoot a4dd19fdd4 merge upstream again 2025-04-24 14:23:45 -04:00
syuilo c99723b59e fix html 2025-04-19 21:01:51 +09:00
syuilo 96bb36f77e 🎨 2025-04-19 14:42:54 +09:00
syuilo 388ef3de08 🎨 2025-04-19 14:42:09 +09:00
syuilo ff85eff209 🎨 2025-04-19 14:32:19 +09:00
syuilo 7b38806413 feat: Job queue inspector (#15856)
* wip

* wip

* Update job-queue.vue

* wip

* wip

* Update job-queue.vue

* wip

* Update job-queue.vue

* wip

* Update QueueService.ts

* Update QueueService.ts

* Update QueueService.ts

* Update job-queue.vue

* wip

* wip

* wip

* Update job-queue.vue

* wip

* Update MkTl.vue

* wip

* Update index.vue

* wip

* wip

* Update MkTl.vue

* 🎨

* jobs search

* wip

* Update job-queue.vue

* wip

* wip

* Update job-queue.vue

* Update job-queue.vue

* Update job-queue.vue

* Update job-queue.vue

* wip

* Update job-queue.job.vue

* wip

* wip

* wip

* Update MkCode.vue

* wip

* Update job-queue.job.vue

* wip

* Update job-queue.job.vue

* Update misskey-js.api.md

* Update CHANGELOG.md

* Update job-queue.job.vue
2025-04-19 14:00:38 +09:00
syuilo eda2f587a3 enhance: コントロールパネルでジョブキューをクリアできるように 2025-04-16 16:47:03 +09:00
Hazelnoot 7132696285 Merge tag '2025.4.0' into merge/2025-03-24
# Conflicts:
#	.github/workflows/storybook.yml
#	locales/index.d.ts
#	package.json
#	packages/backend/src/models/json-schema/role.ts
#	packages/frontend/src/components/MkPageWindow.vue
#	packages/frontend/src/pages/admin/roles.editor.vue
#	packages/frontend/src/pages/admin/roles.vue
#	packages/frontend/src/pages/settings/preferences.vue
#	packages/frontend/src/pages/settings/privacy.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/pref-migrate.ts
#	packages/frontend/src/ui/_common_/common.vue
#	packages/frontend/src/ui/deck.vue
#	packages/frontend/src/ui/universal.vue
#	packages/misskey-js/src/autogen/types.ts
2025-04-13 13:07:09 -04:00
syuilo c96f345f01 fix(frontend): fix control panel style 2025-04-08 10:56:52 +09:00
かっこかり 9d3f3264fd enhance: チャットの閲覧を無効化できるように (#15765)
* enhance: チャットの閲覧を無効化できるように

* fix

* fix

* fix

* readonlyの説明を追加

* enhance: チャットが無効な場合はチャット関連の設定も隠すように

* fix

* refactor: ChatServiceからApiに関するドメイン知識を排除
2025-04-07 19:09:11 +09:00
Hazelnoot 7e7350eab5 Merge branch 'misskey-develop' into merge/2025-03-24
# Conflicts:
#	.github/workflows/storybook.yml
#	package.json
#	packages/frontend/src/utility/autogen/settings-search-index.ts
#	pnpm-lock.yaml
2025-04-05 12:24:00 -04:00
syuilo f9a3db2ac3 refactor(frontend): refactor styles 2025-04-05 19:49:29 +09:00
anatawa12 22f874c81d fix: chromatic failure (#15757) 2025-04-05 08:46:48 +09:00
Hazelnoot 3eeb53ff63 Merge branch 'misskey-develop' into merge/2025-03-24
# Conflicts:
#	package.json
#	packages/backend/src/core/AccountMoveService.ts
#	packages/frontend/src/components/MkDateSeparatedList.vue
#	packages/misskey-js/etc/misskey-js.api.md
#	pnpm-lock.yaml
2025-04-03 22:06:37 -04:00
anatawa12 cab82452ec Copy role on move (#15745)
* feat(backend): copyOnMoveAccount

* feat(endpoints): copyOnMoveAccount

* feat(frontend): copyOnMoveAccount

* docs(changelog): アカウントのマイグレーション時に古いアカウントからロールをコピーできるようになりました。

* fix: spdx header for migration

* Update locales/ja-JP.yml

* copyOnMoveAccount -> preserveAssignmentOnMoveAccount

* fix: check for preserveAssignmentOnMoveAccount

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2025-04-03 19:22:49 +09:00
Hazelnoot 022a9c7676 fix vue errors in overview.stats.vue 2025-04-02 21:27:23 -04:00
Hazelnoot 6b2ef370b0 fix type errors in approvals.vue 2025-04-01 21:08:04 -04:00
Hazelnoot 6ac37b4d6c lint and type fixes 2025-04-01 20:47:04 -04:00
Hazelnoot 2983092c06 Merge branch 'misskey-develop' into merge/2025-03-24 2025-03-31 16:07:55 -04:00
Hazelnoot c371af34e8 copy sharkey settings into new frontend preferences model 2025-03-31 14:53:02 -04:00
syuilo 93214862b1 🎨 2025-03-31 13:18:50 +09:00
Hazelnoot a2062c6469 Revert "revert 7bfada9792: enhance: remove bull-board support"
This reverts commit d41d77fcd7.
2025-03-30 02:14:03 -04:00
Hazelnoot 4ae26e6e18 Merge branch 'misskey-develop' into merge/2025-03-24 2025-03-30 01:58:17 -04:00
syuilo a25fa62d64 enhance(frontend): ファイルアップロード処理のリファクタと設定の簡略化 2025-03-28 09:47:34 +09:00
Hazelnoot f861bec1a7 update references from /scripts/ to /utility/ 2025-03-25 17:32:18 -04:00
Hazelnoot 949baa9b8b Revert "feat: google analytics (#15451)"
This reverts commit 2b6638e1
2025-03-25 17:30:28 -04:00
Hazelnoot d41d77fcd7 revert 7bfada9792: enhance: remove bull-board support 2025-03-25 17:25:30 -04:00
Hazelnoot 40975719ec Merge branch 'misskey-develop' into merge/2025-03-24
# Conflicts:
#	package.json
#	packages/backend/src/core/entities/NotificationEntityService.ts
#	packages/backend/src/types.ts
#	packages/frontend/src/pages/admin/modlog.ModLog.vue
#	packages/misskey-js/src/consts.ts
#	packages/misskey-js/src/entities.ts
2025-03-25 16:17:34 -04:00
Hazelnoot d8908ef2d8 merge upstream 2025-03-25 16:14:53 -04:00