-
- Downloads
Merge branch 'develop'
# Conflicts: # docs/docutilisateur.md
Showing
- .env.dist 44 additions, 14 deletions.env.dist
- .env.test 54 additions, 6 deletions.env.test
- .gitignore 11 additions, 2 deletions.gitignore
- .gitlab-ci.yml 17 additions, 19 deletions.gitlab-ci.yml
- .nvmrc 1 addition, 0 deletions.nvmrc
- .php-cs-fixer.dist.php 10 additions, 5 deletions.php-cs-fixer.dist.php
- CHANGELOG.md 52 additions, 21 deletionsCHANGELOG.md
- Makefile 13 additions, 7 deletionsMakefile
- UPGRADE.md 1 addition, 1 deletionUPGRADE.md
- assets/css/app.scss 27 additions, 7 deletionsassets/css/app.scss
- assets/js/app.js 7 additions, 0 deletionsassets/js/app.js
- assets/js/collectionManager.js 3 additions, 0 deletionsassets/js/collectionManager.js
- assets/js/dashboard_admin.js 1 addition, 1 deletionassets/js/dashboard_admin.js
- bin/deploy 7 additions, 7 deletionsbin/deploy
- composer.json 46 additions, 41 deletionscomposer.json
- composer.lock 4571 additions, 2815 deletionscomposer.lock
- config/api_platform/serialization/request.yaml 6 additions, 0 deletionsconfig/api_platform/serialization/request.yaml
- config/api_platform/serialization/treatment.yaml 22 additions, 22 deletionsconfig/api_platform/serialization/treatment.yaml
- config/bundles.php 5 additions, 1 deletionconfig/bundles.php
- config/domain/admin/translations/messages.fr.yaml 1 addition, 1 deletionconfig/domain/admin/translations/messages.fr.yaml
Loading
Please register or sign in to comment