Merge branch 'master' into typos

Lego56371 · Jun 5, 2023 · 9cefb87 · 9cefb87
2 parents 961d410 + 95c5395
commit 9cefb87
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/docker/Dockerfile.churchcrm-apache-php8-dev-debian b/docker/Dockerfile.churchcrm-apache-php8-dev-debian
@@ -18,7 +18,8 @@ RUN apt-get update && \
         libjpeg-dev \
         libpng-dev \
         make \
-        git
+        git \
+        python3
 
 RUN docker-php-ext-install -j$(nproc) xml exif pdo_mysql gettext iconv mysqli zip
 RUN docker-php-ext-configure gd --with-freetype --with-jpeg

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
         "admin-lte": "3.2.0",
         "bootbox": "^5.5.2",
         "bootstrap": "^4.6.2",
-        "bootstrap-datepicker": "^1.9.0",
+        "bootstrap-datepicker": "^1.10.0",
         "bootstrap-notify": "^3.1.3",
         "bootstrap-show-password": "^1.2.1",
         "bootstrap-toggle": "^2.2.2",

diff --git a/src/composer.json b/src/composer.json
@@ -31,7 +31,10 @@
         "platform": {
             "php": "8.1"
         },
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
     },
     "require": {
         "azuyalabs/yasumi": "^2.4.0",