fawney19
|
cd1aa92931
|
Merge branch 'merge-pr-483'
|
2026-05-19 02:28:43 +08:00 |
|
fawney19
|
9fc9c334c9
|
Merge remote-tracking branch 'origin/pr/487'
# Conflicts:
# crates/aether-data/src/lifecycle/bootstrap/postgres.rs
# crates/aether-data/src/lifecycle/migrate/tests.rs
# crates/aether-data/src/repository/oauth_providers/postgres.rs
# crates/aether-data/src/repository/oauth_providers/sqlite.rs
# frontend/src/views/admin/OAuthSettings.vue
|
2026-05-19 02:27:39 +08:00 |
|
fawney19
|
c563c192b7
|
Merge remote-tracking branch 'origin/pr-483' into merge-pr-483
# Conflicts:
# apps/aether-gateway/src/ai_serving/planner/standard/openai/chat/decision/payload.rs
# apps/aether-gateway/src/ai_serving/planner/standard/openai/chat/decision/request.rs
# apps/aether-gateway/src/ai_serving/planner/standard/openai/responses/decision/payload.rs
# apps/aether-gateway/src/ai_serving/planner/standard/openai/responses/decision/request.rs
# apps/aether-gateway/src/execution_runtime/chatgpt_web_image.rs
|
2026-05-19 02:23:14 +08:00 |
|
fawney19
|
afedd90c80
|
Merge commit 'refs/pull/481/head' of github-fawney19:fawney19/Aether
# Conflicts:
# apps/aether-gateway/src/ai_serving/api.rs
# apps/aether-gateway/src/ai_serving/planner/standard/family/request.rs
# apps/aether-gateway/src/ai_serving/planner/standard/openai/chat/decision/request.rs
# apps/aether-gateway/src/ai_serving/planner/standard/openai/responses/decision/request.rs
|
2026-05-19 01:46:41 +08:00 |
|
fawney19
|
d392681c58
|
Merge branch 'pr-478'
# Conflicts:
# apps/aether-gateway/src/data/state/mod.rs
# apps/aether-gateway/src/handlers/admin/mod.rs
# apps/aether-gateway/src/handlers/admin/routes.rs
# crates/aether-data/src/lifecycle/bootstrap/postgres.rs
# crates/aether-data/src/lifecycle/migrate/tests.rs
# crates/aether-data/src/repository/announcements/postgres.rs
# frontend/src/features/auth/components/RegisterDialog.vue
|
2026-05-19 01:27:42 +08:00 |
|
ZheFox
|
c58ce63fc3
|
Merge branch 'fawney19:main' into main
|
2026-05-19 00:50:52 +08:00 |
|
ZheFox
|
995ab302be
|
Merge remote-tracking branch 'upstream/main'
# Conflicts:
# apps/aether-gateway/src/handlers/admin/provider/endpoints_admin/payloads.rs
# apps/aether-gateway/src/handlers/admin/provider/endpoints_admin/reads.rs
# apps/aether-gateway/src/handlers/admin/provider/endpoints_admin/update.rs
# apps/aether-gateway/src/tests/control/admin/endpoints/routes.rs
# frontend/src/features/models/components/GlobalModelFormDialog.vue
# frontend/src/features/providers/components/ProviderModelFormDialog.vue
# frontend/src/features/providers/components/provider-tabs/__tests__/model-test-request.spec.ts
# frontend/src/features/providers/components/provider-tabs/model-test-request.ts
|
2026-05-18 22:02:31 +08:00 |
|
RWDai
|
24129d7f12
|
Merge upstream/main into feat/356-usage-record-columns
|
2026-05-18 20:33:05 +08:00 |
|
RWDai
|
0a26accca4
|
Merge remote-tracking branch 'upstream/main' into feat/356-usage-record-columns
|
2026-05-18 17:49:35 +08:00 |
|
fawney19
|
40e925680c
|
Merge remote-tracking branch 'origin/pr-480'
|
2026-05-18 16:46:35 +08:00 |
|
fawney19
|
3f0fd15395
|
Merge remote-tracking branch 'origin/pr-491'
|
2026-05-18 16:14:07 +08:00 |
|
fawney19
|
90dbc279fd
|
Merge remote-tracking branch 'origin/pr-476'
|
2026-05-18 16:13:45 +08:00 |
|
ZheFox
|
a4012ad353
|
Merge upstream/main
|
2026-05-18 13:11:11 +08:00 |
|
ZheFox
|
a10c02ef63
|
feat(billing): add image output range pricing support
|
2026-05-18 11:52:01 +08:00 |
|
fawney19
|
92813e6122
|
feat: add routing profile scheduling policies
|
2026-05-18 11:03:49 +08:00 |
|
ZheFox
|
0b2a8fafce
|
feat(billing): add image output pricing and usage tracking
|
2026-05-18 02:49:56 +08:00 |
|
ZheFox
|
c024c782e4
|
feat(billing): add image quality pricing and usage tracking
|
2026-05-18 00:11:30 +08:00 |
|
MMEXA
|
995be3781a
|
fix(frontend): align usage APIs with Rust routes
|
2026-05-17 15:37:52 +00:00 |
|
dalamudx
|
48deff15c4
|
fix(oauth): fix login failures and add provider icon_url config
- Fix FIND_OAUTH_LINKED_USER_SQL missing allowed_providers_mode columns
- Fix TOUCH_OAUTH_LINK_SQL json/jsonb type mismatch in COALESCE
- Add icon_url field to OAuth provider config (DB, API, frontend)
- Fix admin OAuth test: accept 404 as reachable, use system proxy
|
2026-05-17 21:33:02 +08:00 |
|
mayrain
|
936e1ae37b
|
feat(grok): add admin oauth and quota support
|
2026-05-16 21:15:38 +08:00 |
|
mayrain
|
edacc5a7d0
|
feat(model-test): add image-aware request helpers
|
2026-05-16 21:15:27 +08:00 |
|
fawney19
|
56994d4c29
|
fix(frontend): relax system import limits
|
2026-05-16 19:00:20 +08:00 |
|
Entropy.Xu
|
973eb1a614
|
feat(referrals): 添加邀请返利和注册确认功能
|
2026-05-16 17:41:52 +08:00 |
|
RWDai
|
4f584a71df
|
Add usage metadata frontend plumbing
|
2026-05-16 15:55:38 +08:00 |
|
RWDai
|
6dd5d2fe14
|
Add failure notice resolver for usage records
|
2026-05-16 15:42:13 +08:00 |
|
HsungKayphoon
|
74a1e5ad7d
|
feat: add scoped manual usage cleanup
|
2026-05-16 15:23:44 +08:00 |
|
fawney19
|
893ac18d60
|
Merge PR #469: 修复用户可见性、额度、验证与 Codex 探测
|
2026-05-16 14:28:19 +08:00 |
|
fawney19
|
a7fdce493b
|
feat: paginate provider keys from backend
|
2026-05-16 12:52:49 +08:00 |
|
fawney19
|
f59cf1090d
|
feat(admin): unify system data management and aggregate import/export
|
2026-05-16 02:16:53 +08:00 |
|
Entropy.Xu
|
1a50c5e112
|
merge: 同步主线并解决用户侧验证冲突
|
2026-05-16 01:25:42 +08:00 |
|
Entropy.Xu
|
bbd3c30b0e
|
fix(public): 修复用户可见性、额度、验证与 Codex 探测
|
2026-05-16 00:51:44 +08:00 |
|
fawney19
|
d53546d56f
|
Make pool probing request-driven
|
2026-05-16 00:18:47 +08:00 |
|
fawney19
|
b09fd48eee
|
Merge remote-tracking branch 'origin/pr/462'
|
2026-05-15 22:28:40 +08:00 |
|
fawney19
|
e4f427f921
|
Merge remote-tracking branch 'entropy-xu/payment-billing-plans'
# Conflicts:
# crates/aether-data/src/lifecycle/bootstrap/postgres.rs
# crates/aether-data/src/lifecycle/migrate/tests.rs
# frontend/src/views/admin/Users.vue
|
2026-05-15 16:37:17 +08:00 |
|
fawney19
|
170218bb26
|
Merge pull request #458 from RWDai/opencode/sunny-orchid
Add one-click proxy node installation
|
2026-05-15 12:49:08 +08:00 |
|
fawney19
|
8e0f8003a9
|
fix: simplify account self-check config
|
2026-05-15 02:21:11 +08:00 |
|
fawney19
|
54a8312e46
|
feat: add adaptive pool metrics and self-check
|
2026-05-15 02:21:11 +08:00 |
|
Entropy.Xu
|
85f48123b6
|
feat(auth): 添加 Turnstile 注册防护
|
2026-05-15 01:54:20 +08:00 |
|
RWDai
|
98a54b4633
|
Add proxy install session client API
|
2026-05-14 19:34:56 +08:00 |
|
fawney19
|
509bd30252
|
Redesign sensitive info protection settings
|
2026-05-14 11:14:20 +08:00 |
|
fawney19
|
91955ad1e0
|
Merge remote-tracking branch 'origin/pr/451' into aether-rust-pioneer
|
2026-05-14 02:10:37 +08:00 |
|
fawney19
|
b41a4a000f
|
Merge remote-tracking branch 'origin/pr/435' into aether-rust-pioneer
|
2026-05-14 02:02:26 +08:00 |
|
fawney19
|
e251a63cb3
|
Merge remote-tracking branch 'pr-434/fix-provider-model-test-compat' into aether-rust-pioneer
|
2026-05-14 01:28:33 +08:00 |
|
Kayphoon
|
2958041dc7
|
feat(gateway): add reversible chat pii redaction
|
2026-05-13 18:25:13 +08:00 |
|
fawney19
|
3c2497f019
|
Fix admin pool sorting and OAuth refresh
|
2026-05-13 09:16:52 +08:00 |
|
Entropy.Xu
|
3fb007a56d
|
Merge remote-tracking branch 'origin/aether-rust-pioneer' into payment-billing-plans
# Conflicts:
# crates/aether-data/src/lifecycle/bootstrap/postgres.rs
# crates/aether-data/src/lifecycle/migrate/tests.rs
|
2026-05-13 01:29:18 +08:00 |
|
Entropy.Xu
|
10285c5eb9
|
feat: add payment gateway and billing plans
|
2026-05-13 01:18:38 +08:00 |
|
Kayphoon
|
15800d7a80
|
feat(admin): manual request-records cleanup with typed confirmation
|
2026-05-13 00:36:43 +08:00 |
|
mayrain
|
43c476d54a
|
fix: refine provider model test dialog
|
2026-05-12 20:11:37 +08:00 |
|
fawney19
|
92e4066977
|
Merge pull request #432 from RWDai/fix/cli-install-copy
Add admin API key CLI install sessions
|
2026-05-12 16:50:24 +08:00 |
|