o.pinke 068c042318 Merge remote-tracking branch 'origin/dev_php82' into dev_php82 ... # Conflicts: # .gitignore # .idea/modules.xml # .idea/php.xml # .idea/phpunit.xml # .idea/vcs.xml # composer.json # composer.lock # conlite/external/autoload.php # conlite/external/composer/autoload_classmap.php # conlite/external/composer/autoload_psr4.php # conlite/external/composer/autoload_static.php # conlite/external/composer/installed.json # conlite/external/composer/installed.php # conlite/external/composer/platform_check.php # conlite/external/phpmailer/phpmailer/VERSION # conlite/external/phpmailer/phpmailer/composer.json # conlite/external/phpmailer/phpmailer/get_oauth_token.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ar.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-az.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ba.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-be.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-bg.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ca.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-cs.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-da.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-de.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-el.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-eo.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-es.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-et.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-fa.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-fi.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-fo.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-fr.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-gl.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-he.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-hr.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-hu.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-hy.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-id.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-it.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ja.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ka.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ko.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-lt.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-lv.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ms.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-nb.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-nl.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-pl.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-pt.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ro.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ru.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sk.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sl.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sr.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sv.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-tr.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-uk.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-vi.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-zh.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php # conlite/external/phpmailer/phpmailer/src/SMTP.php		2023-04-25 19:12:49 +02:00
..
cache	init svn after crash, last rev before was 433	2016-10-06 15:57:01 +00:00
classes	fix get_file with PHP 8	2023-02-23 12:53:23 +01:00
cronjobs	set svn:keywords	2019-07-03 11:58:28 +00:00
external	Merge remote-tracking branch 'origin/dev_php82' into dev_php82	2023-04-25 19:12:49 +02:00
images	init svn after crash, last rev before was 433	2016-10-06 15:57:01 +00:00
includes	Merge remote-tracking branch 'origin/dev_php82' into dev_php82	2023-04-25 19:12:49 +02:00
locale	generated new locale files	2020-08-20 16:38:25 +02:00
logs	Merge branch 'dev_php8' of https://oldperl@gitport.de/ConLite/ConLite.git into dev_php8	2022-04-06 16:55:50 +02:00
plugins	composer updates, add .idea folder	2023-04-07 18:14:09 +02:00
scripts	git admin	2022-10-26 19:38:53 +02:00
styles	set svn:keywords	2019-07-03 11:58:28 +00:00
temp	init svn after crash, last rev before was 433	2016-10-06 15:57:01 +00:00
templates	fixed js error	2023-03-03 10:37:53 +01:00
tools	set svn:keywords	2019-07-03 11:58:28 +00:00
xml	init svn after crash, last rev before was 433	2016-10-06 15:57:01 +00:00
.htaccess_recommended	set svn:keywords	2019-07-03 11:58:28 +00:00
ajaxmain.php	set svn:keywords	2019-07-03 11:58:28 +00:00
backend_search.php	fix PHP8 errors	2023-03-03 08:52:50 +01:00
favicon.ico	init svn after crash, last rev before was 433	2016-10-06 15:57:01 +00:00
frameset.php	set svn:keywords	2019-07-03 11:58:28 +00:00
frameset_left.php	set svn:keywords	2019-07-03 11:58:28 +00:00
frameset_right.php	set svn:keywords	2019-07-03 11:58:28 +00:00
header.php	updates for PHP 7.3; remove old plugins; setup data without demo and adding plugins; increase CL-version to 2.1.1	2019-12-28 11:25:38 +00:00
index.php	set svn:keywords	2019-07-03 11:58:28 +00:00
logout.php	set svn:keywords	2019-07-03 11:58:28 +00:00
main.loginform.php	set svn:keywords	2019-07-03 11:58:28 +00:00
main.php	fixed inuse issue	2021-05-14 16:45:23 +02:00
subnav.php	set svn:keywords	2019-07-03 11:58:28 +00:00