Upstream merge+timeslider subclass#433
Merged
Merged
Conversation
…blic domain declaration
…ap Key" in tooltip tests
…ap Key" in overlay tests
…which has the "Legend/Map Key" necessary for the overlay test
…layer in note_layer tests
…blic domain declaration
…ap Key" in tooltip tests
…ap Key" in overlay tests
…which has the "Legend/Map Key" necessary for the overlay test
…layer in note_layer tests
…site into upstream-merge
…ersion of ffi-libarchive from their repo
Restored normal page loading to be synchronous. Load the time slider synchronously as part of page loading. Fixed a bad merge in directions.js. Removed inconsistent support for date parameters as query parameters, leaving only support for date parameters as hash parameters. Resolved conflicts in: app/assets/javascripts/index/directions.js app/assets/javascripts/index/export.js app/assets/javascripts/index/new_note.js
Generated by 🚫 Danger |
github-project-automation
Bot
moved this to In Production
in OpenHistoricalMap Dev Planning
erictheise
moved this from In Production
to Ready for Staging
in OpenHistoricalMap Dev Planning
erictheise
moved this from Ready for Staging
to On Staging
in OpenHistoricalMap Dev Planning
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
2 participants
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.
Rebases and incorporates #327. Includes other fixes to reduce the number of test failures and errors (OpenHistoricalMap/issues#1180) (OpenHistoricalMap/issues#1390) (OpenHistoricalMap/issues#1391).