Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Server
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

517c96b9

Commit 517c96b9 authored 4 years ago by Hugo SUBTIL

Downloads
- Plain Diff

Merge branch 'dev' into 'recette'

Dev

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

parents bf54277a 2b1a7d27

No related branches found

No related tags found

2 merge requests!38Recette,!37Dev

Changes 41

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 32 additions, 0 deletions

CHANGELOG.md
db/init-db.sh 0 additions, 5 deletions

db/init-db.sh
docker-compose.yml 2 additions, 0 deletions

docker-compose.yml
package-lock.json 1 addition, 1 deletion

package-lock.json
package.json 2 additions, 1 deletion

package.json
scripts/data/users.js 55 additions, 0 deletions

scripts/data/users.js
scripts/init-db.js 71 additions, 0 deletions

scripts/init-db.js
src/admin/admin.controller.ts 8 additions, 2 deletions

src/admin/admin.controller.ts
src/admin/dto/pending-structure.dto.ts 5 additions, 0 deletions

src/admin/dto/pending-structure.dto.ts
src/app.module.ts 2 additions, 0 deletions

src/app.module.ts
src/configuration/config.dev.ts 1 addition, 28 deletions

src/configuration/config.dev.ts
src/configuration/config.prod.ts 1 addition, 28 deletions

src/configuration/config.prod.ts
src/configuration/config.ts 8 additions, 0 deletions

src/configuration/config.ts
src/configuration/configuration.service.ts 2 additions, 0 deletions

src/configuration/configuration.service.ts
src/mailer/mail-templates/structureJoinRequest.ejs 21 additions, 0 deletions

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

src/mailer/mail-templates/structureJoinRequest.json
src/mailer/mail-templates/tempUserRegistration.ejs 15 additions, 0 deletions

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

src/mailer/mail-templates/tempUserRegistration.json
src/posts/posts.controller.ts 1 addition, 1 deletion

src/posts/posts.controller.ts
src/structures/dto/structure.dto.ts 1 addition, 2 deletions

src/structures/dto/structure.dto.ts

with 234 additions and 68 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