Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Client
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

3bf3de18

Commit 3bf3de18 authored 4 years ago by Hugo SUBTIL

Downloads
- Plain Diff

Merge branch 'dev' into 'master'

Dev

See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client!2

parents 46d4d3bb 70637df7

Branches

Tags

1 merge request!2Dev

Changes 31

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 8 additions, 4 deletions

.gitlab-ci.yml
.vscode/settings.json 22 additions, 1 deletion

.vscode/settings.json
Dockerfile 4 additions, 4 deletions

Dockerfile
README.md 8 additions, 4 deletions

README.md
docker-compose.yml 3 additions, 3 deletions

docker-compose.yml
nginx.conf 0 additions, 13 deletions

nginx.conf
nginx/dev.conf 23 additions, 0 deletions

nginx/dev.conf
nginx/nginx.conf 30 additions, 0 deletions

nginx/nginx.conf
package.json 1 addition, 1 deletion

package.json
src/app/app.module.ts 2 additions, 1 deletion

src/app/app.module.ts
src/app/header/header.component.html 1 addition, 1 deletion

src/app/header/header.component.html
src/app/header/header.component.scss 3 additions, 0 deletions

src/app/header/header.component.scss
src/app/home/home.component.html 4 additions, 2 deletions

src/app/home/home.component.html
src/app/shared/components/card/card.component.html 1 addition, 0 deletions

src/app/shared/components/card/card.component.html
src/app/shared/components/card/card.component.scss 0 additions, 0 deletions

src/app/shared/components/card/card.component.scss
src/app/shared/components/card/card.component.spec.ts 25 additions, 0 deletions

src/app/shared/components/card/card.component.spec.ts
src/app/shared/components/card/card.component.ts 15 additions, 0 deletions

src/app/shared/components/card/card.component.ts
src/app/shared/components/index.ts 7 additions, 0 deletions

src/app/shared/components/index.ts
src/app/shared/directives/index.ts 4 additions, 0 deletions

src/app/shared/directives/index.ts
src/app/shared/pipes/index.ts 4 additions, 0 deletions

src/app/shared/pipes/index.ts

with 165 additions and 34 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