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

af8fcb38

Commit af8fcb38 authored 3 years ago by Timothee P

Downloads
- Plain Diff

Merge branch 'develop' into 'anom/redmine-ticket-11793-erreur-permissions-creation-projet'

# Conflicts:
#   src/views/project/Project_edit.vue

parents 9696c224 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 19 additions, 16 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 16 additions, 7 deletions

src/views/project/Project_edit.vue

with 384 additions and 185 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