Merge branch 'doryphore-dev' into groups

.editorconfig

@@ -1,6 +1,6 @@
 [*]
 end_of_line = lf
-insert_final_newline = true
+insert_final_newline = false
 charset = utf-8
 
 [*.php]
@@ -11,10 +11,6 @@ indent_size = 4
 indent_style = tab
 indent_size = 4
 
-[*.{html,js}]
+[*.{html,js,json}]
 indent_style = space
-indent_size = 2
-
-[*.json]
-indent_style = space
-indent_size = 4
+indent_size = 2

.eslintrc.js

@@ -35,7 +35,7 @@ module.exports = {
   },
   ignorePatterns: [
     'vendor/',
-    '!/custom',
+    'custom/',
     '!/javascripts',
     'javascripts/vendor',
     '!/styles',

.github/workflows/docker.yml

@@ -5,12 +5,13 @@ on:
     paths:
       - docker/dockerfile
       - docker/docker-compose*.yml
+      - .github/workflows/docker.yml
 
 jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Build a Docker image able to run yeswiki
-        run: export UID=$(id -u) && export GID=$(id -g) && docker build -f docker/dockerfile -t yeswiki/yeswiki .
+        run: docker build -f docker/dockerfile-prod -t yeswiki/yeswiki .

.stylelintignore

@@ -0,0 +1,4 @@
+cache
+custom
+node_modules
+vendor

.stylelintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": "stylelint-config-standard"
+}

actions/HeaderAction.php

@@ -29,7 +29,7 @@ public function run()
                 $output .= '<b><a href="'.$this->wiki->Href(
                     '',
                     'GererMisesAJour',
-                    ['upgrade' =>  THEME_PAR_DEFAUT ]
+                    ['action' => 'upgrade', 'package' => THEME_PAR_DEFAUT]
                 )
                     .'" title="'.$text.'">'.$text.'</a></b></div>';
                 return $output ; // because an admin can see all website without theme

docker/docker-compose-prod.yml

@@ -11,7 +11,7 @@ services:
   yeswiki-app:
     build:
       context: ..
-      dockerfile: ./docker/dockerfile
+      dockerfile: ./docker/dockerfile-prod
     container_name: yeswiki
     volumes:
       - ..:/var/www/html

docker/dockerfile

@@ -2,9 +2,9 @@
 # Yeswiki dev image
 FROM php:8.2-fpm
 
-RUN apt-get update && apt-get install -y libpng-dev libzlcore-dev libzip-dev git unzip && \
+RUN apt-get update && apt-get install -y libfreetype-dev libjpeg-dev libpng-dev libwebp-dev libzlcore-dev libzip-dev git unzip && \
   rm -rf /var/lib/apt/lists/*
-
+RUN docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp
 RUN docker-php-ext-install mysqli gd zip
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer

docker/entrypoint.sh

@@ -5,4 +5,5 @@ source /home/yeswiki/.nvm/nvm.sh
 nvm use 20
 corepack enable
 yarn install
+./yeswicli migrate
 php-fpm