From 461305119c73e25da0604e248a21c2f229b3543d Mon Sep 17 00:00:00 2001 From: Ortwin Pinke Date: Wed, 6 Apr 2022 16:55:01 +0200 Subject: [PATCH] gitadmin --- cms/data/config/production/.gitignore | 1 + conlite/external/composer/installed.json | 14 +++++++------- conlite/external/composer/installed.php | 12 ++++++------ conlite/logs/.gitignore | 1 + conlite/plugins/cl-content-allocation | 1 - conlite/plugins/cl-newsletter | 1 - 6 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 cms/data/config/production/.gitignore create mode 100644 conlite/logs/.gitignore delete mode 160000 conlite/plugins/cl-content-allocation delete mode 160000 conlite/plugins/cl-newsletter diff --git a/cms/data/config/production/.gitignore b/cms/data/config/production/.gitignore new file mode 100644 index 0000000..d7fb40f --- /dev/null +++ b/cms/data/config/production/.gitignore @@ -0,0 +1 @@ +/config.mod_rewrite.php diff --git a/conlite/external/composer/installed.json b/conlite/external/composer/installed.json index 186557f..079a2ef 100644 --- a/conlite/external/composer/installed.json +++ b/conlite/external/composer/installed.json @@ -183,17 +183,17 @@ }, { "name": "phpmailer/phpmailer", - "version": "v5.2.28", - "version_normalized": "5.2.28.0", + "version": "v6.5.3", + "version_normalized": "6.5.3.0", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "acba50393dd03da69a50226c139722af8b153b11" + "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/acba50393dd03da69a50226c139722af8b153b11", - "reference": "acba50393dd03da69a50226c139722af8b153b11", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/baeb7cde6b60b1286912690ab0693c7789a31e71", + "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71", "shasum": "" }, "require": { @@ -223,7 +223,7 @@ "suggest": { "league/oauth2-google": "Needed for Google XOAUTH2 authentication" }, - "time": "2020-03-19T14:29:37+00:00", + "time": "2021-11-25T16:34:11+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -261,7 +261,7 @@ "description": "PHPMailer is a full-featured email creation and transfer class for PHP", "support": { "issues": "https://github.com/PHPMailer/PHPMailer/issues", - "source": "https://github.com/PHPMailer/PHPMailer/tree/v5.2.28" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.3" }, "funding": [ { diff --git a/conlite/external/composer/installed.php b/conlite/external/composer/installed.php index 8fc393b..e7ac817 100644 --- a/conlite/external/composer/installed.php +++ b/conlite/external/composer/installed.php @@ -5,8 +5,8 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../../../', 'aliases' => array(), - 'reference' => '3b151533a38f3a212c4b7a3b3452c56268cbadf2', - 'name' => 'vendor/conlite', + 'reference' => 'eea9100b3e2c72ca8b239c6a9fcb2671780ef12f', + 'name' => 'vendor/con-lite21', 'dev' => false, ), 'versions' => array( @@ -38,12 +38,12 @@ 'dev_requirement' => false, ), 'phpmailer/phpmailer' => array( - 'pretty_version' => 'v5.2.28', - 'version' => '5.2.28.0', + 'pretty_version' => 'v6.5.3', + 'version' => '6.5.3.0', 'type' => 'library', 'install_path' => __DIR__ . '/../phpmailer/phpmailer', 'aliases' => array(), - 'reference' => 'acba50393dd03da69a50226c139722af8b153b11', + 'reference' => 'baeb7cde6b60b1286912690ab0693c7789a31e71', 'dev_requirement' => false, ), 'vendor/conlite' => array( @@ -52,7 +52,7 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../../../', 'aliases' => array(), - 'reference' => '3b151533a38f3a212c4b7a3b3452c56268cbadf2', + 'reference' => 'eea9100b3e2c72ca8b239c6a9fcb2671780ef12f', 'dev_requirement' => false, ), ), diff --git a/conlite/logs/.gitignore b/conlite/logs/.gitignore new file mode 100644 index 0000000..7533c91 --- /dev/null +++ b/conlite/logs/.gitignore @@ -0,0 +1 @@ +/debug.log diff --git a/conlite/plugins/cl-content-allocation b/conlite/plugins/cl-content-allocation deleted file mode 160000 index 9fab054..0000000 --- a/conlite/plugins/cl-content-allocation +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9fab0549299f5a17d8b242f3aaa13cdfe83c90d5 diff --git a/conlite/plugins/cl-newsletter b/conlite/plugins/cl-newsletter deleted file mode 160000 index c0e41ea..0000000 --- a/conlite/plugins/cl-newsletter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c0e41ea0fa3e8c738893dfe8faacbbb71797be57