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

[3941] New Content Diff UX #4165

Open
wants to merge 147 commits into
base: develop
Choose a base branch
from

Conversation

jvega190
Copy link
Member

…o feature/3941

# Conflicts:
#	ui/app/package.json
…date arrayDiff util, initial work for checkbox-group #6247
…o feature/3941

# Conflicts:
#	ui/app/package.json
#	ui/app/src/components/SingleItemSelector/SingleItemSelector.tsx
#	yarn.lock
…o feature/3941

# Conflicts:
#	ui/app/src/components/CompareVersionsDialog/CompareVersionsDialog.tsx
…o feature/3941

# Conflicts:
#	ui/app/src/components/CompareVersionsDialog/CompareVersionsDialog.tsx
#	ui/app/src/components/CompareVersionsDialog/CompareVersionsDialogContainer.tsx
#	ui/app/src/components/ViewVersionDialog/ViewVersionDialog.tsx
@jvega190 jvega190 force-pushed the feature/3941-sidebar branch from bde5c2e to 738f716 Compare October 9, 2024 21:34
…iew/Compare Dialogs and slideouts content/xml modes actions
…o feature/3941-sidebar

# Conflicts:
#	ui/app/src/CHANGELOG.md
#	ui/app/src/components/HistoryDialog/HistoryDialogContainer.tsx
#	yarn.lock
…o feature/3941-sidebar

# Conflicts:
#	ui/app/package.json
#	ui/app/src/CHANGELOG.md
#	ui/app/src/utils/datetime.ts
#	yarn.lock
@jvega190 jvega190 marked this pull request as ready for review November 14, 2024 20:53
@rart
Copy link
Member

rart commented Nov 19, 2024

@jvega190 conflicts

…o feature/3941-sidebar

# Conflicts:
#	ui/app/src/components/CompareVersionsDialog/CompareVersions.tsx
#	ui/app/src/components/CompareVersionsDialog/CompareVersionsDialogContainer.tsx
#	ui/app/src/components/HistoryDialog/HistoryDialogContainer.tsx
#	ui/app/src/components/ViewVersionDialog/LegacyVersionDialog.tsx
#	ui/app/src/components/ViewVersionDialog/ViewVersionDialogContainer.tsx
#	ui/app/src/components/ViewVersionDialog/utils.ts
@jvega190 jvega190 marked this pull request as draft November 20, 2024 16:04
@jvega190 jvega190 marked this pull request as ready for review November 20, 2024 21:37
@jvega190 jvega190 requested a review from rart November 20, 2024 21:37
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