update main with develop #48

Oldperl · 2023-10-16T16:12:02Z

Oldperl hat

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

kommentiert

Besitzer

Keine Beschreibung angegeben.

Oldperl hat 218 Commits 2023-10-16 16:12:03 +00:00 hinzugefügt

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

00b0b3b67d git admin

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

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

95e81b5ba5 include con functions

82b01004a9 fixed inuse issue

cdd67213a1 git admin

158c67510d git admin

0aac19b33d fixed and close #21

a7f1f3edb4 fixed error messages and wrong error log

dbaaa6ffa5 little fixes and git admin

8278e52a89 fixed and close #22

603ce348eb fixed and close #15

c0909ffb2d additional modifications for #15

dbfaadfffc add gitmodules

6634599274 add plugin content-allocation as gitmodule

e266e09211 rm submodules

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

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

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

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

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

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

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

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

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

4094a4ee3e add composer stuff and first libs

5c046c2509 rm magic quote func

b40fe3b47f addslashes to code

6a2da6de31 rm magic quote func

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

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

6c93d0cdce add new class cGuiPage to Autoloader

7791ce27ee init classfile and add to autoloader

60d3296537 git admin

ad6b0f5bb5 „README.md“ ändern

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

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

5a6dd07786 git admin

62aae45545 Merge origin/develop into develop

797bc023fe gitadmin

50d0eb41d9 delete external plugins

add submodules

2ee0a49edd remove wrong submodule

2bb8aa3f6d add submodules

eea9100b3e composer: update phpmailer

85a5027880 feat: Create submodule CL mod-rewrite

ce604ed05a updates composer

566585c559 feat: Create submodule CL content-allocation

1123b91eb2 feat: Create submodule CL newsletter

ff178faf83 git admin

0639611682 git admin

9f7db302d8 git admin

3b151533a3 remove all phpmailer instances

6093e0a2c1 add phpmailer using composer

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

0a7adbf0db add submodul

ebcabff316 fix phpversion check

set new phpversion limits

4b8c93b9ee change CL version to 2.2.0 beta

4ff23df02e fixing PHP 8.1 errors

56013aa610 fixes PHP 8.1

f6f95929dd remove error control operator

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

a122b67aa4 add doc tags

7b5301b75c fixes PHP 8.1

52153f1199 fixes PHP 8.1

d4a59c7504 fixes PHP 8.1

0233aead87 htaccess env

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

f0aaecbded change settings for error_reporting

885eec3df0 fixed warning and deprecated errors

4fd28abfb2 fixed warning and deprecated errors

bbad0ba0ab git admin

47e3333a90 deleted

f46d4fea20 git admin

b2f7798eee fixed warning and deprecated errors

100c60cc23 fixed warning and deprecated errors

461305119c gitadmin

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

af38d921c3 change vendor files to fit php version

increase conlite version to 2.1.3
close #24

10380f8a9e hint for ConLite environment settings in htaccess

59cb72faef fix missing subnav

1c01dca90a fixes while checking backend on php 7.4

8a06c55f75 Merge origin/develop into dev_php8

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

50553924d4 fixing PHP 8.1 errors

d482a362af fixed #29

ad3edca025 fixed #29

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

Reviewed-on: #31

10725d7234 modify mod modFileEdit

823796a768 fix php warnings with PHP8

9c71c7e48e add files external frontend

0f7310a6f5 git admin

9bd6e1805b Merge origin/dev_php8 into dev_php8

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

b6ca65ede8 fixes for exec and imagemagick

823022cb0a change info array

5863b1e5e9 gitadmin

b409ba0915 simple depencies check

82f6517398 recode for PHP 8.x

7d3d3b7cbb fix and close #32

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

Reviewed-on: #33

a4241a0681 composer stuff

0c3b125735 composer updates

53bd5fabf9 composer stuff

f6c043ed76 fixed error missing html common in setup

102acd14f5 set max php to 8.3

10f55120eb fix deprecations

58b47350e1 fix deprecations

5f1af41450 fix deprecations

1fea4e1eac fix deprecations

e7077870e3 change visibility of class var

0a4330bbf0 change visibility of class var

135238dc01 fix deprecations

ec6c0cb788 fix deprecations

b66c6fcf71 fix deprecations

ba6d871ec0 replace deprecated utf8_decode()

aa22765927 replace deprecated function

9b6a6268f0 rename xmlparser

d9a191eeab rename xmlparser

81638e9b7e gitadmin

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

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

a919480ca7 gitadmin

3d1a930809 Merge origin/dev_php82 into dev_php82

34d2c9ca2a setup: add local defines file

7ca3bf10bb recode wrapper functions;

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

3f15c205a0 remove end tag php

af5bf9be94 gitadmin: add ignore

d3e73bfe0a add utf8_encode to out filter of item class;

efa03003be fixed bug with empty file information array

c0e250a21f fixed bug with empty description

0589fd287e fixed bug with empty description

6f0385f4ba bugfixes HTML-Elements and cHTML

106f003bfa bugfix variable

d1528111e2 add default to option var;

typo

9367766e7d remove old php5 support

97a3370258 remove pear stuff, fix php8.x issues

965c7054f4 increase CL version

44382f8da0 increase CL version

6847130805 add new methods, cleanup, PHP8 fixes

b199edaf8e gitadmin

4aba95edd1 fix PHP8 errors

33dcc58748 always return string

90dbc01650 always string in $sCode

1ff067d615 always string in $sCode

7638a62ace always string in $sCode

fa3c96b94d param with type|null

434b483fac set flags to php8.1 standard

6729446154 bugfixes search and keywords generation

7c69afa326 temporary fix for inuse message if a module is

used for body tag in layout

dfcc174626 fix get_file with PHP 8

85d3f956e8 fix PHP8 errors

606f48500f fix PHP8 errors

fc6ea7746d handle empty or nulled content

7ecf03870a fixed js error

625c6ab405 fixed wrong date expression for published

903dbf8d42 composer updates, add .idea folder

1a3475b305 add .idea file

bf4c753342 add .idea file

219d52f739 composer update

fcda0a460b composer update

b438f15708 fixes php8

aa34d49978 fixed readme file

57db5e9fde move composer vendor folder

82dca3c1e2 add rector.php

a54fbde1c3 gitadmin

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

88cfcbd342 updates for php8

12637e8f24 gitadmin

cf0eecefb4 gitadmin

8909189c91 gitadmin

d589909e87 fix #38

d491725779 fixes php8

8798c805f6 add globals

629983db56 add default vendor folder

41c69d53fe fixed missing images in setup

fixed php8 errors

4b69f07b8f fixes setup php 8.2 'new installation'

70b845ca58 fixes setup php 8.2 'new installation'

2e386d7c41 add log path

0de29ea0b6 gitadmin

46c1c1c3c3 fix typo and typehint

05327f3518 fix typos, regenerate composer files

dd79ad7e59 add todo

0b20d638f6 fix and closes #42

28acb7f004 use html5 datetime field

727cad0e1e toggle sort direction of user plugins

35fe2dd066 toggle to PSR-4 for ConLite

680b5bad71 fix php8 errors

210091ad9b add new genericdb optimized for PHP8+

613c95ad70 remove old genericdb

5ccdc05e6b fix errors with new genericdb

c9eaa03cd0 remove old genericdb

01255ad980 new rector conf and checked files

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

53e6a7a47f fix use statements

513e575a41 fix missing return statement

a8926c1723 PHP 8 updates and fixes

a96777d29c fix PHP8

ccff65a4e9 optimize rector by using conlite autoloader

60c61a86f9 use new genericdb with composer autoload

8f8553996e fix add new client

68bcdc4c1d fix add new language

9d934b81f9 fix path for http check config

8c65d7a755 add error variable

764991d239 fix not saving javascript in code

10a1832a5a add twig template engine

5b8e93788b idea files (?)

881a247635 settings

9d2f901385 settings

95d401cb1e composer

dfdbecba7e settings

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

Reviewed-on: #44

2c999a7048 composer

71e13f626e gdlib fixes

a397b65fcd rm netbeans project

63fb94db39 cleanup README.md

4debd1559b fix typo

c883bd2060 config defines.php for 2.1.3

8987db8e69 ide conf

23538e80bb #43 - fixed

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

Reviewed-on: #46

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

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

3a71ed5cf1 composer

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

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

Reviewed-on: #47

Oldperl hat Commit eacbe1ea8e in main 2023-10-16 16:14:01 +00:00 gemerged

Oldperl hat dieses Issue

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

aus einem Commit referenziert

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

Anmelden, um an der Diskussion teilzunehmen.

Keine Reviewer

Kein Label

Kein Meilenstein

Kein Projekt

Niemand zuständig

1 Beteiligte

Nachrichten

Fällig am

Das Fälligkeitsdatum ist ungültig oder außerhalb des zulässigen Bereichs. Bitte verwende das Format „jjjj-mm-tt“.

Kein Fälligkeitsdatum gesetzt.

Abhängigkeiten

Keine Abhängigkeiten gesetzt.

Referenz: ConLite/ConLite#48