Resolve 4 conflicts:
- relay/compatible_handler.go: accept main's refactor (postConsumeQuota -> service.PostTextConsumeQuota)
- service/quota.go: accept main's PostClaudeConsumeQuota deletion, keep nightly's tiered billing in PostWssConsumeQuota and PostAudioConsumeQuota
- web/src/i18n/locales/{en,zh-CN}.json: merge both sets of translation keys
Post-merge integration:
- Add tiered billing (TryTieredSettle, InjectTieredBillingInfo) to PostTextConsumeQuota
- Update tool pricing calls to use nightly's generic GetToolPriceForModel/GetToolPrice API
| Name |
Last commit
|
Last Update |
|---|---|---|
| .. | ||
| personal | Loading commit data... | |
| ChannelSelectorModal.jsx | Loading commit data... | |
| ChatsSetting.jsx | Loading commit data... | |
| CustomOAuthSetting.jsx | Loading commit data... | |
| DashboardSetting.jsx | Loading commit data... | |
| DrawingSetting.jsx | Loading commit data... | |
| HttpStatusCodeRulesInput.jsx | Loading commit data... | |
| ModelDeploymentSetting.jsx | Loading commit data... | |
| ModelSetting.jsx | Loading commit data... | |
| OperationSetting.jsx | Loading commit data... | |
| OtherSetting.jsx | Loading commit data... | |
| PaymentSetting.jsx | Loading commit data... | |
| PerformanceSetting.jsx | Loading commit data... | |
| PersonalSetting.jsx | Loading commit data... | |
| RateLimitSetting.jsx | Loading commit data... | |
| RatioSetting.jsx | Loading commit data... | |
| SystemSetting.jsx | Loading commit data... |