Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

G

Géocontrib Frontend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Redmine
- Terraform modules
- Contributor analytics
- Model experiments

Snippets Groups Projects

a6450a6a

Commit a6450a6a authored 3 years ago by Florent Lavelle

Downloads
- Plain Diff

fix conflict

parents fe7c4af0 5616eaff

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/assets/styles/openlayers-custom.css 29 additions, 1 deletion

src/assets/styles/openlayers-custom.css
src/components/Map/EditingToolbar.vue 28 additions, 17 deletions

src/components/Map/EditingToolbar.vue
src/components/Map/Geocoder.vue 60 additions, 12 deletions

src/components/Map/Geocoder.vue
src/components/Project/Detail/ProjectFeatureTypes.vue 1 addition, 1 deletion

src/components/Project/Detail/ProjectFeatureTypes.vue
src/services/map-service.js 0 additions, 3 deletions

src/services/map-service.js
src/views/Feature/FeatureEdit.vue 10 additions, 11 deletions

src/views/Feature/FeatureEdit.vue
src/views/FeatureType/FeatureTypeDetail.vue 4 additions, 1 deletion

src/views/FeatureType/FeatureTypeDetail.vue
src/views/FeatureType/FeatureTypeEdit.vue 1 addition, 1 deletion

src/views/FeatureType/FeatureTypeEdit.vue
src/views/Project/ProjectDetail.vue 24 additions, 2 deletions

src/views/Project/ProjectDetail.vue

with 157 additions and 49 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment