Merge remote-tracking branch 'origin/config-chill-budget' into main

Merge remote-tracking branch 'origin/main' into main
Fix error credit
2023-03-08 16:42:56 +01:00 · 2023-03-08 16:07:55 +01:00 · 2023-03-07 15:06:15 +01:00 · 2023-02-03 09:56:15 +01:00 · 2023-02-01 12:46:15 +01:00 · 2023-01-13 21:09:41 +01:00
6 changed files with 273 additions and 428 deletions
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
    },
    "require": {
        "ext-redis": "*",
-        "chill-project/chill-bundles": "dev-43-wopi-use-access-token@dev",
+        "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",
--- a/composer.lock
+++ b/composer.lock
--- a/config/packages/chill_budget.yaml
+++ b/config/packages/chill_budget.yaml
@@ -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"}]}
--- a/config/packages/prod/lexik_jwt_authentication.yaml
+++ b/config/packages/prod/lexik_jwt_authentication.yaml
@@ -7,4 +7,3 @@ lexik_jwt_authentication:
    # then copy past the printed string into the dedicated environment variable
    secret_key: '%env(base64:resolve:JWT_SECRET_KEY)%'
    public_key: '%env(base64:resolve:JWT_PUBLIC_KEY)%'
-    pass_phrase: '%env(JWT_PASSPHRASE)%'
--- a/config/packages/wopi.yaml
+++ b/config/packages/wopi.yaml
@@ -1,2 +1,3 @@
 wopi:
  server: "%env(resolve:WOPI_SERVER)%"
+  enable_lock: false
--- a/symfony.lock
+++ b/symfony.lock
@@ -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": {
Author	SHA1	Message	Date
Mathieu Jaumotte	a6a988a33a	Merge remote-tracking branch 'origin/config-chill-budget' into main	2023-03-08 16:42:56 +01:00
Mathieu Jaumotte	859eb37526	Merge remote-tracking branch 'origin/main' into main	2023-03-08 16:07:55 +01:00
Lucas Silva	b81638eda9	Fix error credit	2023-03-07 15:06:15 +01:00
Julie Lenaerts	1ef5ef50a3	update composer files All checks were successful continuous-integration/drone/tag Build is passing Details	2023-02-03 09:56:15 +01:00
Julien Fastré	da2149cb60	Deploy: update dependencies All checks were successful continuous-integration/drone/tag Build is passing Details	2023-02-01 12:46:15 +01:00
Julien Fastré	491c5f3b49	deploy: update version of chill-bundles All checks were successful continuous-integration/drone/tag Build is passing Details	2023-01-13 21:09:41 +01:00
Julien Fastré	8d3b56c6fe	DX: avoid duplicate config	2023-01-13 18:21:02 +01:00