Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

177f7224

Commit 177f7224 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!120

parents f825dcea 1c51ac91

Loading

Changes 54

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 22 additions, 0 deletions

CHANGELOG.md
karma.conf.js 1 addition, 1 deletion

karma.conf.js
nginx/dev.conf 2 additions, 2 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 1 addition, 1 deletion

proxy.conf.json
src/app/admin/admin.module.ts 3 additions, 1 deletion

src/app/admin/admin.module.ts
src/app/admin/components/delete-user/delete-user.component.scss 0 additions, 8 deletions

...p/admin/components/delete-user/delete-user.component.scss
src/app/admin/components/delete-user/delete-user.component.ts 0 additions, 1 deletion

...app/admin/components/delete-user/delete-user.component.ts
src/app/admin/components/newsletter-users/newsletter-users.component.html 25 additions, 0 deletions

...mponents/newsletter-users/newsletter-users.component.html
src/app/admin/components/newsletter-users/newsletter-users.component.spec.ts 27 additions, 0 deletions

...nents/newsletter-users/newsletter-users.component.spec.ts
src/app/admin/components/newsletter-users/newsletter-users.component.ts 48 additions, 0 deletions

...components/newsletter-users/newsletter-users.component.ts
src/app/admin/components/panel/panel.component.html 6 additions, 1 deletion

src/app/admin/components/panel/panel.component.html
src/app/admin/components/panel/panel.component.ts 2 additions, 0 deletions

src/app/admin/components/panel/panel.component.ts
src/app/admin/services/admin.service.ts 9 additions, 0 deletions

src/app/admin/services/admin.service.ts
src/app/app-routing.module.ts 11 additions, 0 deletions

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

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

src/app/carto/carto.component.html
src/app/carto/carto.component.ts 3 additions, 0 deletions

src/app/carto/carto.component.ts
src/app/footer/footer.component.html 1 addition, 0 deletions

src/app/footer/footer.component.html

with 168 additions and 19 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