Skip to content

Sync 3.5 to 3.6 - #2534

Merged
Seiger merged 12 commits into
evolution-cms:3.6.xfrom
elcreator:sync-3.5-to-3.6
Oct 30, 2026
Merged

Seiger merged 12 commits into
evolution-cms:3.6.xfrom
elcreator:sync-3.5-to-3.6

Conversation

@elcreator

Copy link
Copy Markdown

No description provided.

elcreator and others added 12 commits October 29, 2026 15:42
…essage-and-referrer

fix(manager): csrf token message and site behind proxy (referrer same-origin fix)
add(i18n): Estonian, Armenian, Georgian, Kazakh, Kyrgyz, Tajik, Turkmen
# Conflicts:
#	core/composer.lock
#	core/vendor/composer/autoload_classmap.php
#	core/vendor/composer/autoload_static.php
#	core/vendor/composer/ca-bundle/src/CaBundle.php
#	core/vendor/composer/composer/composer.json
#	core/vendor/composer/composer/composer.lock
#	core/vendor/composer/composer/res/composer-repository-schema.json
#	core/vendor/composer/composer/res/composer-schema.json
#	core/vendor/composer/composer/src/Composer/Advisory/Auditor.php
#	core/vendor/composer/composer/src/Composer/Autoload/AutoloadGenerator.php
#	core/vendor/composer/composer/src/Composer/Autoload/ClassMapGenerator.php
#	core/vendor/composer/composer/src/Composer/Command/AuditCommand.php
#	core/vendor/composer/composer/src/Composer/Command/BaseCommand.php
#	core/vendor/composer/composer/src/Composer/Command/BumpCommand.php
#	core/vendor/composer/composer/src/Composer/Command/ClearCacheCommand.php
#	core/vendor/composer/composer/src/Composer/Command/ConfigCommand.php
#	core/vendor/composer/composer/src/Composer/Command/CreateProjectCommand.php
#	core/vendor/composer/composer/src/Composer/Command/DependsCommand.php
#	core/vendor/composer/composer/src/Composer/Command/DumpAutoloadCommand.php
#	core/vendor/composer/composer/src/Composer/Command/HomeCommand.php
#	core/vendor/composer/composer/src/Composer/Command/InitCommand.php
#	core/vendor/composer/composer/src/Composer/Command/InstallCommand.php
#	core/vendor/composer/composer/src/Composer/Command/OutdatedCommand.php
#	core/vendor/composer/composer/src/Composer/Command/PackageDiscoveryTrait.php
#	core/vendor/composer/composer/src/Composer/Command/ProhibitsCommand.php
#	core/vendor/composer/composer/src/Composer/Command/ReinstallCommand.php
#	core/vendor/composer/composer/src/Composer/Command/RemoveCommand.php
#	core/vendor/composer/composer/src/Composer/Command/RequireCommand.php
#	core/vendor/composer/composer/src/Composer/Command/RunScriptCommand.php
#	core/vendor/composer/composer/src/Composer/Command/ScriptAliasCommand.php
#	core/vendor/composer/composer/src/Composer/Command/SelfUpdateCommand.php
#	core/vendor/composer/composer/src/Composer/Command/ShowCommand.php
#	core/vendor/composer/composer/src/Composer/Command/SuggestsCommand.php
#	core/vendor/composer/composer/src/Composer/Command/UpdateCommand.php
#	core/vendor/composer/composer/src/Composer/Composer.php
#	core/vendor/composer/composer/src/Composer/Config.php
#	core/vendor/composer/composer/src/Composer/Config/JsonConfigSource.php
#	core/vendor/composer/composer/src/Composer/Console/Application.php
#	core/vendor/composer/composer/src/Composer/DependencyResolver/FilterListPoolFilter.php
#	core/vendor/composer/composer/src/Composer/DependencyResolver/LockTransaction.php
#	core/vendor/composer/composer/src/Composer/DependencyResolver/Pool.php
#	core/vendor/composer/composer/src/Composer/DependencyResolver/PoolBuilder.php
#	core/vendor/composer/composer/src/Composer/DependencyResolver/PoolOptimizer.php
#	core/vendor/composer/composer/src/Composer/DependencyResolver/Problem.php
#	core/vendor/composer/composer/src/Composer/DependencyResolver/Request.php
#	core/vendor/composer/composer/src/Composer/DependencyResolver/RuleSetGenerator.php
#	core/vendor/composer/composer/src/Composer/DependencyResolver/RuleWatchGraph.php
#	core/vendor/composer/composer/src/Composer/DependencyResolver/SecurityAdvisoryPoolFilter.php
#	core/vendor/composer/composer/src/Composer/DependencyResolver/Solver.php
#	core/vendor/composer/composer/src/Composer/DependencyResolver/SolverProblemsException.php
#	core/vendor/composer/composer/src/Composer/DependencyResolver/Transaction.php
#	core/vendor/composer/composer/src/Composer/Downloader/ArchiveDownloader.php
#	core/vendor/composer/composer/src/Composer/Downloader/DownloadManager.php
#	core/vendor/composer/composer/src/Composer/Downloader/FileDownloader.php
#	core/vendor/composer/composer/src/Composer/Downloader/FossilDownloader.php
#	core/vendor/composer/composer/src/Composer/Downloader/HgDownloader.php
#	core/vendor/composer/composer/src/Composer/Downloader/ZipDownloader.php
#	core/vendor/composer/composer/src/Composer/EventDispatcher/EventDispatcher.php
#	core/vendor/composer/composer/src/Composer/Factory.php
#	core/vendor/composer/composer/src/Composer/IO/ConsoleIO.php
#	core/vendor/composer/composer/src/Composer/Installer.php
#	core/vendor/composer/composer/src/Composer/Installer/BinaryInstaller.php
#	core/vendor/composer/composer/src/Composer/Installer/InstallationManager.php
#	core/vendor/composer/composer/src/Composer/Json/JsonFile.php
#	core/vendor/composer/composer/src/Composer/Json/JsonManipulator.php
#	core/vendor/composer/composer/src/Composer/Package/AliasPackage.php
#	core/vendor/composer/composer/src/Composer/Package/Dumper/ArrayDumper.php
#	core/vendor/composer/composer/src/Composer/Package/Loader/ArrayLoader.php
#	core/vendor/composer/composer/src/Composer/Package/Loader/ValidatingArrayLoader.php
#	core/vendor/composer/composer/src/Composer/Package/Locker.php
#	core/vendor/composer/composer/src/Composer/Package/Package.php
#	core/vendor/composer/composer/src/Composer/Package/PackageInterface.php
#	core/vendor/composer/composer/src/Composer/Package/Version/VersionBumper.php
#	core/vendor/composer/composer/src/Composer/Package/Version/VersionSelector.php
#	core/vendor/composer/composer/src/Composer/Plugin/PluginInterface.php
#	core/vendor/composer/composer/src/Composer/Plugin/PluginManager.php
#	core/vendor/composer/composer/src/Composer/Policy/CustomListPolicyConfig.php
#	core/vendor/composer/composer/src/Composer/Policy/ListPolicyConfig.php
#	core/vendor/composer/composer/src/Composer/Policy/PolicyConfig.php
#	core/vendor/composer/composer/src/Composer/Repository/AdvisoryProviderInterface.php
#	core/vendor/composer/composer/src/Composer/Repository/ArtifactRepository.php
#	core/vendor/composer/composer/src/Composer/Repository/ComposerRepository.php
#	core/vendor/composer/composer/src/Composer/Repository/FilesystemRepository.php
#	core/vendor/composer/composer/src/Composer/Repository/PackageRepository.php
#	core/vendor/composer/composer/src/Composer/Repository/PathRepository.php
#	core/vendor/composer/composer/src/Composer/Repository/PlatformRepository.php
#	core/vendor/composer/composer/src/Composer/Repository/RepositoryManager.php
#	core/vendor/composer/composer/src/Composer/Repository/RepositorySet.php
#	core/vendor/composer/composer/src/Composer/Repository/Vcs/FossilDriver.php
#	core/vendor/composer/composer/src/Composer/Repository/Vcs/GitBitbucketDriver.php
#	core/vendor/composer/composer/src/Composer/Repository/Vcs/GitHubDriver.php
#	core/vendor/composer/composer/src/Composer/Repository/Vcs/HgDriver.php
#	core/vendor/composer/composer/src/Composer/Repository/VcsRepository.php
#	core/vendor/composer/composer/src/Composer/Util/AuthHelper.php
#	core/vendor/composer/composer/src/Composer/Util/Filesystem.php
#	core/vendor/composer/composer/src/Composer/Util/Git.php
#	core/vendor/composer/composer/src/Composer/Util/GitHub.php
#	core/vendor/composer/composer/src/Composer/Util/Http/CurlDownloader.php
#	core/vendor/composer/composer/src/Composer/Util/HttpDownloader.php
#	core/vendor/composer/composer/src/Composer/Util/Loop.php
#	core/vendor/composer/composer/src/Composer/Util/Platform.php
#	core/vendor/composer/composer/src/Composer/Util/ProcessExecutor.php
#	core/vendor/composer/composer/src/Composer/Util/RemoteFilesystem.php
#	core/vendor/composer/composer/src/Composer/Util/StreamContextFactory.php
#	core/vendor/composer/composer/src/Composer/Util/Tar.php
#	core/vendor/composer/composer/src/Composer/Util/Url.php
#	core/vendor/composer/composer/src/Composer/Util/Zip.php
#	core/vendor/composer/installed.json
#	core/vendor/composer/installed.php
#	core/vendor/composer/semver/CHANGELOG.md
#	core/vendor/composer/semver/src/Constraint/MultiConstraint.php
#	core/vendor/composer/semver/src/Intervals.php
#	core/vendor/doctrine/inflector/composer.json
#	core/vendor/doctrine/inflector/docs/en/index.rst
#	core/vendor/doctrine/inflector/src/Inflector.php
#	core/vendor/doctrine/inflector/src/Rules/Portuguese/Inflectible.php
#	core/vendor/doctrine/inflector/src/Rules/Portuguese/Uninflected.php
#	core/vendor/guzzlehttp/guzzle/CHANGELOG.md
#	core/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
#	core/vendor/illuminate/support/Facades/Artisan.php
#	core/vendor/illuminate/support/Facades/Exceptions.php
#	core/vendor/justinrainbow/json-schema/CHANGELOG.md
#	core/vendor/justinrainbow/json-schema/README.md
#	core/vendor/justinrainbow/json-schema/bin/run-test-case
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/ConstraintError.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft06/AdditionalItemsConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft06/AdditionalPropertiesConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft06/Draft06Constraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft06/FormatConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft06/ItemsConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft06/PatternConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft06/PatternPropertiesConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft06/PropertiesConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft06/RefConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft07/AdditionalItemsConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft07/AdditionalPropertiesConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft07/Draft07Constraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft07/FormatConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft07/ItemsConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft07/PatternConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft07/PatternPropertiesConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft07/PropertiesConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft07/RefConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft2019/AdditionalPropertiesConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft2019/Draft2019Constraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft2019/Factory.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft2019/FormatConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft2019/PatternConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft2019/PatternPropertiesConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/Drafts/Draft2019/RefConstraint.php
#	core/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/UriRetriever.php
#	core/vendor/nesbot/carbon/src/Carbon/Lang/ar.php
#	core/vendor/nesbot/carbon/src/Carbon/Lang/ar_DZ.php
#	core/vendor/nesbot/carbon/src/Carbon/Lang/ar_KW.php
#	core/vendor/nesbot/carbon/src/Carbon/Lang/ar_MA.php
#	core/vendor/nesbot/carbon/src/Carbon/Lang/ar_SA.php
#	core/vendor/nesbot/carbon/src/Carbon/Lang/ar_Shakl.php
#	core/vendor/nesbot/carbon/src/Carbon/Lang/ar_TN.php
#	core/vendor/nesbot/carbon/src/Carbon/Lang/ru.php
#	core/vendor/nesbot/carbon/src/Carbon/Traits/Eras.php
#	core/vendor/nesbot/carbon/src/Carbon/Traits/Week.php
#	core/vendor/symfony/console/Application.php
#	core/vendor/symfony/console/Command/CompleteCommand.php
#	core/vendor/symfony/console/Command/InvokableCommand.php
#	core/vendor/symfony/console/Command/LockableTrait.php
#	core/vendor/symfony/console/Formatter/OutputFormatter.php
#	core/vendor/symfony/console/Formatter/OutputFormatterStyle.php
#	core/vendor/symfony/console/Helper/ProgressBar.php
#	core/vendor/symfony/console/Helper/Table.php
#	core/vendor/symfony/console/Helper/TerminalInputHelper.php
#	core/vendor/symfony/console/Input/ArgvInput.php
#	core/vendor/symfony/console/Input/StringInput.php
#	core/vendor/symfony/console/Output/ConsoleSectionOutput.php
#	core/vendor/symfony/error-handler/DebugClassLoader.php
#	core/vendor/symfony/error-handler/ErrorHandler.php
#	core/vendor/symfony/finder/Gitignore.php
#	core/vendor/symfony/finder/Glob.php
#	core/vendor/symfony/finder/Iterator/MultiplePcreFilterIterator.php
#	core/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php
#	core/vendor/symfony/finder/Iterator/VcsIgnoredFilterIterator.php
#	core/vendor/symfony/http-foundation/BinaryFileResponse.php
#	core/vendor/symfony/http-foundation/CHANGELOG.md
#	core/vendor/symfony/http-foundation/Cookie.php
#	core/vendor/symfony/http-foundation/InputBag.php
#	core/vendor/symfony/http-foundation/ParameterBag.php
#	core/vendor/symfony/http-foundation/Request.php
#	core/vendor/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php
#	core/vendor/symfony/http-foundation/Session/Storage/Handler/MarshallingSessionHandler.php
#	core/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
#	core/vendor/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php
#	core/vendor/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php
#	core/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
#	core/vendor/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php
#	core/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
#	core/vendor/symfony/http-kernel/DependencyInjection/LoggerPass.php
#	core/vendor/symfony/http-kernel/HttpCache/HttpCache.php
#	core/vendor/symfony/http-kernel/HttpCache/Store.php
#	core/vendor/symfony/http-kernel/HttpKernel.php
#	core/vendor/symfony/http-kernel/Kernel.php
#	core/vendor/symfony/http-kernel/Profiler/FileProfilerStorage.php
#	core/vendor/symfony/mime/Email.php
#	core/vendor/symfony/mime/Header/ParameterizedHeader.php
#	core/vendor/symfony/mime/Part/AbstractMultipartPart.php
#	core/vendor/symfony/mime/Part/AbstractPart.php
#	core/vendor/symfony/mime/Part/DataPart.php
#	core/vendor/symfony/mime/Part/Multipart/FormDataPart.php
#	core/vendor/symfony/mime/Part/Multipart/RelatedPart.php
#	core/vendor/symfony/mime/Part/SMimePart.php
#	core/vendor/symfony/mime/Part/TextPart.php
#	core/vendor/symfony/polyfill-intl-grapheme/Grapheme.php
#	core/vendor/symfony/polyfill-mbstring/Mbstring.php
#	core/vendor/symfony/process/PhpProcess.php
#	core/vendor/symfony/process/PhpSubprocess.php
#	core/vendor/symfony/routing/Loader/schema/routing.schema.json
#	core/vendor/symfony/routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
#	core/vendor/symfony/routing/Matcher/Dumper/CompiledUrlMatcherTrait.php
#	core/vendor/symfony/routing/Matcher/RedirectableUrlMatcher.php
#	core/vendor/symfony/routing/Matcher/TraceableUrlMatcher.php
#	core/vendor/symfony/routing/Matcher/UrlMatcher.php
#	core/vendor/symfony/string/AbstractUnicodeString.php
#	core/vendor/symfony/string/CodePointString.php
#	core/vendor/symfony/string/Slugger/AsciiSlugger.php
#	core/vendor/symfony/string/UnicodeString.php
#	core/vendor/symfony/translation/Command/XliffLintCommand.php
#	core/vendor/symfony/translation/Dumper/FileDumper.php
#	core/vendor/symfony/translation/Resources/data/parents.json
#	core/vendor/symfony/translation/Util/XliffUtils.php
#	core/vendor/symfony/var-dumper/Caster/ExceptionCaster.php
#	core/vendor/symfony/var-dumper/Cloner/Stub.php
#	core/vendor/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php
#	core/vendor/tracy/tracy/composer.json
#	core/vendor/tracy/tracy/readme.md
#	core/vendor/tracy/tracy/src/Bridges/Nette/Bridge.php
#	core/vendor/tracy/tracy/src/Bridges/Psr/PsrToTracyLoggerAdapter.php
#	core/vendor/tracy/tracy/src/Tracy/Bar/Bar.php
#	core/vendor/tracy/tracy/src/Tracy/Bar/panels/info.panel.php
#	core/vendor/tracy/tracy/src/Tracy/BlueScreen/BlueScreen.php
#	core/vendor/tracy/tracy/src/Tracy/BlueScreen/CodeHighlighter.php
#	core/vendor/tracy/tracy/src/Tracy/BlueScreen/dist/agent.phtml
#	core/vendor/tracy/tracy/src/Tracy/Debugger/Debugger.php
#	core/vendor/tracy/tracy/src/Tracy/Debugger/DeferredContent.php
#	core/vendor/tracy/tracy/src/Tracy/Debugger/DevelopmentStrategy.php
#	core/vendor/tracy/tracy/src/Tracy/Debugger/ProductionStrategy.php
#	core/vendor/tracy/tracy/src/Tracy/Dumper/Describer.php
#	core/vendor/tracy/tracy/src/Tracy/Dumper/Dumper.php
#	core/vendor/tracy/tracy/src/Tracy/Dumper/Exposer.php
#	core/vendor/tracy/tracy/src/Tracy/Dumper/Renderer.php
#	core/vendor/tracy/tracy/src/Tracy/Helpers.php
#	core/vendor/tracy/tracy/src/Tracy/Logger/Logger.php
#	core/vendor/tracy/tracy/src/Tracy/OutputDebugger/OutputDebugger.php
#	core/vendor/tracy/tracy/src/Tracy/Session/FileSession.php
#	core/vendor/tracy/tracy/src/Tracy/Session/NativeSession.php
#	core/vendor/tracy/tracy/tools/create-phar/create-phar.php
#	core/vendor/vlucas/phpdotenv/composer.json
#	core/vendor/vlucas/phpdotenv/src/Parser/Lines.php
add(i18n): Lithuanian, Latvian, Romanian, Uzbek, update publiccode.yml, ModX deprecations
@elcreator
elcreator requested a review from Seiger October 30, 2026 17:48
@Seiger
Seiger merged commit 61a5a48 into evolution-cms:3.6.x Oct 30, 2026
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants