Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
25702 commits 49 branches 1047 tags 307 MiB
Commit graph

275 commits

Author SHA1 Message Date
mappi
521db37ca7
feat 12325 (#12425) 2023-11-24 08:36:55 +09:00
かっこかり
8d28c2f9d7
Merge branch 'develop' into schedule-note 2023-11-23 15:52:52 +09:00
syuilo
b15f293b82 fix lint, resolve code smell 
Co-Authored-By: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2023-11-22 18:46:27 +09:00
nenohi
481bca4cf2
広告掲載ページにてfilterをわかりやすく (#12385) 2023-11-21 19:50:06 +09:00
かっこかり
b58d266ccd
Merge branch 'develop' into schedule-note 2023-11-20 09:31:54 +09:00
mattyatea
e3d8346e21 Merge remote-tracking branch 'misskey-original/develop' into develop 2023-11-19 17:56:14 +09:00
Nafu Satsuki
0a73973a7c メールアドレスの認証にverifymail.ioを使えるようにする。 2023-11-18 21:01:53 +09:00
かっこかり
3413b394e9
Merge branch 'develop' into schedule-note 2023-11-18 00:21:56 +09:00
おさむのひと
83ea0395f6
DeepL TranslationのPro accountトグルスイッチが表示されていなかったのを修正 (#12355) 
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
 2023-11-17 22:26:54 +09:00
mattyatea
7bc183cbb7 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/scripts/mfm-tags.ts
 2023-11-17 13:28:42 +09:00
syuilo
9d78a1a8b3 enhance(backend): make ftt db fallback configurable 2023-11-16 10:20:57 +09:00
かっこかり
49e0681f80
Merge branch 'develop' into schedule-note 2023-11-16 02:51:53 +09:00
mattyatea
d0db959818
Merge remote-tracking branch 'mi-dev/develop' into emoji-req 
# Conflicts:
#	CHANGELOG.md
 2023-11-15 14:29:33 +09:00
mattyatea
36292549c5
Merge remote-tracking branch 'mi-dev/develop' into emoji-req 2023-11-15 14:24:41 +09:00
mattyatea
d439dd66f9 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkNotifications.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/ui/_common_/navbar.vue
#	packages/frontend/src/ui/_common_/stream-indicator.vue
 2023-11-15 13:32:09 +09:00
atsuchan
6cc0685f2a
Fix(frontend): サーバーサイレンス (#12292) 2023-11-15 11:14:27 +09:00
かっこかり
cb00b236d2
Merge branch 'develop' into schedule-note 2023-11-14 22:18:00 +09:00
syuilo
2d2eefe3d4 feat: メールアドレスを使用してユーザー名を割り出す機能 
Resolve #10158
 2023-11-14 07:58:18 +09:00
kakkokari-gtyih
7694d17b2e (add) ロール制御 2023-11-11 18:53:25 +09:00
mattyatea
da40b4df17 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkNoteDetailed.vue
#	packages/frontend/src/components/global/MkCustomEmoji.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/pages/settings/general.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/scripts/nyaize.ts
 2023-11-05 21:25:11 +09:00
syuilo
c2ddb649f8 enhance: 非通知なお知らせを作成できるように 2023-11-05 09:04:38 +09:00
syuilo
b92b704592 fix control panel navigation 2023-11-04 14:37:47 +09:00
mattyatea
cb1005811d Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	locales/en-US.yml
#	locales/index.d.ts
#	locales/ja-JP.yml
#	package.json
#	packages/backend/src/server/api/endpoints/notes/create.ts
#	packages/frontend/src/components/MkDrive.file.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkNoteHeader.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkReactionsViewer.reaction.vue
#	packages/frontend/src/components/MkUserSetupDialog.vue
#	packages/frontend/src/pages/timeline.tutorial.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/misskey-js/etc/misskey-js.api.md
 2023-11-04 01:24:44 +09:00
syuilo
ee191169f5 enhance(frontend): tweak announcement manage ui 2023-11-03 17:14:35 +09:00
mattyatea
9199a493f1 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	package.json
#	packages/backend/src/core/RoleService.ts
#	packages/backend/src/server/api/endpoints/notes/create.ts
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/const.ts
#	packages/frontend/src/pages/admin/roles.editor.vue
#	packages/frontend/src/pages/settings/general.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/store.ts
#	packages/frontend/src/ui/_common_/stream-indicator.vue
#	packages/frontend/src/ui/universal.vue
 2023-10-30 18:33:03 +09:00
syuilo
6a8375b045 Merge branch 'develop' into pr/12085 2023-10-30 16:24:24 +09:00
GrapeApple0
4f180ad45c
feat: アイコンデコレーションの管理をロールで設定できるように (#12173) 
* アイコンデコレーションの管理をロールで設定できるように

* インポートミス

* Update packages/frontend/src/ui/_common_/common.ts

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

* Update packages/frontend/src/ui/_common_/common.ts

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

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-10-30 15:33:15 +09:00
syuilo
50b16e36c7 enhance(frontend): URL入力フォームのtypeをurlに 
Resolve #12137
 2023-10-30 13:41:40 +09:00
mattyatea
b3084f45b4 Merge remote-tracking branch 'misskey-original/develop' into develop 2023-10-29 18:11:02 +09:00
mattyatea
577aa85919
Merge remote-tracking branch 'mi-dev/develop' into emoji 
# Conflicts:
#	CHANGELOG.md
 2023-10-29 16:28:56 +09:00
syuilo
7436e0da18 lint fixes 2023-10-29 16:09:20 +09:00
mattyatea
18e1fb7299
Merge remote-tracking branch 'mi-dev/develop' into emoji 2023-10-24 20:44:33 +09:00
mattyatea
cc5037cb85 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
#	packages/frontend/package.json
 2023-10-23 19:29:34 +09:00
syuilo
e6c54de814 enhance(backend): RedisへのTLのキャッシュをオフにできるように 2023-10-23 15:17:25 +09:00
mattyatea
366ea80a06 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/frontend/package.json
#	packages/frontend/src/components/MkMention.vue
#	packages/frontend/src/components/global/MkAvatar.vue
#	packages/frontend/src/pages/settings/general.vue
 2023-10-21 20:47:50 +09:00
mattyatea
27a7d0bbf7
Merge remote-tracking branch 'mi-dev/develop' into emoji 
# Conflicts:
#	packages/backend/src/models/RepositoryModule.ts
#	packages/misskey-js/etc/misskey-js.api.md
 2023-10-21 19:56:27 +09:00
syuilo
2c0a139da6
feat: Avatar decoration (#12096) 
* wip

* Update ja-JP.yml

* Update profile.vue

* .js

* Update home.test.ts
 2023-10-21 18:38:07 +09:00
mattyatea
f5658cd47d
Merge remote-tracking branch 'mi-dev/develop' into emoji-request 
# Conflicts:
#	package.json
 2023-10-19 22:34:59 +09:00
mattyatea
7149961f33
fix: iroiro 
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>

カスタム絵文字一覧を一覧、新着、申請中に分離

(cherry picked from commit 5c464cd1bc177f0276397a686160c5c77e774d10)

fix: 絵文字管理画面の表示不具合の修正

(cherry picked from commit 5300ff763bb008699b35dc6e219b50ac1c4fd7af)
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>

Fix:draftが2重に宣言されてた

Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-10-19 22:18:31 +09:00
tar_bin
08311ece41
Feat:絵文字申請機能の追加 2023-10-19 22:18:30 +09:00
mattyatea
4f6b0ccf6b emoji 2023-10-19 01:16:11 +09:00
mattyatea
6cc503dfc9 fix 2023-10-18 23:14:25 +09:00
mattyatea
c7c70c1c30 Merge remote-tracking branch 'misskey-mattyatea/emoji-request' into develop 
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	packages/backend/src/core/UserFollowingService.ts
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
 2023-10-18 22:37:42 +09:00
mattyatea
eacb74cb44 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	package.json
#	packages/backend/src/core/entities/NoteEntityService.ts
#	packages/backend/src/models/Note.ts
#	packages/backend/src/server/api/endpoints/roles/notes.ts
#	packages/backend/src/server/api/stream/channels/global-timeline.ts
#	packages/backend/src/server/api/stream/channels/home-timeline.ts
#	packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
#	packages/backend/src/server/api/stream/channels/local-timeline.ts
#	packages/frontend/src/components/MkFollowButton.vue
#	packages/frontend/src/pages/settings/general.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/store.ts
 2023-10-18 21:22:51 +09:00
まっちゃてぃー
198f7748ce
Merge branch 'develop' into emoji-request 2023-10-16 21:50:42 +09:00
まっちゃてぃー
5efd01ba70
feat: サーバーサイレンス機能を追加 (#12031) 
* feat : サーバーサイレンスを追加

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update locale

* Update instance-info.vue

* update misskey-js.api.md

* lint fix

* migration fix

* 既存のものを使うように

* fix

* 色々直した

* Update packages/frontend/src/pages/admin/instance-block.vue

* Update packages/frontend/src/pages/admin/instance-block.vue

* Update packages/frontend/src/components/MkInstanceCardMini.vue

* Update packages/backend/src/core/entities/InstanceEntityService.ts

* Update packages/backend/src/core/entities/InstanceEntityService.ts

* Update packages/backend/src/core/entities/InstanceEntityService.ts

* Update packages/backend/src/core/UserFollowingService.ts

* Update packages/backend/src/core/UserFollowingService.ts

* fix: サイレンスされてるサーバーからの投稿は全部ホームにする

* fix: undefinedでfalseを返すようにした

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-10-16 20:11:27 +09:00
mattyatea
c0c6b87c94 lint fix 2023-10-14 17:33:42 +09:00
mattyatea
57331536f2 lint fix 2023-10-14 17:00:14 +09:00
tar_bin
ad27562269 絵文字の登録リクエスト機能の追加 
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
 2023-10-14 12:39:11 +09:00
tar_bin
40979b0aa5 絵文字の登録リクエスト機能の追加 
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
 2023-10-14 12:39:11 +09:00