Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Server
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

a427359c

Commit a427359c authored 4 years ago by Hugo SUBTIL

Downloads
- Plain Diff

Merge branch 'recette' into 'master'

Recette

See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server!46

parents f9e8f36c d19c39e1

No related branches found

No related tags found

1 merge request!46Recette

Changes 32

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 21 additions, 0 deletions

CHANGELOG.md
Dockerfile 1 addition, 0 deletions

Dockerfile
package-lock.json 45 additions, 13 deletions

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

package.json
scripts/data/etude.png 0 additions, 0 deletions

scripts/data/etude.png
scripts/data/folder.png 0 additions, 0 deletions

scripts/data/folder.png
scripts/data/la_carniere.png 0 additions, 0 deletions

scripts/data/la_carniere.png
scripts/data/nec.png 0 additions, 0 deletions

scripts/data/nec.png
scripts/ghost/migrations/init/posts.json 1033 additions, 0 deletions

scripts/ghost/migrations/init/posts.json
scripts/ghost/migrations/init/tags.json 648 additions, 0 deletions

scripts/ghost/migrations/init/tags.json
scripts/init-ghost.js 154 additions, 0 deletions

scripts/init-ghost.js
src/mailer/mail-templates/adminStructureClaim.ejs 0 additions, 2 deletions

src/mailer/mail-templates/adminStructureClaim.ejs
src/mailer/mail-templates/apticStructureDuplication.ejs 0 additions, 9 deletions

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

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

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

src/mailer/mail-templates/structureClaimValidation.ejs
src/mailer/mail-templates/structureJoinRequest.ejs 0 additions, 7 deletions

src/mailer/mail-templates/structureJoinRequest.ejs
src/mailer/mail-templates/structureOutdatedInfo.ejs 0 additions, 7 deletions

src/mailer/mail-templates/structureOutdatedInfo.ejs
src/mailer/mail-templates/tempUserRegistration.ejs 0 additions, 7 deletions

src/mailer/mail-templates/tempUserRegistration.ejs
src/mailer/mail-templates/verify.ejs 0 additions, 2 deletions

src/mailer/mail-templates/verify.ejs

with 1915 additions and 58 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