Merge remote-tracking branch 'upstream/main'

# Conflicts: # frontend/src/components/account/CreateAccountModal.vue

Merge remote-tracking branch 'upstream/main'
# Conflicts: # frontend/src/components/account/CreateAccountModal.vue
7331220e · Edric Li · fb86002e · 4f13c8de · 7331220e · 7331220e
Commit 7331220e authored Jan 01, 2026 by Edric Li
--- a/deploy/docker-compose.override.yml
+++ b/deploy/docker-compose.override.yml
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
--- a/deploy/flow.md
+++ b/deploy/flow.md
--- a/frontend/src/components/account/AccountQuotaInfo.vue
+++ b/frontend/src/components/account/AccountQuotaInfo.vue
--- a/frontend/src/components/account/AccountStatusIndicator.vue
+++ b/frontend/src/components/account/AccountStatusIndicator.vue
--- a/frontend/src/components/account/AccountUsageCell.vue
+++ b/frontend/src/components/account/AccountUsageCell.vue
--- a/frontend/src/components/account/CreateAccountModal.vue
+++ b/frontend/src/components/account/CreateAccountModal.vue
--- a/frontend/src/components/account/ReAuthAccountModal.vue
+++ b/frontend/src/components/account/ReAuthAccountModal.vue
--- a/frontend/src/components/account/UsageProgressBar.vue
+++ b/frontend/src/components/account/UsageProgressBar.vue
--- a/frontend/src/components/common/SubscriptionProgressMini.vue
+++ b/frontend/src/components/common/SubscriptionProgressMini.vue
--- a/frontend/src/i18n/locales/en.ts
+++ b/frontend/src/i18n/locales/en.ts
--- a/frontend/src/i18n/locales/zh.ts
+++ b/frontend/src/i18n/locales/zh.ts
--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
--- a/frontend/src/views/admin/SubscriptionsView.vue
+++ b/frontend/src/views/admin/SubscriptionsView.vue
--- a/frontend/src/views/user/SubscriptionsView.vue
+++ b/frontend/src/views/user/SubscriptionsView.vue