-
Notifications
You must be signed in to change notification settings - Fork 32
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
jvega190
wants to merge
147
commits into
craftercms:develop
Choose a base branch
from
jvega190:feature/3941-sidebar
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains 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
…o feature/3941
…rsions, ContentInstanceComponents updates craftercms#3941
…o feature/3941
…o feature/3941 # Conflicts: # ui/app/package.json
…date arrayDiff util, initial work for checkbox-group #6247
…or no content rendering craftercms#3941
…, initial work for repeating group diff craftercms#3941
…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
…zone format to display content
…s items comparison only when they differ
…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
… settings for Dialog body and MonacoWrapper
…y can't be shared between dialog and slideouts
jvega190
force-pushed
the
feature/3941-sidebar
branch
from
October 9, 2024 21:34
bde5c2e
to
738f716
Compare
… or 'deleted' in Node selector diff
…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 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
craftercms/craftercms#3941