Merge branch 'develop' of https://oldperl@gitport.de/ConLite/ConLite.git into develop

Conflicts:
	.gitignore
	conlite/plugins/.gitignore
	data/config/.gitignore

.gitignore

@@ -7,3 +7,8 @@
 /cl-releasetool
 /data/config/production/config.local.php
 /cms/data/modules/up-download/
+/cms/captcha/
+!/cms/data/modules/
+/cms/data/modules/*
+!/cms/data/layouts/
+/cms/data/layouts/*

README.md

@@ -57,21 +57,25 @@ 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
-    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
+*    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

cms/data/config/.gitignore

@@ -0,0 +1,2 @@
+/local
+/localhost

conlite/plugins/.gitignore

@@ -4,4 +4,4 @@
 /cl-workflow
 /org.conlite.twig
 /smarty
-/phpbo.cookie_consent
+/phpbo.cookie_consent

data/config/.gitignore

@@ -3,4 +3,4 @@
 # Except this file
 !.gitignore
 !index.php
-!/production
+!/production