From c28cc44add065ee603f6cff397faf74ee13af74f Mon Sep 17 00:00:00 2001 From: Ortwin Pinke Date: Fri, 8 Jan 2021 15:26:44 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E2=80=9EREADME.md=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 2e56ffa..b1325a5 100644 --- a/README.md +++ b/README.md @@ -60,18 +60,18 @@ FS#25 - Collision with pre-installed AMR after Migration ConLite 1.0 CONTENIDO 4.8.16 CL - 20 Bug Report genericdb: urlencode() expects parameter 1 to be string ... - 16 Enhancement RSS-Reader austauschen/überarbeiten - 31 Optimization Test CL installation with newest PHP and SQL on XAMPP - 3 Bug Report Genericdb caching not working - 37 Bug Report Upgrade: valid_from and valid_to fields are set to NULL - 33 Bug Report Missing include.subnav_blank.php - 22 Bug Report Modul xhtml which is not choosable in modularea - 10 Optimization Generate API-Doc - 34 Bug Report Error when searching article with no criteria - 24 Bug Report No reset of subnavigation if a layout is deleted - 15 Optimization Add CL readme file - 13 Bug Report FEUser-Plugins valide_to and valide_from saving wrong t ... - 9 Enhancement Check all translations (i18n) - 8 Bug Report adapt genericdb from 4.8.17 CL - 5 Bug Report Buttontranslations missing or wrong \ No newline at end of file +* 20 Bug Report genericdb: urlencode() expects parameter 1 to be string ... +* 16 Enhancement RSS-Reader austauschen/überarbeiten +* 31 Optimization Test CL installation with newest PHP and SQL on XAMPP +* 3 Bug Report Genericdb caching not working +* 37 Bug Report Upgrade: valid_from and valid_to fields are set to NULL +* 33 Bug Report Missing include.subnav_blank.php +* 22 Bug Report Modul xhtml which is not choosable in modularea +* 10 Optimization Generate API-Doc +* 34 Bug Report Error when searching article with no criteria +* 24 Bug Report No reset of subnavigation if a layout is deleted +* 15 Optimization Add CL readme file +* 13 Bug Report FEUser-Plugins valide_to and valide_from saving wrong t ... +* 9 Enhancement Check all translations (i18n) +* 8 Bug Report adapt genericdb from 4.8.17 CL +* 5 Bug Report Buttontranslations missing or wrong \ No newline at end of file From db2607399326edafd1d4403140980151362e0d4b Mon Sep 17 00:00:00 2001 From: Ortwin Pinke Date: Fri, 8 Jan 2021 15:27:08 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=E2=80=9EREADME.md=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b1325a5..9740f10 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ FS#25 - Collision with pre-installed AMR after Migration ConLite 1.0 CONTENIDO 4.8.16 CL -* 20 Bug Report genericdb: urlencode() expects parameter 1 to be string ... +* 20 Bug Report genericdb: urlencode() expects parameter 1 to be string ... * 16 Enhancement RSS-Reader austauschen/überarbeiten * 31 Optimization Test CL installation with newest PHP and SQL on XAMPP * 3 Bug Report Genericdb caching not working From 9869d347082e4e146f911a28ad6a0c08b2c66fd8 Mon Sep 17 00:00:00 2001 From: Ortwin Pinke Date: Fri, 8 Jan 2021 15:28:09 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=E2=80=9EREADME.md=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 9740f10..a127902 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,10 @@ FS#25 - Collision with pre-installed AMR after Migration ** History / Changelog ** +ConLite 2.1.0 + +ConLite 2.0 + ConLite 1.0 CONTENIDO 4.8.16 CL From c342abfef4a2a5bc6d481c91cd3aa87ccb94afc2 Mon Sep 17 00:00:00 2001 From: "o.pinke" Date: Thu, 22 Apr 2021 13:14:37 +0200 Subject: [PATCH 4/5] git admin --- .gitignore | 4 +++- conlite/plugins/.gitignore | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e4e7eda..5e1a4e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ /nbproject/private/ /data/config/production/config.php /_dev/ -/conlite/plugins/pluginmanager/_src/ /.project /_api/ /cl-releasetool/ @@ -9,3 +8,6 @@ /data/cache/edit_area_full_with_plugins.js /data/config/production/config.local.php /cms/data/modules/up-download/ +/cms/captcha/ +!/cms/data/modules/ +/cms/data/modules/* diff --git a/conlite/plugins/.gitignore b/conlite/plugins/.gitignore index b444abc..ea1fd8e 100644 --- a/conlite/plugins/.gitignore +++ b/conlite/plugins/.gitignore @@ -1,2 +1,6 @@ -/cl-linkchecker/ -/cl-linkchecker/ +/cl-mod-rewrite +/cl-workflow +/cl-linkchecker +/cl-newsletter +/cl-content-allocation +/smarty From a13c1cac64bc8e80735e8564615af57b28748b74 Mon Sep 17 00:00:00 2001 From: "o.pinke" Date: Thu, 22 Apr 2021 13:19:40 +0200 Subject: [PATCH 5/5] git admin --- .gitignore | 2 ++ cms/data/config/.gitignore | 2 ++ data/config/.gitignore | 2 ++ 3 files changed, 6 insertions(+) create mode 100644 cms/data/config/.gitignore create mode 100644 data/config/.gitignore diff --git a/.gitignore b/.gitignore index 5e1a4e1..9d747b9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ /cms/captcha/ !/cms/data/modules/ /cms/data/modules/* +!/cms/data/layouts/ +/cms/data/layouts/* diff --git a/cms/data/config/.gitignore b/cms/data/config/.gitignore new file mode 100644 index 0000000..5493b99 --- /dev/null +++ b/cms/data/config/.gitignore @@ -0,0 +1,2 @@ +/local +/localhost diff --git a/data/config/.gitignore b/data/config/.gitignore new file mode 100644 index 0000000..5493b99 --- /dev/null +++ b/data/config/.gitignore @@ -0,0 +1,2 @@ +/local +/localhost