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

ui-spacetimechart: add ConflictLayer #438

Merged
merged 2 commits into from
Sep 17, 2024
Merged

ui-spacetimechart: add ConflictLayer #438

merged 2 commits into from
Sep 17, 2024

Conversation

emersion
Copy link
Member

@emersion emersion commented Sep 6, 2024

Super basic for now. Will be enhanced later on with borders and a tooltip.

Closes: #416

@emersion emersion force-pushed the emr/conflicts-layer branch 4 times, most recently from 39206f8 to 88a2110 Compare September 10, 2024 13:44
@emersion emersion marked this pull request as ready for review September 10, 2024 14:02
@emersion emersion requested a review from a team as a code owner September 10, 2024 14:02
@emersion emersion requested review from Akctarus, SharglutDev and RomainValls and removed request for Akctarus September 10, 2024 14:04
Copy link
Contributor

@SharglutDev SharglutDev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm and tested, good job ! I would have some questions, but as it's only the first step of the layer, the rest gonna probably come on other PR so I'll check for that on the next ones :)

Copy link
Contributor

@RomainValls RomainValls left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM and tested ✅

@emersion emersion added this pull request to the merge queue Sep 17, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 17, 2024
For now it only contains the conflicts layer, but more can be added
in the future, e.g. occupancy.

Signed-off-by: Simon Ser <[email protected]>
@emersion emersion enabled auto-merge September 17, 2024 12:02
@emersion emersion added this pull request to the merge queue Sep 17, 2024
Merged via the queue into dev with commit f1b958b Sep 17, 2024
6 checks passed
@emersion emersion deleted the emr/conflicts-layer branch September 17, 2024 12:07
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.

spacetimechart: add conflicts layer
3 participants