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

Add TripStatusGroup #116

Merged
merged 2 commits into from
Dec 3, 2020
Merged

Add TripStatusGroup #116

merged 2 commits into from
Dec 3, 2020

Conversation

sgrossberndt
Copy link
Contributor

Add a TripStatusGroup consisting of parameters which describe the current status of a trip.

pvgrumbkow
pvgrumbkow previously approved these changes Nov 11, 2020
@sgrossberndt sgrossberndt added this to the v1.1 milestone Nov 11, 2020
herlitze
herlitze previously approved these changes Nov 12, 2020
@sgrossberndt
Copy link
Contributor Author

@skinkie Are you ok with 1cacd36 too?

@sgrossberndt
Copy link
Contributor Author

@skinkie Please add a review approval if you are fine with this additional change by me. Only after merging this I'll continue with the other pull requests.

pvgrumbkow
pvgrumbkow previously approved these changes Nov 17, 2020
@sgrossberndt
Copy link
Contributor Author

@herlitze @skinkie reviews please ;)

herlitze
herlitze previously approved these changes Nov 19, 2020
@herlitze
Copy link
Contributor

I am fine with this change, but I thought you wanted @skinkie to give his ok, since he was not part of the discussion in the meeting.

@sgrossberndt
Copy link
Contributor Author

Thanks, yes, wanted to and will wait for his review too :)

@skinkie
Copy link
Contributor

skinkie commented Nov 19, 2020 via email

@sgrossberndt
Copy link
Contributor Author

Fixed merge conflict, pull request content is unchanged.

@sgrossberndt
Copy link
Contributor Author

This patch was your proposal, @skinkie - please check whether its the correct term "unplanned" and update the branch and pull request if necessary. Let's discuss and merge it at 2020-12-03 if necessary.

@sgrossberndt sgrossberndt merged commit 68964f8 into changes_for_v1.1 Dec 3, 2020
@sgrossberndt sgrossberndt deleted the TripStatusGroup branch December 3, 2020 11:05
@skinkie
Copy link
Contributor

skinkie commented Dec 3, 2020

@sgrossberndt you were faster

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.

5 participants