Merge master

This commit is contained in:
Pieter Vander Vennet 2023-08-24 12:22:45 +02:00
commit 7ebb3d721c
411 changed files with 21814 additions and 8717 deletions

View file

@ -220,7 +220,7 @@
]
},
"extraLink": {
"description": "Adds an additional button on the top-left of the application.\nThis can link to an arbitrary location.\n\nNote that {lat},{lon},{zoom}, {language} and {theme} will be replaced\n\nDefault: {icon: \"./assets/svg/pop-out.svg\", href: 'https://mapcomplete.osm.be/{theme}.html?lat={lat}&lon={lon}&z={zoom}, requirements: [\"iframe\",\"no-welcome-message]},",
"description": "Adds an additional button on the top-left of the application.\nThis can link to an arbitrary location.\n\nNote that {lat},{lon},{zoom}, {language} and {theme} will be replaced\n\nDefault: {icon: \"./assets/svg/pop-out.svg\", href: 'https://mapcomplete.org/{theme}.html?lat={lat}&lon={lon}&z={zoom}, requirements: [\"iframe\",\"no-welcome-message]},",
"$ref": "#/definitions/default"
},
"enableUserBadge": {
@ -2579,4 +2579,4 @@
},
"$schema": "http://json-schema.org/draft-07/schema#",
"additionalProperties": false
}
}

View file

@ -220,7 +220,7 @@ export default {
]
},
"extraLink": {
"description": "Adds an additional button on the top-left of the application.\nThis can link to an arbitrary location.\n\nNote that {lat},{lon},{zoom}, {language} and {theme} will be replaced\n\nDefault: {icon: \"./assets/svg/pop-out.svg\", href: 'https://mapcomplete.osm.be/{theme}.html?lat={lat}&lon={lon}&z={zoom}, requirements: [\"iframe\",\"no-welcome-message]},",
"description": "Adds an additional button on the top-left of the application.\nThis can link to an arbitrary location.\n\nNote that {lat},{lon},{zoom}, {language} and {theme} will be replaced\n\nDefault: {icon: \"./assets/svg/pop-out.svg\", href: 'https://mapcomplete.org/{theme}.html?lat={lat}&lon={lon}&z={zoom}, requirements: [\"iframe\",\"no-welcome-message]},",
"$ref": "#/definitions/default"
},
"enableUserBadge": {
@ -2554,4 +2554,4 @@ export default {
}
},
"$schema": "http://json-schema.org/draft-07/schema#"
}
}