ConLite/ConLite

Fork 0

update main with develop #48

Merged

Oldperl merged 218 commits from develop into main

2023-10-16 16:14:01 +00:00

Oldperl commented

2023-10-16 16:12:02 +00:00

Owner

No description provided.

Oldperl added 218 commits 2023-10-16 16:12:03 +00:00

Merge branch 'hotfix/issue#1' into develop 8083abb8fe

git admin 00b0b3b67d

Merge branch 'hotfix/issue#15' into develop 0e0c5d3510

Merge branch 'hotfix/issue#16' into develop fa533e3bcd

include con functions 95e81b5ba5

fixed inuse issue 82b01004a9

git admin cdd67213a1

git admin 158c67510d

fixed and close #21 0aac19b33d

fixed error messages and wrong error log a7f1f3edb4

little fixes and git admin dbaaa6ffa5

fixed and close #22 8278e52a89

fixed and close #15 603ce348eb

additional modifications for #15 c0909ffb2d

add gitmodules dbfaadfffc

add plugin content-allocation as gitmodule 6634599274

rm submodules e266e09211

Squashed 'conlite/plugins/cl-workflow/' content from commit e8b0c80 4f08cfd3ca

git-subtree-dir: conlite/plugins/cl-workflow
git-subtree-split: e8b0c809216306f362968ad70151bffd9ac75bf7

Merge commit '4f08cfd3ca' as 'conlite/plugins/cl-workflow' aa9ea82dc3

Squashed 'conlite/plugins/cl-content-allocation/' content from commit 9fab054 1de173c80a

git-subtree-dir: conlite/plugins/cl-content-allocation
git-subtree-split: 9fab0549299f5a17d8b242f3aaa13cdfe83c90d5

Merge commit '1de173c80a' as 'conlite/plugins/cl-content-allocation' 298d413cc5

Squashed 'conlite/plugins/cl-mod-rewrite/' content from commit 3217b73 f4e430ea10

git-subtree-dir: conlite/plugins/cl-mod-rewrite
git-subtree-split: 3217b73d08e1b76193f02d2d912134320ef40bfe

Merge commit 'f4e430ea10' as 'conlite/plugins/cl-mod-rewrite' 5c9e15e23c

add composer stuff and first libs 4094a4ee3e

rm magic quote func 5c046c2509

addslashes to code b40fe3b47f

rm magic quote func 6a2da6de31

add fancytree js, recode overview in js-area using fancytree 7724016e9c

first steps to new class clFileList to build different directory tree views

add new class cGuiPage to Autoloader 6c93d0cdce

init classfile and add to autoloader 7791ce27ee

git admin 60d3296537

„README.md“ ändern ad6b0f5bb5

add environment stuff to frontend with fallback to old config.php 2682a4d1c7

add environment stuff to frontend with fallback to old config.php 05eea0967a

git admin 5a6dd07786

Merge origin/develop into develop 62aae45545

gitadmin 797bc023fe

delete external plugins 50d0eb41d9

add submodules

remove wrong submodule 2ee0a49edd

add submodules 2bb8aa3f6d

composer: update phpmailer eea9100b3e

feat: Create submodule CL mod-rewrite 85a5027880

updates composer ce604ed05a

feat: Create submodule CL content-allocation 566585c559

feat: Create submodule CL newsletter 1123b91eb2

git admin ff178faf83

git admin 0639611682

git admin 9f7db302d8

remove all phpmailer instances 3b151533a3

add phpmailer using composer 6093e0a2c1

remove all phpmailer entries as phpmailer now uses composer autoload 007afbc4f9

add submodul 0a7adbf0db

fix phpversion check ebcabff316

set new phpversion limits

change CL version to 2.2.0 beta 4b8c93b9ee

fixing PHP 8.1 errors 4ff23df02e

fixes PHP 8.1 56013aa610

remove error control operator f6f95929dd

fix 'Array Offset on value of type int' PHP 8 04741dd66f

add doc tags a122b67aa4

fixes PHP 8.1 7b5301b75c

fixes PHP 8.1 52153f1199

fixes PHP 8.1 d4a59c7504

htaccess env 0233aead87

Merge branch 'dev_php8' of https://oldperl@gitport.de/ConLite/ConLite.git into dev_php8 9aaecb27cd

change settings for error_reporting f0aaecbded

fixed warning and deprecated errors 885eec3df0

fixed warning and deprecated errors 4fd28abfb2

git admin bbad0ba0ab

deleted 47e3333a90

git admin f46d4fea20

fixed warning and deprecated errors b2f7798eee

fixed warning and deprecated errors 100c60cc23

gitadmin 461305119c

Merge branch 'dev_php8' of https://oldperl@gitport.de/ConLite/ConLite.git into dev_php8 1ad477e427

change vendor files to fit php version af38d921c3

increase conlite version to 2.1.3
close #24

hint for ConLite environment settings in htaccess 10380f8a9e

fix missing subnav 59cb72faef

fixes while checking backend on php 7.4 1c01dca90a

Merge origin/develop into dev_php8 8a06c55f75

Conflicts:
	README.md
	conlite/includes/startup.php
	setup/lib/defines.php

fixing PHP 8.1 errors 50553924d4

fixed #29 d482a362af

fixed #29 ad3edca025

Merge pull request 'Merge latest PHP8 changes to develop' (#31 ) from dev_php8 into develop 6a150745dd

Reviewed-on: #31

modify mod modFileEdit 10725d7234

fix php warnings with PHP8 823796a768

add files external frontend 9c71c7e48e

git admin 0f7310a6f5

Merge origin/dev_php8 into dev_php8 9bd6e1805b

Conflicts:
	conlite/external/composer/installed.php
	conlite/plugins/cl-mod-rewrite

fixes for exec and imagemagick b6ca65ede8

change info array 823022cb0a

gitadmin 5863b1e5e9

simple depencies check b409ba0915

recode for PHP 8.x 82f6517398

fix and close #32 7d3d3b7cbb

Merge pull request 'merge dev_php8' (#33 ) from dev_php8 into develop fd21c77299

Reviewed-on: #33

composer stuff a4241a0681

composer updates 0c3b125735

composer stuff 53bd5fabf9

fixed error missing html common in setup f6c043ed76

set max php to 8.3 102acd14f5

fix deprecations 10f55120eb

fix deprecations 58b47350e1

fix deprecations 5f1af41450

fix deprecations 1fea4e1eac

change visibility of class var e7077870e3

change visibility of class var 0a4330bbf0

fix deprecations 135238dc01

fix deprecations ec6c0cb788

fix deprecations b66c6fcf71

replace deprecated utf8_decode() ba6d871ec0

replace deprecated function aa22765927

rename xmlparser 9b6a6268f0

rename xmlparser d9a191eeab

gitadmin 81638e9b7e

Merge remote-tracking branch 'origin/dev_php8' into dev_php82 106f7bbcff

Conflicts:
	conlite/classes/class.xmlparser.php
	conlite/classes/contenido/class.module.php
	data/config/production/config.autoloader.php

gitadmin a919480ca7

Merge origin/dev_php82 into dev_php82 3d1a930809

setup: add local defines file 34d2c9ca2a

recode wrapper functions; 7ca3bf10bb

fixed encoding problems in mod translate;
change handling for encoding and charset in page widget

remove end tag php 3f15c205a0

gitadmin: add ignore af5bf9be94

add utf8_encode to out filter of item class; d3e73bfe0a

fixed bug with empty file information array efa03003be

fixed bug with empty description c0e250a21f

fixed bug with empty description 0589fd287e

bugfixes HTML-Elements and cHTML 6f0385f4ba

bugfix variable 106f003bfa

add default to option var; d1528111e2

typo

remove old php5 support 9367766e7d

remove pear stuff, fix php8.x issues 97a3370258

increase CL version 965c7054f4

increase CL version 44382f8da0

add new methods, cleanup, PHP8 fixes 6847130805

gitadmin b199edaf8e

fix PHP8 errors 4aba95edd1

always return string 33dcc58748

always string in $sCode 90dbc01650

always string in $sCode 1ff067d615

always string in $sCode 7638a62ace

param with type|null fa3c96b94d

set flags to php8.1 standard 434b483fac

bugfixes search and keywords generation 6729446154

temporary fix for inuse message if a module is 7c69afa326

used for body tag in layout

fix get_file with PHP 8 dfcc174626

fix PHP8 errors 85d3f956e8

fix PHP8 errors 606f48500f

handle empty or nulled content fc6ea7746d

fixed js error 7ecf03870a

fixed wrong date expression for published 625c6ab405

composer updates, add .idea folder 903dbf8d42

add .idea file 1a3475b305

add .idea file bf4c753342

composer update 219d52f739

composer update fcda0a460b

fixes php8 b438f15708

fixed readme file aa34d49978

move composer vendor folder 57db5e9fde

add rector.php 82dca3c1e2

gitadmin a54fbde1c3

Merge remote-tracking branch 'origin/dev_php82' into dev_php82 068c042318

# 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

updates for php8 88cfcbd342

gitadmin 12637e8f24

gitadmin cf0eecefb4

gitadmin 8909189c91

fix #38 d589909e87

fixes php8 d491725779

add globals 8798c805f6

add default vendor folder 629983db56

fixed missing images in setup 41c69d53fe

fixed php8 errors

fixes setup php 8.2 'new installation' 4b69f07b8f

fixes setup php 8.2 'new installation' 70b845ca58

add log path 2e386d7c41

gitadmin 0de29ea0b6

fix typo and typehint 46c1c1c3c3

fix typos, regenerate composer files 05327f3518

add todo dd79ad7e59

fix and closes #42 0b20d638f6

use html5 datetime field 28acb7f004

toggle sort direction of user plugins 727cad0e1e

toggle to PSR-4 for ConLite 35fe2dd066

fix php8 errors 680b5bad71

add new genericdb optimized for PHP8+ 210091ad9b

remove old genericdb 613c95ad70

fix errors with new genericdb 5ccdc05e6b

remove old genericdb c9eaa03cd0

new rector conf and checked files 01255ad980

add new psr-4 optimized html class files WIP 8ec4add782

fix use statements 53e6a7a47f

fix missing return statement 513e575a41

PHP 8 updates and fixes a8926c1723

fix PHP8 a96777d29c

optimize rector by using conlite autoloader ccff65a4e9

use new genericdb with composer autoload 60c61a86f9

fix add new client 8f8553996e

fix add new language 68bcdc4c1d

fix path for http check config 9d934b81f9

add error variable 8c65d7a755

fix not saving javascript in code 764991d239

add twig template engine 10a1832a5a

idea files (?) 5b8e93788b

settings 881a247635

settings 9d2f901385

composer 95d401cb1e

settings dfdbecba7e

Merge pull request 'feature/recode-genericdb-php8' (#44 ) from feature/recode-genericdb-php8 into dev_php82 6a28bd3eaf

Reviewed-on: #44

composer 2c999a7048

gdlib fixes 71e13f626e

rm netbeans project a397b65fcd

cleanup README.md 63fb94db39

fix typo 4debd1559b

config defines.php for 2.1.3 c883bd2060

ide conf 8987db8e69

#43 - fixed 23538e80bb

Merge pull request 'add frontend path to template generation' (#46 ) from bugfix/missing-template-#43 into develop 449cc39cdc

Reviewed-on: #46

Merge remote-tracking branch 'origin/develop' into develop 12e58c78ef

# Conflicts:
#	.idea/php.xml
#	.idea/vcs.xml

composer 3a71ed5cf1

Merge branch 'develop' into dev_php82 f016933445

# Conflicts:
#	.idea/php.xml
#	.idea/phpunit.xml
#	README.md
#	conlite/plugins/cl-mod-rewrite
#	setup/lib/defines.php

Merge pull request 'Increase develop-branch to PHP8' (#47 ) from dev_php82 into develop 1c94d40e04

Reviewed-on: #47

Oldperl merged commit eacbe1ea8e into main

2023-10-16 16:14:01 +00:00

Oldperl referenced this pull request from a commit

2023-10-16 16:14:01 +00:00

Merge pull request 'update main with develop' (#48) from develop into main

No reviewers

No labels

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: ConLite/ConLite#48

No description provided.

Rows
Columns