Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

bd18a669

Commit bd18a669 authored 2 years ago by Hugo SUBTIL

Downloads
- Plain Diff

Merge branch 'dev' into 'master'

1.17

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

parents 70ff9253 71ba2524

No related branches found

No related tags found

Loading

Changes 29

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 52 additions, 33 deletions

.gitlab-ci.yml
.gitlab/issue_templates/default.md 19 additions, 0 deletions

.gitlab/issue_templates/default.md
.gitlab/merge_request_templates/default.md 62 additions, 0 deletions

.gitlab/merge_request_templates/default.md
CHANGELOG.md 31 additions, 0 deletions

CHANGELOG.md
README.md 9 additions, 3 deletions

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

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

package.json
src/app/admin/admin-pannel.scss 33 additions, 0 deletions

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

src/app/admin/admin.module.ts
src/app/admin/components/lockdown-info/manage-lockdown-info.component.html 19 additions, 0 deletions

...ponents/lockdown-info/manage-lockdown-info.component.html
src/app/admin/components/lockdown-info/manage-lockdown-info.component.spec.ts 24 additions, 0 deletions

...ents/lockdown-info/manage-lockdown-info.component.spec.ts
src/app/admin/components/lockdown-info/manage-lockdown-info.component.ts 31 additions, 0 deletions

...omponents/lockdown-info/manage-lockdown-info.component.ts
src/app/admin/components/manage-users/manage-users.component.ts 3 additions, 3 deletions

...p/admin/components/manage-users/manage-users.component.ts
src/app/admin/components/panel/panel.component.html 4 additions, 0 deletions

src/app/admin/components/panel/panel.component.html
src/app/admin/components/structures-list/admin-structures-list.component.html 16 additions, 4 deletions

...ents/structures-list/admin-structures-list.component.html
src/app/admin/services/parameters.service.ts 19 additions, 0 deletions

src/app/admin/services/parameters.service.ts
src/app/app.component.scss 1 addition, 1 deletion

src/app/app.component.scss
src/app/form/orientation-form/component/structure-print-header/structure-print-header.component.html 8 additions, 1 deletion

...ucture-print-header/structure-print-header.component.html
src/app/form/orientation-form/orientation-form.component.html 7 additions, 1 deletion

...app/form/orientation-form/orientation-form.component.html
src/app/form/orientation-form/orientation-form.component.scss 6 additions, 10 deletions

...app/form/orientation-form/orientation-form.component.scss

with 348 additions and 58 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