Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

4c0953a0

Commit 4c0953a0 authored 4 years ago by Hugo SUBTIL

Downloads
- Plain Diff

Merge branch 'recette' into 'master'

Recette

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

parents 1bd88fa1 d6b94d81

Loading

Changes 151

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 2 additions, 0 deletions

.gitlab-ci.yml
CHANGELOG.md 97 additions, 5 deletions

CHANGELOG.md
api/server.js 84 additions, 44 deletions

api/server.js
nginx/dev.conf 6 additions, 3 deletions

nginx/dev.conf
package-lock.json 1 addition, 1 deletion

package-lock.json
package.json 1 addition, 1 deletion

package.json
proxy.conf.json 14 additions, 2 deletions

proxy.conf.json
src/app/about/about.component.html 26 additions, 0 deletions

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

src/app/about/about.component.scss
src/app/about/about.component.spec.ts 25 additions, 0 deletions

src/app/about/about.component.spec.ts
src/app/about/about.component.ts 15 additions, 0 deletions

src/app/about/about.component.ts
src/app/app-routing.module.ts 12 additions, 0 deletions

src/app/app-routing.module.ts
src/app/app.component.html 1 addition, 0 deletions

src/app/app.component.html
src/app/app.component.ts 4 additions, 1 deletion

src/app/app.component.ts
src/app/app.module.ts 7 additions, 1 deletion

src/app/app.module.ts
src/app/footer/footer.component.html 3 additions, 5 deletions

src/app/footer/footer.component.html
src/app/footer/footer.component.scss 15 additions, 2 deletions

src/app/footer/footer.component.scss
src/app/header/header.component.html 14 additions, 13 deletions

src/app/header/header.component.html
src/app/header/header.component.scss 37 additions, 1 deletion

src/app/header/header.component.scss
src/app/header/header.component.ts 9 additions, 6 deletions

src/app/header/header.component.ts

with 376 additions and 85 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