Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Server
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

37eb2986

Commit 37eb2986 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_server!4

parents 71566600 1fc49875

No related branches found

No related tags found

1 merge request!4Dev

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

src/app.module.ts 2 additions, 0 deletions

src/app.module.ts
src/configuration/config.ts 21 additions, 0 deletions

src/configuration/config.ts
src/configuration/configuration.service.ts 7 additions, 1 deletion

src/configuration/configuration.service.ts
src/mailer/mail-templates/changeEmail.ejs 8 additions, 0 deletions

src/mailer/mail-templates/changeEmail.ejs
src/mailer/mail-templates/changeEmail.json 3 additions, 0 deletions

src/mailer/mail-templates/changeEmail.json
src/mailer/mail-templates/verify.ejs 10 additions, 0 deletions

src/mailer/mail-templates/verify.ejs
src/mailer/mail-templates/verify.json 3 additions, 0 deletions

src/mailer/mail-templates/verify.json
src/mailer/mailer.module.ts 10 additions, 0 deletions

src/mailer/mailer.module.ts
src/mailer/mailer.service.spec.ts 18 additions, 0 deletions

src/mailer/mailer.service.spec.ts
src/mailer/mailer.service.ts 77 additions, 0 deletions

src/mailer/mailer.service.ts
src/structures/dto/create-structure.dto.ts 1 addition, 1 deletion

src/structures/dto/create-structure.dto.ts
src/structures/schemas/structure.schema.ts 2 additions, 14 deletions

src/structures/schemas/structure.schema.ts
src/structures/structures.controller.ts 1 addition, 5 deletions

src/structures/structures.controller.ts
src/structures/structures.module.ts 2 additions, 1 deletion

src/structures/structures.module.ts
src/structures/structures.service.ts 0 additions, 4 deletions

src/structures/structures.service.ts
template.env 2 additions, 0 deletions

template.env

with 167 additions and 26 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