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

0e4426ad

Commit 0e4426ad authored 3 years ago by Leandro Almada

Downloads
- Plain Diff

Merge branch 'develop' into 'REDMINE-ISSUES/12614v2'

# Conflicts:
#   src/views/feature_type/Feature_type_detail.vue

parents 0172f426 28a4f03e

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

public/config/config.json 1 addition, 0 deletions

public/config/config.json
src/components/ImportTask.vue 3 additions, 3 deletions

src/components/ImportTask.vue
src/store/index.js 25 additions, 3 deletions

src/store/index.js
src/store/modules/feature_type.js 11 additions, 7 deletions

src/store/modules/feature_type.js
src/views/feature/Feature_detail.vue 7 additions, 5 deletions

src/views/feature/Feature_detail.vue
src/views/feature_type/Feature_type_detail.vue 6 additions, 5 deletions

src/views/feature_type/Feature_type_detail.vue
src/views/project/Project_detail.vue 220 additions, 126 deletions

src/views/project/Project_detail.vue

with 273 additions and 149 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