Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

knowledgebase-front
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

237284b0

Commit 237284b0 authored 5 years ago by Alice Poggioli

Downloads
- Plain Diff

Merge branch 'master' of...

Merge branch 'master' of git.happy-dev.fr:startinblox/applications/coop-starter/coopstarter-front into feature/create-preview-upload-file

parents 9325dd16 2e36ec5b

No related branches found

No related tags found

1 merge request!66Feature/create preview upload file

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/includes/components/widgets.pug 3 additions, 2 deletions

src/includes/components/widgets.pug
src/includes/entrepreneur/requests/create.pug 49 additions, 41 deletions

src/includes/entrepreneur/requests/create.pug
src/includes/entrepreneur/resources/detail.pug 1 addition, 1 deletion

src/includes/entrepreneur/resources/detail.pug
src/includes/entrepreneur/resources/list.pug 6 additions, 1 deletion

src/includes/entrepreneur/resources/list.pug
src/includes/mentor/resources/confirmation-deletion.pug 11 additions, 7 deletions

src/includes/mentor/resources/confirmation-deletion.pug
src/includes/mentor/resources/detail.pug 4 additions, 0 deletions

src/includes/mentor/resources/detail.pug
src/includes/mentor/resources/list.pug 2 additions, 2 deletions

src/includes/mentor/resources/list.pug
src/includes/mentor/validation-process.pug 4 additions, 1 deletion

src/includes/mentor/validation-process.pug
src/scripts/coopstarter.js 30 additions, 24 deletions

src/scripts/coopstarter.js
src/styles/index.scss 19 additions, 13 deletions

src/styles/index.scss

with 129 additions and 92 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