Hazelnoot
d8908ef2d8
merge upstream
2025-03-25 16:14:53 -04:00
Sayamame-beans
71841e365e
Enhance: 2段階認証時のリカバリーコードのファイル名にサーバーURLを含めるように ( #15677 )
...
* enhance(frontend): include server hostname and port in 2fa recovery code filename
* chore(frontend): fix mistake(use `@` for indicate server hostname)
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2025-03-19 19:34:57 +09:00
Hazelnoot
8a34d8e9d2
Merge branch 'develop' into feature/2024.9.0
...
# Conflicts:
# locales/en-US.yml
# locales/ja-JP.yml
# packages/backend/src/core/NoteCreateService.ts
# packages/backend/src/core/NoteDeleteService.ts
# packages/backend/src/core/NoteEditService.ts
# packages/frontend-shared/js/config.ts
# packages/frontend/src/boot/common.ts
# packages/frontend/src/pages/following-feed.vue
# packages/misskey-js/src/autogen/endpoint.ts
2024-10-15 18:09:11 -04:00
dakkar
f00576bce6
Merge remote-tracking branch 'misskey/master' into feature/2024.9.0
2024-10-09 15:17:22 +01:00
かっこかり
837a8e15d8
refactor(frontend): frontend-embed/src/to-be-sharedを共通化 ( #14536 )
...
* refactor(frontend): shouldCollapsedを共通化
* refactor(frontend): config.js, worker-multi-dispatch.js, intl-const.jsを共通化
* fix(frontend-shared): fix type error
* refactor(frontend): is-link.jsと、同一の振る舞いをする記述を共通化
* fix
* fix lint
* lint fixes
2024-09-10 18:39:53 +09:00
