chore(sync): integrate upstream main updates#119
Merged
Conversation
…igPage styles - Updated English, Russian, Simplified Chinese, and Traditional Chinese localization files to change "Antigravity Credits Retry" to "Use Antigravity Credits" and removed associated descriptions. - Modified ConfigPage.module.scss to improve layout and styling, including adjustments to widths, gaps, paddings, and border-radius for various elements. - Simplified the structure of the ConfigPage component by removing unused variables and streamlining the JSX.
- Introduced Home control plane configuration options in English, Russian, Simplified Chinese, and Traditional Chinese locales. - Added new fields for error log retention, usage statistics, and image generation settings in visual configuration. - Enhanced payload model entries to include header management and condition matching capabilities. - Updated default visual configuration values to accommodate new settings.
…tml-challenge-ui fix(auth-files): handle HTML challenge content in editor
Merge upstream/main into the CPA-Manager sync branch while preserving local CPAM features. Keep the existing UI style, Usage Service flow, monitoring code, and auth conversion behavior. Selectively retain upstream config, AuthFiles, payload-rule, dependency, and README updates while excluding large upstream UI restyling and local feature deletions.
hanazaki05
pushed a commit
to hanazaki05/CPA-Manager
that referenced
this pull request
Jun 1, 2026
chore(sync): integrate upstream main updates
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merge upstream/main into CPA-Manager while preserving local CPAM-specific features and UI direction.
Changes
Testing