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

12d8cb74

Commit 12d8cb74 authored 3 years ago by Florent Lavelle

Downloads
- Plain Diff

fix conflicts

parents beb4a357 9b6a51c7

No related branches found

No related tags found

2 merge requests!295Version 3.0.0,!255REDMINE_ISSUE-12379

This commit is part of merge request !255. Comments created here will be created in the context of that merge request.

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

package.json 1 addition, 1 deletion

package.json
public/config/config.json 1 addition, 1 deletion

public/config/config.json
src/assets/styles/base.css 7 additions, 0 deletions

src/assets/styles/base.css
src/components/ImportTask.vue 12 additions, 16 deletions

src/components/ImportTask.vue
src/services/featureType-api.js 22 additions, 0 deletions

src/services/featureType-api.js
src/services/project-api.js 12 additions, 2 deletions

src/services/project-api.js
src/store/modules/feature_type.store.js 3 additions, 2 deletions

src/store/modules/feature_type.store.js
src/views/feature_type/Feature_type_detail.vue 44 additions, 9 deletions

src/views/feature_type/Feature_type_detail.vue
src/views/feature_type/Feature_type_edit.vue 17 additions, 0 deletions

src/views/feature_type/Feature_type_edit.vue
src/views/feature_type/Feature_type_symbology.vue 25 additions, 8 deletions

src/views/feature_type/Feature_type_symbology.vue
src/views/project/Project_detail.vue 160 additions, 29 deletions

src/views/project/Project_detail.vue

with 304 additions and 68 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