Merge branch 'develop' into 'redmine-issue/13572'
# Conflicts: # src/main.js
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 21 additions, 29 deletions.gitlab-ci.yml
- docker-compose.yaml 1 addition, 1 deletiondocker-compose.yaml
- package-lock.json 92 additions, 72 deletionspackage-lock.json
- package.json 2 additions, 1 deletionpackage.json
- src/assets/js/utils.js 1 addition, 27 deletionssrc/assets/js/utils.js
- src/components/Account/UserProjectsList.vue 32 additions, 3 deletionssrc/components/Account/UserProjectsList.vue
- src/components/Feature/Detail/FeatureComments.vue 5 additions, 3 deletionssrc/components/Feature/Detail/FeatureComments.vue
- src/components/Feature/Detail/FeatureHeader.vue 185 additions, 162 deletionssrc/components/Feature/Detail/FeatureHeader.vue
- src/components/Feature/Detail/FeatureTable.vue 15 additions, 3 deletionssrc/components/Feature/Detail/FeatureTable.vue
- src/components/Feature/Edit/FeatureExtraForm.vue 19 additions, 32 deletionssrc/components/Feature/Edit/FeatureExtraForm.vue
- src/components/Feature/FeatureEditStatusField.vue 5 additions, 2 deletionssrc/components/Feature/FeatureEditStatusField.vue
- src/components/FeatureType/FeatureTypeCustomForm.vue 14 additions, 21 deletionssrc/components/FeatureType/FeatureTypeCustomForm.vue
- src/components/ImportTask.vue 7 additions, 1 deletionsrc/components/ImportTask.vue
- src/components/Project/Detail/ProjectFeatureTypes.vue 17 additions, 16 deletionssrc/components/Project/Detail/ProjectFeatureTypes.vue
- src/components/Project/FeaturesListAndMap/FeatureListTable.vue 10 additions, 1 deletion...omponents/Project/FeaturesListAndMap/FeatureListTable.vue
- src/components/Projects/ProjectsListItem.vue 34 additions, 1 deletionsrc/components/Projects/ProjectsListItem.vue
- src/components/Projects/ProjectsMenu.vue 64 additions, 36 deletionssrc/components/Projects/ProjectsMenu.vue
- src/main.js 1 addition, 1 deletionsrc/main.js
- src/services/map-service.js 16 additions, 7 deletionssrc/services/map-service.js
- src/store/modules/feature.store.js 0 additions, 2 deletionssrc/store/modules/feature.store.js
Loading
Please register or sign in to comment