Add Timeline component with Enabel Bootstrap Theme integration and Symfony UX Icons#12
Merged
Merged
Conversation
…d demo Co-authored-by: damienlagae <2233003+damienlagae@users.noreply.github.com>
…n and icon safety check Co-authored-by: damienlagae <2233003+damienlagae@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Add reusable Timeline component with Symfony UX Icons
Add Timeline component with Enabel Bootstrap Theme integration and Symfony UX Icons
Oct 16, 2025
Member
|
@copilot resolve conflict |
Contributor
Author
Conflict resolved! ✅ I've successfully rebased the branch onto the latest main branch and resolved the merge conflicts in:
The branch is now up-to-date with main (commit |
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
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.
Merge Conflicts Resolved ✅
I have successfully resolved the merge conflicts that occurred when rebasing the Timeline component branch onto the latest main branch.
🔧 Conflicts Resolved
config/services.yaml:Enabel\Ux\Component\Widget\Widgetwith proper template path@EnabelUx/widget/widget.html.twigEnabel\Ux\Component\Timeline\Timelinewith template@EnabelUx/timeline/timeline.html.twigdocs/index.md:widget/widget.md📊 Current Status
ccc1465)🔄 Changes Made
7dcb57ctoccc1465(latest main)The Timeline component is now fully compatible with the latest main branch and ready for merge! 🎉
Original prompt
Fixes #7
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.