Merge branch 'develop' into 'redmine-issues/11087'
# Conflicts: # src/assets/js/map-util.js
No related branches found
No related tags found
Showing
- src/assets/js/map-util.js 88 additions, 88 deletionssrc/assets/js/map-util.js
- src/services/feature-api.js 13 additions, 0 deletionssrc/services/feature-api.js
- src/store/modules/feature.js 12 additions, 9 deletionssrc/store/modules/feature.js
- src/store/modules/feature_type.js 11 additions, 5 deletionssrc/store/modules/feature_type.js
- src/store/modules/map.js 2 additions, 2 deletionssrc/store/modules/map.js
- src/views/feature/Feature_detail.vue 32 additions, 12 deletionssrc/views/feature/Feature_detail.vue
- src/views/feature/Feature_edit.vue 6 additions, 5 deletionssrc/views/feature/Feature_edit.vue
- src/views/feature/Feature_list.vue 2 additions, 3 deletionssrc/views/feature/Feature_list.vue
- src/views/feature_type/Feature_type_detail.vue 12 additions, 9 deletionssrc/views/feature_type/Feature_type_detail.vue
- src/views/feature_type/Feature_type_edit.vue 23 additions, 2 deletionssrc/views/feature_type/Feature_type_edit.vue
- src/views/project/Project_detail.vue 34 additions, 25 deletionssrc/views/project/Project_detail.vue
Loading
Please register or sign in to comment