Compare commits

...
8 changed files with 270 additions and 407 deletions
+2
View File
@@ -11,3 +11,5 @@ MAILER_URL=smtp://smtp:1025
PGADMIN_DEFAULT_EMAIL=admin@chill.social
PGADMIN_DEFAULT_PASSWORD=password
## Phpstorm IDE project path
PROJECT_DIR=
+3 -1
View File
@@ -9,6 +9,7 @@ config/secrets/
## env files
.env.local
.env.dev.local
.composer/*
composer.phar
@@ -49,17 +50,18 @@ phpunit.xml
nbproject/*
.idea
.ignore
### template/api/specs.yaml should be compiled
templates/api/specs.yaml
###> symfony/webpack-encore-bundle ###
/node_modules/
/public/build/
npm-debug.log
yarn-error.log
###< symfony/webpack-encore-bundle ###
###> symfony/phpunit-bridge ###
.phpunit
.phpunit.result.cache
+2 -3
View File
@@ -15,7 +15,7 @@
},
"require": {
"ext-redis": "*",
"chill-project/chill-bundles": "dev-master#239a978adb382d0c5dcc4ad6ae0f8f66a813a5dc",
"chill-project/chill-bundles": "dev-master#de55ff920f1ffee00b0d5ea47aa5028a23dff5a7",
"symfony/flex": "^1.9",
"symfony/http-client": "^4.4 || ^5",
"nelmio/alice": "^3.8",
@@ -23,8 +23,7 @@
"phpstan/phpstan": "^1.0",
"spomky-labs/base64url": "^2.0",
"twig/string-extra": "^3.3",
"symfony/mailer": "^5.4",
"symfony/dependency-injection": "5.4.16"
"symfony/mailer": "^5.4"
},
"require-dev": {
"fakerphp/faker": "^1.13",
Generated
+255 -396
View File
File diff suppressed because it is too large Load Diff
-1
View File
@@ -56,7 +56,6 @@ chill_budget:
- { key: mutuelle, labels: [{lang: fr, label: "Mutuelle"}]}
- { key: transport, labels: [{lang: fr, label: "Frais de transport"}]}
- { key: decouvbank, labels: [{lang: fr, label: "Découvert bancaire utilisé"}]}
- { key: credit, labels: [{lang: fr, label: "Procédure de saisie"}]}
- { key: procsaisie, labels: [{lang: fr, label: "Procédure de saisie"}]}
- { key: indus, labels: [{lang: fr, label: "Indus"}]}
- { key: apurement, labels: [{lang: fr, label: "Plan d'apurement"}]}
+7
View File
@@ -3,3 +3,10 @@ framework:
# allow to debug from ngrok, useful for webhooks coming from outside:
- '^(.+\.)?ngrok\.io$'
- 'nginx'
## Open files in phpstorm IDE from profiler links
# ref: https://symfony.com/doc/current/reference/configuration/framework.html#ide
# need: https://github.com/sanduhrs/phpstorm-url-handler/blob/master/phpstorm-url-handler
# set var in file .env.dev.local (PROJECT_DIR=<relative path from home folder>)
ide: 'phpstorm://open?file=%%f&line=%%l&/var/www/app/>%env(resolve:PROJECT_DIR)%'
+1
View File
@@ -1,2 +1,3 @@
wopi:
server: "%env(resolve:WOPI_SERVER)%"
enable_lock: false
-6
View File
@@ -358,9 +358,6 @@
"psr/http-message": {
"version": "1.0.1"
},
"psr/link": {
"version": "1.0.0"
},
"psr/log": {
"version": "1.1.3"
},
@@ -820,9 +817,6 @@
"symfony/var-exporter": {
"version": "v5.1.3"
},
"symfony/web-link": {
"version": "v5.2.12"
},
"symfony/web-profiler-bundle": {
"version": "3.3",
"recipe": {