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

Chore/resolve dev stage conflicts #2931

Merged
merged 26 commits into from
Aug 27, 2024
Merged

Conversation

finnar-bin
Copy link
Contributor

No description provided.

agalin920 and others added 26 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)
Prevents multipage table pinned columns from being stored in local
storage
Resolves #2824 

#### Demo
[Screencast from Tuesday, 30 July, 2024 09:05:20 AM
PST.webm](https://github.com/user-attachments/assets/07281341-7b91-45f9-9f99-245b16d83242)
- Adds created by and zuid sorting
- Rename some columns for consistency
- Add table column header sorting
- Sync sorting pill button and column header sorting status
- Save sort order to local storage

Resolves #2836 
Resolves #2845
Allows users to replace an existing file with a new file of the same
file type without changing the file's name and url in our DAM.
Resolves #2661 

### Dependencies
- Backend Change:
zesty-io/media-manager-service#150
- New icon: zesty-io/material#105

### Demo


https://github.com/user-attachments/assets/5e68c830-e512-42b9-b6e1-15f6405d5671
…#2922)

- Makes sure that `one_to_one` and `one_to_many` field values are
properly resolved to whatever the actual text is.
- This also makes sure that each individual `one_to_one` and
`one_to_many` chip no longer has to do an api call to retrieve their
data

Resolves #2901 

### Demo

![image](https://github.com/user-attachments/assets/bd59ee28-ea4f-4c2f-b0b7-33c9453cf084)
@finnar-bin finnar-bin changed the base branch from stage to dev August 27, 2024 07:18
@finnar-bin finnar-bin requested a review from agalin920 August 27, 2024 07:18
@finnar-bin finnar-bin changed the base branch from dev to stage August 27, 2024 07:20
@finnar-bin finnar-bin changed the base branch from stage to dev August 27, 2024 07:20
@finnar-bin finnar-bin enabled auto-merge (squash) August 27, 2024 07:21
@finnar-bin finnar-bin disabled auto-merge August 27, 2024 22:08
@finnar-bin finnar-bin changed the base branch from dev to stage August 27, 2024 22:10
@finnar-bin finnar-bin merged commit 0ec8716 into stage Aug 27, 2024
@finnar-bin finnar-bin deleted the chore/resolve-dev-stage-conflicts branch August 27, 2024 22:20
@finnar-bin finnar-bin restored the chore/resolve-dev-stage-conflicts branch October 3, 2024 00:20
@finnar-bin finnar-bin deleted the chore/resolve-dev-stage-conflicts branch October 22, 2024 01:55
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