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

Merge upstream changes #4

Merged
merged 34 commits into from
Jul 12, 2024
Merged

Conversation

jguo144
Copy link
Collaborator

@jguo144 jguo144 commented Jul 11, 2024

Description

Merge upstream changes:

  • Add on_same_domain check to WMTS and Shapefile viewer
  • Support webassets for WMTS preview
  • Migrate CSS to BS5 badges
  • Support multiple tile providers, remove Stamen tiles
  • Add leaflet-providers to webassets and attributionControl to JS modules
  • Add CKAN 2.10 and 2.11 support

u10313335 and others added 30 commits January 30, 2022 10:36
[ckan#87] Add on_same_domain check to WMTS and Shapefile viewer
[ckan#98] Add leaflet-providers to webassets and attributionControl to JS modules
Copy link

@orca-security-us orca-security-us bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Orca Security Scan Summary

Status Check Issues by priority
Passed Passed Infrastructure as Code high 0   medium 0   low 0   info 0 View in Orca
Passed Passed Secrets high 0   medium 0   low 0   info 0 View in Orca
Passed Passed Vulnerabilities high 0   medium 0   low 0   info 0 View in Orca

Copy link

@peterVorman peterVorman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link

@scastineyras scastineyras left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@scastineyras scastineyras merged commit 55ce056 into master Jul 12, 2024
11 checks passed
@scastineyras scastineyras deleted the jguo144/2024-07-11/merge-upstream branch July 12, 2024 13:07
@jguo144 jguo144 restored the jguo144/2024-07-11/merge-upstream branch July 15, 2024 20:51
@jguo144 jguo144 deleted the jguo144/2024-07-11/merge-upstream branch July 15, 2024 20:53
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.

7 participants