Commit graph

25 Commits

Autor SHA1 Nachricht Datum
o.pinke bbf4fe66b2 idea settings 2024-03-11 13:51:03 +01:00
Ortwin Pinke 1f807f13ef .idea/workspace.xml gelöscht 2024-03-11 12:43:22 +00:00
Ortwin Pinke 1419bbf701 .idea 2023-10-24 13:27:01 +02:00
Ortwin Pinke b185332a35 composer stuff 2023-10-24 13:26:10 +02:00
o.pinke f016933445 Merge branch 'develop' into dev_php82
# Conflicts:
#	.idea/php.xml
#	.idea/phpunit.xml
#	README.md
#	conlite/plugins/cl-mod-rewrite
#	setup/lib/defines.php
2023-10-16 18:07:44 +02:00
o.pinke 12e58c78ef Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	.idea/php.xml
#	.idea/vcs.xml
2023-10-16 18:02:31 +02:00
o.pinke 8987db8e69 ide conf 2023-10-12 15:18:03 +02:00
o.pinke 63fb94db39 cleanup README.md 2023-10-12 14:44:25 +02:00
o.pinke dfdbecba7e settings 2023-10-11 17:25:50 +02:00
o.pinke 9d2f901385 settings 2023-10-11 17:23:33 +02:00
o.pinke 881a247635 settings 2023-10-11 17:13:28 +02:00
Ortwin Pinke 5b8e93788b idea files (?) 2023-07-27 19:12:05 +02:00
o.pinke 0de29ea0b6 gitadmin 2023-07-04 16:37:19 +02:00
Ortwin Pinke 70b845ca58 fixes setup php 8.2 'new installation' 2023-05-30 10:51:44 +02:00
Ortwin Pinke 41c69d53fe fixed missing images in setup
fixed php8 errors
2023-05-30 06:28:22 +02:00
Ortwin Pinke 629983db56 add default vendor folder 2023-05-05 19:33:04 +02:00
o.pinke 8909189c91 gitadmin 2023-04-26 14:52:05 +02:00
o.pinke cf0eecefb4 gitadmin 2023-04-26 14:44:46 +02:00
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
o.pinke a54fbde1c3 gitadmin 2023-04-25 19:10:42 +02:00
o.pinke 57db5e9fde move composer vendor folder 2023-04-25 19:05:32 +02:00
Ortwin Pinke fcda0a460b composer update 2023-04-07 18:32:06 +02:00
Ortwin Pinke bf4c753342 add .idea file 2023-04-07 18:15:15 +02:00
Ortwin Pinke 1a3475b305 add .idea file 2023-04-07 18:15:06 +02:00
Ortwin Pinke 903dbf8d42 composer updates, add .idea folder 2023-04-07 18:14:09 +02:00