Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Server
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

acaa9f68

Commit acaa9f68 authored 3 years ago by Hugo SUBTIL

Downloads
- Plain Diff

Merge branch 'dev' into 'recette'

release V1.10.0

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

parents a427359c c639f67d

Loading

Changes 119

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 10 additions, 1 deletion

.gitignore
.gitlab-ci.yml 49 additions, 26 deletions

.gitlab-ci.yml
CHANGELOG.md 226 additions, 110 deletions

CHANGELOG.md
README.md 7 additions, 0 deletions

README.md
docker-compose.yml 64 additions, 3 deletions

docker-compose.yml
package-lock.json 6428 additions, 1409 deletions

package-lock.json
package.json 20 additions, 9 deletions

package.json
scripts/data/categoriesAccompanements.js 47 additions, 0 deletions

scripts/data/categoriesAccompanements.js
scripts/data/categoriesFormation.js 339 additions, 0 deletions

scripts/data/categoriesFormation.js
scripts/data/categoriesOthers.js 163 additions, 0 deletions

scripts/data/categoriesOthers.js
scripts/data/structures.js 763 additions, 0 deletions

scripts/data/structures.js
scripts/data/structuresType.js 33 additions, 0 deletions

scripts/data/structuresType.js
scripts/data/users.js 6 additions, 6 deletions

scripts/data/users.js
scripts/init-db.js 120 additions, 6 deletions

scripts/init-db.js
scripts/init-ghost.js 1 addition, 0 deletions

scripts/init-ghost.js
scripts/init-index.js 27 additions, 0 deletions

scripts/init-index.js
src/admin/admin.controller.spec.ts 183 additions, 1 deletion

src/admin/admin.controller.spec.ts
src/admin/admin.controller.ts 131 additions, 13 deletions

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

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

src/admin/dto/pending-structure.dto.ts

with 8621 additions and 1587 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