Merge remote-tracking branch 'origin/2.3' #3936
Merged
Conversation
This file contains 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
Add editor config file
Add WMTS queryable zoom limits documentation
use variable web_protocol (like in docker template)
Send cookies only on https
Makes docker-compose-run compatible with Windows
Fix OpenLayers in the admin interface
Don't have dupplicated fulltextsearchUrl
Do an xmllint on the jasper report print templates
Fix the QGIS server plugin
fredj
reviewed
Jul 26, 2018
package.json
Outdated
| @@ -15,7 +15,7 @@ | |||
| "jstreegrid": "3.9.4", | |||
| "magicsuggest-alpine": "1.0.0", | |||
| "ngeo": "2.4.0-daily.20180716T092301Z.76f80c4.HEAD", | |||
| "openlayers": "https://api.github.com/repos/openlayers/openlayers/tarball/f284b95cb897b3ce1b49b985b58ebe1ca76be1fe", | |||
| "openlayers": "4.6.5", | |||
There was a problem hiding this comment.
use the latest 5.x release instead ? 5.1.3
There was a problem hiding this comment.
No, this is for the admin interface...
fredj
approved these changes
Jul 26, 2018
sbrunner
force-pushed
the
merge23
branch
2 times, most recently
from
6c44252
to
adf814c
Compare
sbrunner
force-pushed
the
merge23
branch
2 times, most recently
from
6485a49
to
dbe3d7e
Compare
fredj
approved these changes
Jul 27, 2018
Fixes for ngeo upgrade
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.