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

255327e9

Commit 255327e9 authored 3 years ago by Timothee P

Downloads
- Plain Diff

Merge branch 'develop' into 'anom/redmine-ticket-11742-suppression-impossible-signal'

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

parents ccad17f2 be82399c

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 3 additions, 4 deletions

.gitlab-ci.yml
package.json 1 addition, 1 deletion

package.json
src/App.vue 11 additions, 7 deletions

src/App.vue
src/components/ImportTask.vue 67 additions, 2 deletions

src/components/ImportTask.vue
src/views/feature/Feature_detail.vue 13 additions, 6 deletions

src/views/feature/Feature_detail.vue
src/views/feature/Feature_list.vue 267 additions, 148 deletions

src/views/feature/Feature_list.vue
src/views/project/Project_edit.vue 35 additions, 15 deletions

src/views/project/Project_edit.vue

with 397 additions and 183 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