Merge branch 'dev' into 'master'
Dev See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server!104
Showing
- CHANGELOG.md 19 additions, 0 deletionsCHANGELOG.md
- docker-compose.yml 2 additions, 2 deletionsdocker-compose.yml
- package-lock.json 7 additions, 1 deletionpackage-lock.json
- package.json 2 additions, 1 deletionpackage.json
- scripts/ghost/migrations/init/posts.json 4 additions, 4 deletionsscripts/ghost/migrations/init/posts.json
- scripts/init-ghost.js 21 additions, 2 deletionsscripts/init-ghost.js
- src/admin/admin.controller.ts 1 addition, 1 deletionsrc/admin/admin.controller.ts
- src/categories/services/categories-accompagnement.service.spec.ts 23 additions, 2 deletions...gories/services/categories-accompagnement.service.spec.ts
- src/categories/services/categories-accompagnement.service.ts 2 additions, 3 deletionssrc/categories/services/categories-accompagnement.service.ts
- src/categories/services/categories-formations.service.spec.ts 56 additions, 2 deletions...categories/services/categories-formations.service.spec.ts
- src/categories/services/categories-formations.service.ts 3 additions, 4 deletionssrc/categories/services/categories-formations.service.ts
- src/categories/services/categories-others.service.spec.ts 23 additions, 2 deletionssrc/categories/services/categories-others.service.spec.ts
- src/categories/services/categories-others.service.ts 2 additions, 3 deletionssrc/categories/services/categories-others.service.ts
- src/configuration/config.ts 4 additions, 0 deletionssrc/configuration/config.ts
- src/mailer/mail-templates/adminStructureClaim.ejs 8 additions, 1 deletionsrc/mailer/mail-templates/adminStructureClaim.ejs
- src/mailer/mail-templates/newApticStructure.ejs 6 additions, 0 deletionssrc/mailer/mail-templates/newApticStructure.ejs
- src/mailer/mail-templates/newApticStructure.json 3 additions, 0 deletionssrc/mailer/mail-templates/newApticStructure.json
- src/migrations/scripts/1640095148120-remove-equipments-null-values.ts 56 additions, 0 deletions...ns/scripts/1640095148120-remove-equipments-null-values.ts
- src/newsletter/newsletter.service.spec.ts 137 additions, 0 deletionssrc/newsletter/newsletter.service.spec.ts
- src/newsletter/newsletter.service.ts 8 additions, 17 deletionssrc/newsletter/newsletter.service.ts
Loading
Please register or sign in to comment