Commit graph

6 commits

Author SHA1 Message Date
mattyatea de3f4ce29c Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	packages/frontend/src/components/MkChannelFollowButton.vue
#	packages/frontend/src/components/MkDrive.folder.vue
#	packages/frontend/src/components/MkDrive.navFolder.vue
#	packages/frontend/src/components/MkEmojiEditDialog.vue
#	packages/frontend/src/components/MkFollowButton.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkSignupDialog.form.vue
#	packages/frontend/src/pages/about.vue
#	packages/frontend/src/pages/admin/index.vue
#	packages/frontend/src/pages/admin/instance-block.vue
#	packages/frontend/src/pages/avatar-decorations.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
#	packages/frontend/src/pages/settings/mute-block.vue
#	packages/frontend/src/pages/settings/profile.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/pages/user/home.vue
2024-01-06 14:24:39 +09:00
おさむのひと fa9c4a19b9
refactor(frontend): os.tsに引き込んだscripts/api.tsの再exportをやめる (#12694)
* refactor(frontend): os.tsに引き込んだscripts/api.tsの再exportをやめる

* fix

* fix

* renate to "misskeyApi"

* rename file
2024-01-04 18:32:46 +09:00
syuilo ea41cc6ec0 refactor(frontend): reduce type errors 2024-01-04 15:30:40 +09:00
mattyatea a4974e3c8a defaultOpen 2024-01-03 02:13:25 +09:00
mattyatea 4cdf048a7c アイコンデコレーションのカテゴリ 2024-01-03 01:25:54 +09:00
syuilo 776eea736a enhance(frontend): tweak avatar decoration setting ui 2023-12-16 17:37:50 +09:00
Renamed from packages/frontend/src/pages/settings/profile.avatar-decoration.vue (Browse further)