Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

a998e4b6

Commit a998e4b6 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!4

parents b16de1c6 0c8b186a

No related branches found

No related tags found

1 merge request!4Dev

Changes 36

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 3 additions, 0 deletions

.gitignore
.gitlab-ci.yml 1 addition, 0 deletions

.gitlab-ci.yml
angular.json 2 additions, 1 deletion

angular.json
api/routes.json 3 additions, 0 deletions

api/routes.json
docker-compose.yml 2 additions, 2 deletions

docker-compose.yml
package-lock.json 1041 additions, 159 deletions

package-lock.json
package.json 4 additions, 1 deletion

package.json
proxy.conf.json 5 additions, 0 deletions

proxy.conf.json
src/app/app.component.spec.ts 4 additions, 8 deletions

src/app/app.component.spec.ts
src/app/app.module.ts 3 additions, 3 deletions

src/app/app.module.ts
src/app/header/header.component.spec.ts 4 additions, 3 deletions

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

src/app/home/home.component.html
src/app/structure-list/components/card/card.component.html 25 additions, 0 deletions

src/app/structure-list/components/card/card.component.html
src/app/structure-list/components/card/card.component.scss 37 additions, 0 deletions

src/app/structure-list/components/card/card.component.scss
src/app/structure-list/components/card/card.component.spec.ts 25 additions, 0 deletions

...app/structure-list/components/card/card.component.spec.ts
src/app/structure-list/components/card/card.component.ts 22 additions, 0 deletions

src/app/structure-list/components/card/card.component.ts
src/app/structure-list/components/recherche/recherche.component.html 1 addition, 0 deletions

...ucture-list/components/recherche/recherche.component.html
src/app/structure-list/components/recherche/recherche.component.scss 0 additions, 0 deletions

...ucture-list/components/recherche/recherche.component.scss
src/app/structure-list/components/recherche/recherche.component.spec.ts 25 additions, 0 deletions

...ure-list/components/recherche/recherche.component.spec.ts
src/app/structure-list/components/recherche/recherche.component.ts 12 additions, 0 deletions

...tructure-list/components/recherche/recherche.component.ts

with 1220 additions and 178 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