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

9585aa95

"src/pages-doc/doc/data.tsx" did not exist on "ec1434c4c91e490d3d2d0466fbc32b27a7caf48c"

Commit 9585aa95 authored 3 years ago by Florent Lavelle

Downloads
- Plain Diff

fix conflicts

parents 7d433196 206012c3

No related branches found

No related tags found

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

src/App.vue 40 additions, 9 deletions

src/App.vue
src/components/feature/FeatureExtraForm.vue 1 addition, 0 deletions

src/components/feature/FeatureExtraForm.vue
src/components/feature/FeatureListTable.vue 143 additions, 70 deletions

src/components/feature/FeatureListTable.vue
src/components/project/ProjectMappingContextLayer.vue 1 addition, 1 deletion

src/components/project/ProjectMappingContextLayer.vue
src/router/index.js 22 additions, 17 deletions

src/router/index.js
src/services/feature-api.js 15 additions, 0 deletions

src/services/feature-api.js
src/store/index.js 5 additions, 2 deletions

src/store/index.js
src/store/modules/feature.store.js 22 additions, 21 deletions

src/store/modules/feature.store.js
src/views/feature/Feature_detail.vue 1 addition, 1 deletion

src/views/feature/Feature_detail.vue
src/views/feature/Feature_list.vue 170 additions, 20 deletions

src/views/feature/Feature_list.vue
src/views/feature_type/Feature_type_edit.vue 3 additions, 1 deletion

src/views/feature_type/Feature_type_edit.vue
src/views/project/Project_detail.vue 117 additions, 67 deletions

src/views/project/Project_detail.vue
src/views/project/Project_edit.vue 17 additions, 8 deletions

src/views/project/Project_edit.vue
src/views/project/Project_members.vue 5 additions, 2 deletions

src/views/project/Project_members.vue
src/views/registration/Login.vue 1 addition, 1 deletion

src/views/registration/Login.vue

with 563 additions and 220 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