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

[Time Conductor] Persist Time Conductor state in URL #1325

Merged
merged 2 commits into from
Nov 30, 2016
Merged

Conversation

akhenry
Copy link
Contributor

@akhenry akhenry commented Nov 14, 2016

Currently large delta with master due to it being based on open1193 / #1287 which has not been merged yet. Should either change base to open1193 for review, or wait until #1287 is merged.

Author Checklist

  1. Changes address original issue? Y
  2. Unit tests included and/or updated with changes? Y
  3. Command line build passes? Y
  4. Changes have been smoke-tested? Y

@akhenry akhenry added this to the Roddenberry milestone Nov 14, 2016
@akhenry akhenry assigned akhenry and unassigned VWoeltjen Nov 25, 2016
@akhenry
Copy link
Contributor Author

akhenry commented Nov 25, 2016

Reassigning back to me, found an issue with deltas loaded from URL not being reflected in UI.

Fixing tests

Fixed broken tests

Added tests

Fixed style errors
@larkin
Copy link
Contributor

larkin commented Nov 25, 2016

@akhenry After squash-merging #1287 I went ahead and rebased this branch onto master and resolved some small conflicts. Hope that's helpful for you, but it does mean you'll have to wipe out your local branch and checkout a new copy from origin. If this is a pain in the butt, feel free to force-push your local version of open1231. I also archived the old version of the branch as open1231-pre-rebase just in case.

@akhenry
Copy link
Contributor Author

akhenry commented Nov 29, 2016

I take it back, this totally works, deltas and all. CONFUSION INTENSIFIES Over to you @VWoeltjen

@akhenry akhenry assigned VWoeltjen and unassigned akhenry Nov 29, 2016
@VWoeltjen
Copy link
Contributor

Reviewer Checklist

  1. Changes appear to address issue? Y
  2. Appropriate unit tests included? Y
  3. Code style and in-line documentation are appropriate? Y
  4. Commit messages meet standards? Y

@VWoeltjen VWoeltjen merged commit f855956 into master Nov 30, 2016
@VWoeltjen VWoeltjen deleted the open1231 branch November 30, 2016 21:17
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.

3 participants