Merge upstream v0.0.19#5
Open
saj-derilinx wants to merge 58 commits into
Open
Conversation
* Added bootstrap2 to vendor * Resources order update
… into depositar-shp_view
…nto vrk-kpa-master
Support CKAN 2.9 WebAssets....
As long as "shp" or "shapefile" is present in the resource name
[ckan#87] Add on_same_domain check to WMTS and Shapefile viewer
[ckan#85] WMTS preview: support webassets
This causes problems with sites that have wildcard CORS set up: "The value of the 'Access-Control-Allow-Origin' header in the response must not be the wildcard '*' when the request's credentials mode is 'include'." So I was just wondering if there was an overt reason for setting this up this way, or if we can change it, with this provocative commit/PR :-)
I am not familiar with ESRI's API, but this did the trick in dealing with the dataset we are looking at, and shouldn't break anything else
Closed
|
I'm not sure that I actually want to merge this one to master, but more generally make this the main branch. |
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
11 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.
No description provided.