Merge branch 'dev' into 'master'
v1.12.0 See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client!197
Showing
- CHANGELOG.md 23 additions, 0 deletionsCHANGELOG.md
- karma.conf.js 1 addition, 1 deletionkarma.conf.js
- nginx/dev.conf 2 additions, 2 deletionsnginx/dev.conf
- package-lock.json 34 additions, 1 deletionpackage-lock.json
- package.json 5 additions, 1 deletionpackage.json
- proxy.conf.json 1 addition, 1 deletionproxy.conf.json
- src/app/about/about.component.html 1 addition, 0 deletionssrc/app/about/about.component.html
- src/app/about/about.component.scss 6 additions, 0 deletionssrc/app/about/about.component.scss
- src/app/about/about.component.ts 5 additions, 5 deletionssrc/app/about/about.component.ts
- src/app/admin/admin.module.ts 19 additions, 3 deletionssrc/app/admin/admin.module.ts
- src/app/admin/components/delete-user/delete-user.component.html 0 additions, 22 deletions...p/admin/components/delete-user/delete-user.component.html
- src/app/admin/components/delete-user/delete-user.component.ts 0 additions, 38 deletions...app/admin/components/delete-user/delete-user.component.ts
- src/app/admin/components/manage-users/administred-structures/administred-structures.component.html 5 additions, 0 deletions...inistred-structures/administred-structures.component.html
- src/app/admin/components/manage-users/administred-structures/administred-structures.component.scss 4 additions, 0 deletions...inistred-structures/administred-structures.component.scss
- src/app/admin/components/manage-users/administred-structures/administred-structures.component.spec.ts 25 additions, 0 deletions...stred-structures/administred-structures.component.spec.ts
- src/app/admin/components/manage-users/administred-structures/administred-structures.component.ts 14 additions, 0 deletions...dministred-structures/administred-structures.component.ts
- src/app/admin/components/manage-users/delete-user/delete-user.component.html 1 addition, 0 deletions...nents/manage-users/delete-user/delete-user.component.html
- src/app/admin/components/manage-users/delete-user/delete-user.component.spec.ts 25 additions, 0 deletions...ts/manage-users/delete-user/delete-user.component.spec.ts
- src/app/admin/components/manage-users/delete-user/delete-user.component.ts 21 additions, 0 deletions...ponents/manage-users/delete-user/delete-user.component.ts
- src/app/admin/components/manage-users/manage-users.component.html 59 additions, 0 deletions...admin/components/manage-users/manage-users.component.html
Loading
Please register or sign in to comment