Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

c44f1c2b

Commit c44f1c2b authored 1 year ago by Marlène SIMONDANT

Downloads
- Plain Diff

Merge branch 'dev' of...

Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client into dev

parents c9fee683 8464cbe4

Branches

Tags

1 merge request!550V2.3.2

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

.vscode/settings.json 1 addition, 0 deletions

.vscode/settings.json
Dockerfile 1 addition, 3 deletions

Dockerfile
src/app/admin/admin-routing.module.ts 6 additions, 0 deletions

src/app/admin/admin-routing.module.ts
src/app/admin/admin.module.ts 2 additions, 0 deletions

src/app/admin/admin.module.ts
src/app/admin/components/espace-coop-cnfs/espace-coop-cnfs.component.html 29 additions, 0 deletions

...mponents/espace-coop-cnfs/espace-coop-cnfs.component.html
src/app/admin/components/espace-coop-cnfs/espace-coop-cnfs.component.spec.ts 22 additions, 0 deletions

...nents/espace-coop-cnfs/espace-coop-cnfs.component.spec.ts
src/app/admin/components/espace-coop-cnfs/espace-coop-cnfs.component.ts 90 additions, 0 deletions

...components/espace-coop-cnfs/espace-coop-cnfs.component.ts
src/app/admin/components/manage-employers/manage-employers.component.ts 3 additions, 1 deletion

...components/manage-employers/manage-employers.component.ts
src/app/admin/components/manage-jobs/manage-jobs.component.ts 18 additions, 9 deletions

...app/admin/components/manage-jobs/manage-jobs.component.ts
src/app/admin/components/manage-users/manage-users.component.html 14 additions, 2 deletions

...admin/components/manage-users/manage-users.component.html
src/app/admin/components/manage-users/manage-users.component.ts 39 additions, 12 deletions

...p/admin/components/manage-users/manage-users.component.ts
src/app/admin/components/nav-bar/nav-bar.component.html 5 additions, 0 deletions

src/app/admin/components/nav-bar/nav-bar.component.html
src/app/admin/services/admin.service.ts 25 additions, 9 deletions

src/app/admin/services/admin.service.ts
src/app/models/espaceCoopCNFS.model.ts 8 additions, 0 deletions

src/app/models/espaceCoopCNFS.model.ts

with 263 additions and 36 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