Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stage merge conflicts #2880

Merged
merged 9 commits into from
Jul 25, 2024
Merged

Stage merge conflicts #2880

merged 9 commits into from
Jul 25, 2024

Conversation

agalin920
Copy link
Contributor

No description provided.

agalin920 and others added 9 commits July 22, 2024 11:45
…ues (#2864)

Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
- Allows users to select the default currency at a model level
- Improved currency selection
- Show selected currency in the content item

Resolves #2455 
Resolves #2454 
Resolves #2790 

### Demo
![Screenshot 2024-07-24
080146](https://github.com/user-attachments/assets/411a7343-221e-46bf-9460-9457f38abcd0)
![Screenshot 2024-07-24
080228](https://github.com/user-attachments/assets/28e7ce4d-2f64-437b-8e47-60e6dceb565a)
![Screenshot 2024-07-24
080405](https://github.com/user-attachments/assets/13c66db9-bebf-4058-9024-88fe88abfd43)
@agalin920 agalin920 changed the title Stage fixes Stage merge conflicts Jul 25, 2024
@agalin920 agalin920 merged commit 55fdb6b into stage Jul 25, 2024
@agalin920 agalin920 deleted the stage-fixes branch July 25, 2024 17:26
agalin920 added a commit that referenced this pull request Aug 6, 2024
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants