Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Server
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

995ff147

Commit 995ff147 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!83

parents 68267f29 55f47e91

Branches

Tags

Loading

Changes 53

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 7 additions, 2 deletions

.gitignore
.gitlab-ci.yml 1 addition, 1 deletion

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

CHANGELOG.md
README.md 7 additions, 0 deletions

README.md
docker-compose.yml 8 additions, 2 deletions

docker-compose.yml
package-lock.json 26685 additions, 4922 deletions

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

package.json
src/admin/admin.controller.spec.ts 140 additions, 32 deletions

src/admin/admin.controller.spec.ts
src/admin/admin.controller.ts 40 additions, 10 deletions

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

src/admin/dto/pending-structure.dto.ts
src/admin/dto/unclaimed-structure-dto.ts 14 additions, 0 deletions

src/admin/dto/unclaimed-structure-dto.ts
src/auth/auth.controller.spec.ts 26 additions, 10 deletions

src/auth/auth.controller.spec.ts
src/auth/auth.service.spec.ts 85 additions, 41 deletions

src/auth/auth.service.spec.ts
src/categories/controllers/categories-accompagnement.controller.spec.ts 65 additions, 0 deletions

.../controllers/categories-accompagnement.controller.spec.ts
src/categories/controllers/categories-accompagnement.controller.ts 8 additions, 3 deletions

...ories/controllers/categories-accompagnement.controller.ts
src/categories/controllers/categories-formations.controller.spec.ts 55 additions, 0 deletions

...ries/controllers/categories-formations.controller.spec.ts
src/categories/controllers/categories-formations.controller.ts 8 additions, 3 deletions

...ategories/controllers/categories-formations.controller.ts
src/categories/controllers/categories-others.controller.spec.ts 52 additions, 0 deletions

...tegories/controllers/categories-others.controller.spec.ts
src/categories/controllers/categories-others.controller.ts 8 additions, 3 deletions

src/categories/controllers/categories-others.controller.ts
src/categories/schemas/categoriesAccompagnement.schema.ts 3 additions, 0 deletions

src/categories/schemas/categoriesAccompagnement.schema.ts

with 27248 additions and 5033 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