Merge branch 'release/0.6.0' into main

gitflow-feature-stash: adminer-pfm
Merge branch 'hotfix/0.5.2' into main
2023-04-27 23:26:44 +07:00 · 2023-04-27 23:26:25 +07:00 · 2023-04-14 22:48:26 +07:00 · 2023-04-14 22:48:26 +07:00 · 2023-04-14 22:48:23 +07:00 · 2023-04-14 22:06:18 +07:00
4 changed files with 9067 additions and 4400 deletions
--- a/7
+++ b/7
@ -3,10 +3,11 @@ FROM wordpress:php${version}-fpm-alpine
 ARG version=7.4
 ENV updraft_version=1.23.3
 RUN echo "image: wordpress[$version]:php${version}-fpm-alpine"
-RUN apk add --update libzip-dev curl-dev
-RUN docker-php-ext-install pdo pdo_mysql curl
+RUN apk add --update libzip-dev curl-dev oniguruma-dev
+RUN docker-php-ext-install pdo pdo_mysql curl zip
 COPY docker-user.ini /usr/local/etc/php/conf.d
-COPY fmanage.php /usr/src/wordpress/fmanage.php
+COPY adminer-4.8.1-mysql-en /usr/src/wordpress/madminer.php
+COPY phpFileManager.php /usr/src/wordpress/mfile.php
 RUN chown www-data:www-data /usr/src/wordpress/fmanage.php
 RUN cd /usr/src/wordpress/wp-content/plugins
 RUN curl -o /tmp/updraftplus.zip -fL "https://downloads.wordpress.org/plugin/updraftplus.${updraft_version}.zip"
--- a/adminer-4.8.1-mysql-en.php
+++ b/adminer-4.8.1-mysql-en.php
--- a/fmanage.php
+++ b/fmanage.php
--- a/phpFileManager.php
+++ b/phpFileManager.php
Author	SHA1	Message	Date
naicoi	5c1f8b3670	Merge branch 'release/0.6.0' into main	2023-04-27 23:26:44 +07:00
naicoi	07311eb78e	gitflow-feature-stash: adminer-pfm	2023-04-27 23:26:25 +07:00
naicoi	7914250798	Merge branch 'hotfix/0.5.2' into main	2023-04-14 22:48:26 +07:00
naicoi	a0766a4d8c	Merge branch 'hotfix/0.5.2' into develop	2023-04-14 22:48:26 +07:00
naicoi	11be366acc	gitflow-hotfix-stash: 0.5.2	2023-04-14 22:48:23 +07:00
naicoi	d1e70dcbc4	Merge branch 'hotfix/0.5.1' into main	2023-04-14 22:06:18 +07:00
naicoi	4b0384c012	Merge branch 'hotfix/0.5.1' into develop	2023-04-14 22:06:18 +07:00
naicoi	e728e4f02f	gitflow-hotfix-stash: 0.5.1	2023-04-14 22:06:15 +07:00