Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

be4ea483

Commit be4ea483 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!135

parents 177f7224 9dc3badf

Branches

Tags

2 merge requests!178release V1.10.0,!135Dev

Changes 44

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 32 additions, 0 deletions

CHANGELOG.md
angular.json 2 additions, 0 deletions

angular.json
package-lock.json 982 additions, 907 deletions

package-lock.json
package.json 15 additions, 15 deletions

package.json
src/app/about/about.component.html 4 additions, 4 deletions

src/app/about/about.component.html
src/app/admin/components/newsletter-users/newsletter-users.component.html 1 addition, 0 deletions

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

...components/newsletter-users/newsletter-users.component.ts
src/app/admin/components/panel/panel.component.html 1 addition, 2 deletions

src/app/admin/components/panel/panel.component.html
src/app/admin/components/panel/panel.component.ts 1 addition, 1 deletion

src/app/admin/components/panel/panel.component.ts
src/app/admin/services/admin.service.ts 8 additions, 4 deletions

src/app/admin/services/admin.service.ts
src/app/app-routing.module.ts 1 addition, 1 deletion

src/app/app-routing.module.ts
src/app/carto/carto.component.ts 31 additions, 9 deletions

src/app/carto/carto.component.ts
src/app/form/form.component.html 17 additions, 6 deletions

src/app/form/form.component.html
src/app/form/form.component.scss 4 additions, 0 deletions

src/app/form/form.component.scss
src/app/form/form.component.spec.ts 8 additions, 9 deletions

src/app/form/form.component.spec.ts
src/app/form/form.component.ts 65 additions, 8 deletions

src/app/form/form.component.ts
src/app/form/pageType.enum.ts 14 additions, 15 deletions

src/app/form/pageType.enum.ts
src/app/header/header.component.html 9 additions, 2 deletions

src/app/header/header.component.html
src/app/map/components/map.component.ts 0 additions, 1 deletion

src/app/map/components/map.component.ts
src/app/models/time.model.ts 6 additions, 12 deletions

src/app/models/time.model.ts

with 1209 additions and 996 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