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.

Sign up for GitHub

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

Update all minor versions (prod-2-9-advance) (minor) #1557

Merged
merged 3 commits into from
Jan 6, 2025
Merged

Update all minor versions (prod-2-9-advance) (minor) #1557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26b5af4
Update all minor versions
renovate[bot] Jan 6, 2025
237027a
Apply pre-commit fix
geo-ghci-int[bot] Jan 6, 2025
f62c413
Update from base branch
geo-ghci-int[bot] Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions custom/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions custom/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ ujson = "5.10.0"
azure-storage-blob = "12.24.0"
azure-identity = "1.19.0"
papyrus = "2.6.2"
geojson = "3.1.0"
geojson = "3.2.0"
# To fix CVE
urllib3 = { version = "2.2.3", optional = true }
certifi = { version = "2024.8.30", optional = true }
urllib3 = { version = "2.3.0", optional = true }
certifi = { version = "2024.12.14", optional = true }
webob = { version = "1.8.9", optional = true }
cryptography = { version = "44.0.0", optional = true }

[tool.poetry.group.dev.dependencies]
prospector = { version = "1.13.3", extras = ["with_bandit", "with_mypy", "with_pyroma", "with_ruff"] }
prospector-profile-utils = "1.14.1"
prospector-profile-duplicated = "1.8.1"
prospector-profile-duplicated = "1.9.0"
types-requests = "2.32.0.20241016"
types-oauthlib = "3.2.0.20240806"
6 changes: 3 additions & 3 deletions geoportal/geomapfish_geoportal/static/cog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title>Test swissalti3d COG</title>
<link
crossorigin="anonymous"
href="https://cdn.jsdelivr.net/npm/ol@10.2.1/ol.css"
href="https://cdn.jsdelivr.net/npm/ol@10.3.1/ol.css"
integrity="sha384-Jpg1uvTciFJuHq+90Ly0/2SKRT9yS5OhbIN5FuFoFWji9fc44ok8xxO88CJi8Z5W"
referrerpolicy="no-referrer"
rel="stylesheet"
Expand All @@ -27,9 +27,9 @@
<div id="map"></div>
<script
crossorigin="anonymous"
integrity="sha384-2biaJbygszOKXKsLbF+auMBrB377U1RJUvQIsPmEOtUSKzkcsTOZSykhqnkmx2QU"
integrity="sha384-GtOM9G1JWFKmDbfOLBrez9YebIrX1pqVVtYukhqrKOtyneLNxnTIFMe8ER850GT/"
referrerpolicy="no-referrer"
src="https://cdn.jsdelivr.net/npm/ol@10.2.1/dist/ol.js"
src="https://cdn.jsdelivr.net/npm/ol@10.3.1/dist/ol.js"
></script>
<script
crossorigin="anonymous"
Expand Down
1 change: 1 addition & 0 deletions qgisserver/project.qgs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3412,6 +3412,7 @@ def my_form_open(dialog, layer, feature):
</wgs84extent>
<id>landuse_7fa0e9e8_a78c_4702_acc7_937cb583ed13</id>
<datasource>service='demo' sslmode=require key='fid' srid=2056 type=Polygon checkPrimaryKeyUnicity='1' table="geodata"."osm_landuse" (geom)</datasource>
<title wfs="">Landuse test</title>
<keywordList>
<value></value>
</keywordList>
Expand Down
4 changes: 2 additions & 2 deletions tilegeneration/config.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ ${DISABLE_LOCAL} admin_path: tiles/admin

process:
optipng_test:
- cmd: optipng -o7 -simulate %(in)s
- cmd: optipng -fix -o7 -simulate %(in)s
optipng:
- cmd: optipng %(args)s -zc9 -zm8 -zs3 -f5 %(in)s
- cmd: optipng %(args)s -fix -zc9 -zm8 -zs3 -f5 %(in)s
arg:
default: '-q'
quiet: '-q'
Expand Down
5 changes: 4 additions & 1 deletion ui/desktop.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@

<!-- Selection -->
<gmf-selection-button slot="tool-button"></gmf-selection-button>
<div slot="tool-panel-query" class="row">
<div slot="tool-panel-selection" class="row">
<div class="col-sm-12">
<div class="gmf-app-tools-content-heading">{{'Selection' | translate}}</div>
<ngeo-query-panel></ngeo-query-panel>
Expand Down Expand Up @@ -441,6 +441,9 @@
gmf-map-map="mainCtrl.map"
gmf-map-manage-resize="mainCtrl.manageResize"
gmf-map-resize-transition="mainCtrl.resizeTransition"
gmf-contextualdata=""
gmf-contextualdata-display="mainCtrl.contextualdataActive"
gmf-contextualdata-map="::mainCtrl.map"
>
</gmf-map>
<ngeo-query
Expand Down
Loading
Loading