Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Server
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

68267f29

Commit 68267f29 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!73

parents 15176641 2e27fbf2

No related branches found

No related tags found

Loading

Changes 42

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 0 deletions

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

CHANGELOG.md
docker-compose.yml 51 additions, 0 deletions

docker-compose.yml
package-lock.json 100 additions, 7 deletions

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

package.json
scripts/init-ghost.js 2 additions, 1 deletion

scripts/init-ghost.js
src/admin/admin.controller.spec.ts 24 additions, 7 deletions

src/admin/admin.controller.spec.ts
src/admin/admin.controller.ts 8 additions, 0 deletions

src/admin/admin.controller.ts
src/app.module.ts 1 addition, 1 deletion

src/app.module.ts
src/categories/categories.module.ts 5 additions, 2 deletions

src/categories/categories.module.ts
src/configuration/config.ts 10 additions, 2 deletions

src/configuration/config.ts
src/mailer/mail-templates/adminStructureClaim.ejs 1 addition, 1 deletion

src/mailer/mail-templates/adminStructureClaim.ejs
src/mailer/mail-templates/adminStructureCreate.ejs 3 additions, 3 deletions

src/mailer/mail-templates/adminStructureCreate.ejs
src/mailer/mail-templates/apticStructureDuplication.ejs 1 addition, 1 deletion

src/mailer/mail-templates/apticStructureDuplication.ejs
src/mailer/mail-templates/resetPassword.ejs 2 additions, 2 deletions

src/mailer/mail-templates/resetPassword.ejs
src/mailer/mail-templates/structureClaimValidation.ejs 5 additions, 5 deletions

src/mailer/mail-templates/structureClaimValidation.ejs
src/mailer/mail-templates/structureDeletionNotification.ejs 3 additions, 0 deletions

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

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

src/mailer/mail-templates/structureErrorReport.ejs
src/mailer/mail-templates/structureJoinRequest.ejs 2 additions, 2 deletions

src/mailer/mail-templates/structureJoinRequest.ejs

with 255 additions and 37 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