Compare commits
24 Commits
571d662737
...
add-dav-fe
Author | SHA1 | Date | |
---|---|---|---|
05d4a10a5b
|
|||
|
c06166fdc2 | ||
fb1219163e
|
|||
52c40e5f52
|
|||
a144b0e4be
|
|||
8d310ef7c8 | |||
eff7e9470d | |||
cad7c0c53d | |||
c29f6cdf96
|
|||
430915f831
|
|||
29253b4f01
|
|||
93972a0135
|
|||
63c7130be3
|
|||
63489e7055 | |||
6d8b858cc8 | |||
28444d5bbf
|
|||
fb25e8b346
|
|||
efed281312 | |||
a6a988a33a | |||
859eb37526 | |||
b55914e40f | |||
7f1085d2c2 | |||
|
b81638eda9 | ||
1ef5ef50a3 |
@@ -21,7 +21,7 @@ steps:
|
||||
registry: h3m6q87t.gra7.container-registry.ovh.net
|
||||
repo: h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base
|
||||
tag: latest
|
||||
target: chill_base_php
|
||||
target: chill_base_php82
|
||||
pull_image: true
|
||||
cache_from:
|
||||
- h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base:latest
|
||||
@@ -103,12 +103,14 @@ steps:
|
||||
from_secret: docker_password_gitea
|
||||
registry: gitea.champs-libres.be/chill-project/chill-skeleton-basic
|
||||
repo: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image
|
||||
tag: php82
|
||||
tag:
|
||||
- php82
|
||||
- latest
|
||||
target: chill_base_php82
|
||||
pull_image: true
|
||||
|
||||
---
|
||||
kind: signature
|
||||
hmac: 212da184e3fedeb03530cc66dbf9c8974e461e214dda5a698b11012e66e4531a
|
||||
hmac: 707a5ef589fb6320f9e9e1dec7d8d4d11b477ba09e3b2b08d6f31f98d6d3f5d0
|
||||
|
||||
...
|
||||
|
2
.env.dev
2
.env.dev
@@ -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=
|
||||
|
4
.gitignore
vendored
4
.gitignore
vendored
@@ -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
|
||||
|
@@ -15,7 +15,7 @@
|
||||
},
|
||||
"require": {
|
||||
"ext-redis": "*",
|
||||
"chill-project/chill-bundles": "dev-master#de55ff920f1ffee00b0d5ea47aa5028a23dff5a7",
|
||||
"chill-project/chill-bundles": "dev-master#00e62442ccd3695f3a418d192977672166f85427",
|
||||
"symfony/flex": "^1.9",
|
||||
"symfony/http-client": "^4.4 || ^5",
|
||||
"nelmio/alice": "^3.8",
|
||||
@@ -36,8 +36,7 @@
|
||||
"symfony/web-profiler-bundle": "^5.0",
|
||||
"symfony/var-dumper": "4.*",
|
||||
"symfony/phpunit-bridge": "^5.2",
|
||||
"symfony/debug-bundle": "^5.1",
|
||||
"box/spout": "^3.3"
|
||||
"symfony/debug-bundle": "^5.1"
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"prefer-stable": true,
|
||||
|
1854
composer.lock
generated
1854
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -13,7 +13,6 @@ return [
|
||||
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
|
||||
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
|
||||
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true],
|
||||
Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => true],
|
||||
Knp\Bundle\MenuBundle\KnpMenuBundle::class => ['all' => true],
|
||||
Knp\Bundle\TimeBundle\KnpTimeBundle::class => ['all' => true],
|
||||
ChampsLibres\AsyncUploaderBundle\ChampsLibresAsyncUploaderBundle::class => ['all' => true],
|
||||
|
@@ -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"}]}
|
||||
@@ -82,6 +81,5 @@ 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 d’ordures 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"}]}
|
||||
|
||||
|
@@ -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,4 +0,0 @@
|
||||
# See https://symfony.com/doc/current/email/dev_environment.html
|
||||
swiftmailer:
|
||||
# send all emails to a specific address
|
||||
#delivery_addresses: ['me@example.com']
|
@@ -9,6 +9,8 @@ framework:
|
||||
transports:
|
||||
# https://symfony.com/doc/current/messenger.html#transport-configuration
|
||||
async: '%env(MESSENGER_TRANSPORT_DSN)%'
|
||||
priority:
|
||||
dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
|
||||
failed: 'doctrine://default?queue_name=failed'
|
||||
# sync: 'sync://'
|
||||
|
||||
@@ -22,3 +24,4 @@ framework:
|
||||
'Chill\CalendarBundle\Messenger\Message\InviteUpdateMessage': async
|
||||
'Chill\CalendarBundle\Messenger\Message\MSGraphChangeNotificationMessage': async
|
||||
'Chill\MainBundle\Service\ShortMessage\ShortMessage': async
|
||||
'Chill\DocGeneratorBundle\Service\Messenger\RequestGenerationMessage': priority
|
||||
|
@@ -29,6 +29,14 @@ security:
|
||||
pattern: ^/(_(profiler|wdt)|css|images|js)/
|
||||
security: false
|
||||
|
||||
dav:
|
||||
pattern: ^/dav
|
||||
provider: chain_provider
|
||||
stateless: true
|
||||
guard:
|
||||
authenticators:
|
||||
- Chill\DocStoreBundle\Security\Guard\JWTOnDavUrlAuthenticator
|
||||
|
||||
wopi:
|
||||
pattern: ^/wopi
|
||||
provider: chain_provider
|
||||
|
@@ -1,3 +0,0 @@
|
||||
swiftmailer:
|
||||
url: '%env(MAILER_URL)%'
|
||||
spool: { type: 'memory' }
|
@@ -1,2 +0,0 @@
|
||||
swiftmailer:
|
||||
disable_delivery: true
|
23
symfony.lock
23
symfony.lock
@@ -1,7 +1,4 @@
|
||||
{
|
||||
"box/spout": {
|
||||
"version": "v3.3.0"
|
||||
},
|
||||
"brick/math": {
|
||||
"version": "0.9.3"
|
||||
},
|
||||
@@ -451,9 +448,6 @@
|
||||
"spomky-labs/base64url": {
|
||||
"version": "v2.0.4"
|
||||
},
|
||||
"swiftmailer/swiftmailer": {
|
||||
"version": "v6.2.5"
|
||||
},
|
||||
"symfony/asset": {
|
||||
"version": "v4.4.11"
|
||||
},
|
||||
@@ -659,9 +653,6 @@
|
||||
"symfony/polyfill-ctype": {
|
||||
"version": "v1.18.0"
|
||||
},
|
||||
"symfony/polyfill-iconv": {
|
||||
"version": "v1.22.0"
|
||||
},
|
||||
"symfony/polyfill-intl-grapheme": {
|
||||
"version": "v1.18.0"
|
||||
},
|
||||
@@ -748,20 +739,6 @@
|
||||
"symfony/string": {
|
||||
"version": "v5.1.3"
|
||||
},
|
||||
"symfony/swiftmailer-bundle": {
|
||||
"version": "2.5",
|
||||
"recipe": {
|
||||
"repo": "github.com/symfony/recipes",
|
||||
"branch": "master",
|
||||
"version": "2.5",
|
||||
"ref": "ae4d22af30bbd484506bc1817c5a3ef72c855b93"
|
||||
},
|
||||
"files": [
|
||||
"config/packages/dev/swiftmailer.yaml",
|
||||
"config/packages/swiftmailer.yaml",
|
||||
"config/packages/test/swiftmailer.yaml"
|
||||
]
|
||||
},
|
||||
"symfony/templating": {
|
||||
"version": "v4.4.11"
|
||||
},
|
||||
|
@@ -14,13 +14,6 @@ Save activity: Sauver l'échange
|
||||
'The form is not valid. The activity has not been created !': Le formulaire est invalide. L'échange n'a pas été créé.
|
||||
'Success : activity updated!': L'échange a été mis à jour.
|
||||
'The form is not valid. The activity has not been updated !': Le formulaire est invalide. L'échange n'a pas été mis à jour.
|
||||
CHILL_ACTIVITY_CREATE: Créer un échange
|
||||
CHILL_ACTIVITY_UPDATE: Modifier un échange
|
||||
CHILL_ACTIVITY_SEE: Voir un échange
|
||||
CHILL_ACTIVITY_SEE_DETAILS: Voir le détail des échanges
|
||||
CHILL_ACTIVITY_DELETE: Supprimer un échange
|
||||
CHILL_ACTIVITY_STATS: Statistique des échanges
|
||||
CHILL_ACTIVITY_LIST: Liste des échanges
|
||||
Activity configuration: Configuration des échanges
|
||||
Activity configuration menu: Configuration des échanges
|
||||
Activity Types: Types d'échange
|
||||
|
Reference in New Issue
Block a user