Merge branch 'develop' into 'redmine-issues/19670'
# Conflicts: # src/components/ExtraForm.vue
Showing
- CHANGELOG.md 11 additions, 0 deletionsCHANGELOG.md
- package.json 1 addition, 1 deletionpackage.json
- public/config/config.json.sample 2 additions, 1 deletionpublic/config/config.json.sample
- src/components/AppHeader.vue 1 addition, 1 deletionsrc/components/AppHeader.vue
- src/components/Dropdown.vue 10 additions, 2 deletionssrc/components/Dropdown.vue
- src/components/ExtraForm.vue 8 additions, 8 deletionssrc/components/ExtraForm.vue
- src/components/Feature/Detail/FeatureHeader.vue 3 additions, 2 deletionssrc/components/Feature/Detail/FeatureHeader.vue
- src/components/Map/Geocoder.vue 92 additions, 67 deletionssrc/components/Map/Geocoder.vue
- src/components/Project/Detail/ProjectFeatureTypes.vue 2 additions, 1 deletionsrc/components/Project/Detail/ProjectFeatureTypes.vue
- src/components/Project/Edition/ProjectAttributeForm.vue 2 additions, 2 deletionssrc/components/Project/Edition/ProjectAttributeForm.vue
- src/components/Project/FeaturesListAndMap/FeaturesListAndMapFilters.vue 1 addition, 1 deletion.../Project/FeaturesListAndMap/FeaturesListAndMapFilters.vue
- src/components/Projects/DropdownMenuItem.vue 11 additions, 1 deletionsrc/components/Projects/DropdownMenuItem.vue
- src/components/Projects/ProjectsMenu.vue 13 additions, 11 deletionssrc/components/Projects/ProjectsMenu.vue
- src/router/index.js 10 additions, 5 deletionssrc/router/index.js
- src/services/map-service.js 2 additions, 2 deletionssrc/services/map-service.js
- src/store/index.js 59 additions, 16 deletionssrc/store/index.js
- src/views/Project/ProjectEdit.vue 13 additions, 22 deletionssrc/views/Project/ProjectEdit.vue
- src/views/Projects/ProjectsList.vue 2 additions, 5 deletionssrc/views/Projects/ProjectsList.vue
Loading
Please register or sign in to comment