Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Server
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

15176641

Commit 15176641 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!62

parents ef076b09 ac8f3d0a

No related branches found

No related tags found

2 merge requests!96release V1.10.0,!62Dev

Changes 37

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 4 additions, 0 deletions

.gitignore
.gitlab-ci.yml 5 additions, 0 deletions

.gitlab-ci.yml
CHANGELOG.md 22 additions, 0 deletions

CHANGELOG.md
package-lock.json 41 additions, 1 deletion

package-lock.json
package.json 6 additions, 2 deletions

package.json
src/admin/admin.controller.spec.ts 29 additions, 1 deletion

src/admin/admin.controller.spec.ts
src/admin/admin.controller.ts 23 additions, 1 deletion

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

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

src/app.module.ts
src/categories/categories.module.ts 1 addition, 0 deletions

src/categories/categories.module.ts
src/categories/services/categories-formations.service.ts 4 additions, 0 deletions

src/categories/services/categories-formations.service.ts
src/configuration/config.ts 4 additions, 0 deletions

src/configuration/config.ts
src/mailer/mail-templates/adminStructureCreate.ejs 7 additions, 1 deletion

src/mailer/mail-templates/adminStructureCreate.ejs
src/mailer/mail-templates/structureErrorReport.ejs 11 additions, 0 deletions

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

src/mailer/mail-templates/structureErrorReport.json
src/mailer/mail-templates/structureOutdatedInfo.ejs 1 addition, 1 deletion

src/mailer/mail-templates/structureOutdatedInfo.ejs
src/mailer/mailer.service.spec.ts 24 additions, 0 deletions

src/mailer/mailer.service.spec.ts
src/mailer/mailer.service.ts 3 additions, 3 deletions

src/mailer/mailer.service.ts
src/migrations/migrations-utils/db.ts 11 additions, 0 deletions

src/migrations/migrations-utils/db.ts
src/migrations/migrations-utils/template.ts 13 additions, 0 deletions

src/migrations/migrations-utils/template.ts

with 216 additions and 11 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