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

6d9d55f1

Commit 6d9d55f1 authored 3 years ago by DESPRES Damien

Downloads
- Plain Diff

Merge branch 'develop' into 'evol/redmine-ticket-11081'

# Conflicts:
#   src/views/feature/Feature_edit.vue

parents 73dd3fb2 7bdc32e7

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 14 additions, 2 deletions

.gitlab-ci.yml
Dockerfile 9 additions, 0 deletions

Dockerfile
src/components/feature_type/FeatureTypeCustomForm.vue 5 additions, 5 deletions

src/components/feature_type/FeatureTypeCustomForm.vue
src/main.js 10 additions, 7 deletions

src/main.js
src/views/NotFound.vue 3 additions, 3 deletions

src/views/NotFound.vue
src/views/feature/Feature_edit.vue 16 additions, 2 deletions

src/views/feature/Feature_edit.vue
src/views/feature_type/Feature_type_edit.vue 65 additions, 26 deletions

src/views/feature_type/Feature_type_edit.vue

with 122 additions and 45 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