Compare commits

..

No commits in common. "29253b4f01d9e24cbe5d92a8f20eb86802903986" and "571d662737e6bd107bf4385cceaaf89db32df443" have entirely different histories.

7 changed files with 973 additions and 1719 deletions

View File

@ -11,5 +11,3 @@ MAILER_URL=smtp://smtp:1025
PGADMIN_DEFAULT_EMAIL=admin@chill.social
PGADMIN_DEFAULT_PASSWORD=password
## Phpstorm IDE project path
PROJECT_DIR=

4
.gitignore vendored
View File

@ -9,7 +9,6 @@ config/secrets/
## env files
.env.local
.env.dev.local
.composer/*
composer.phar
@ -50,18 +49,17 @@ 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

View File

@ -15,7 +15,7 @@
},
"require": {
"ext-redis": "*",
"chill-project/chill-bundles": "dev-master#3c88630edc1e449824dd6d2cfd91699e2cb47f86",
"chill-project/chill-bundles": "dev-master#de55ff920f1ffee00b0d5ea47aa5028a23dff5a7",
"symfony/flex": "^1.9",
"symfony/http-client": "^4.4 || ^5",
"nelmio/alice": "^3.8",

1241
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -56,6 +56,7 @@ 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"}]}
@ -81,5 +82,6 @@ chill_budget:
- { key: debt_bank, labels: [{lang: fr, label: "Dette de découvert bancaire utilisé"}]}
- { key: debt_garbage, labels: [{lang: fr, label: "Dette de taxe dordures ménagère"}]}
- { key: debt_other, labels: [{lang: fr, label: "Dette autre"}]}
- { key: credit, labels: [{lang: fr, label: "Crédit"}]}
- { key: autre, labels: [{lang: fr, label: "Autre"}]}

View File

@ -3,10 +3,3 @@ 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)%'

1434
yarn.lock

File diff suppressed because it is too large Load Diff