mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-01 14:38:47 +02:00
Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts: # composer.json # composer.lock # core/email.class.inc.php # lib/composer/autoload_classmap.php # lib/composer/autoload_files.php # lib/composer/autoload_psr4.php # lib/composer/autoload_static.php # lib/composer/installed.json # lib/composer/installed.php # lib/swiftmailer/swiftmailer/.gitattributes # lib/swiftmailer/swiftmailer/.gitignore # lib/swiftmailer/swiftmailer/.php_cs.dist # lib/swiftmailer/swiftmailer/CHANGES # lib/swiftmailer/swiftmailer/LICENSE # lib/swiftmailer/swiftmailer/composer.json # lib/swiftmailer/swiftmailer/lib/classes/Swift.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandListener.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseListener.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendListener.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Filterable.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Image.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Message.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php # lib/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php # lib/swiftmailer/swiftmailer/lib/dependency_maps/cache_deps.php # lib/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php # lib/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php # lib/swiftmailer/swiftmailer/lib/mime_types.php # lib/swiftmailer/swiftmailer/lib/preferences.php # lib/swiftmailer/swiftmailer/lib/swift_required.php # lib/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php
This commit is contained in:
Pierre Goiffon
@@ -5,7 +5,7 @@
|
||||
'type' => 'project',
|
||||
'install_path' => __DIR__ . '/../../',
|
||||
'aliases' => array(),
|
||||
'reference' => 'c47f2245669135902b32c54f3edf7f1bc52de81e',
|
||||
'reference' => '56f8f9b38d649bb36bca6d4bdc35719862ef7cad',
|
||||
'name' => '__root__',
|
||||
'dev' => true,
|
||||
),
|
||||
@@ -16,16 +16,16 @@
|
||||
'type' => 'project',
|
||||
'install_path' => __DIR__ . '/../../',
|
||||
'aliases' => array(),
|
||||
'reference' => 'c47f2245669135902b32c54f3edf7f1bc52de81e',
|
||||
'reference' => '56f8f9b38d649bb36bca6d4bdc35719862ef7cad',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'combodo/tcpdf' => array(
|
||||
'pretty_version' => '6.3.5',
|
||||
'version' => '6.3.5.0',
|
||||
'pretty_version' => '6.4.4',
|
||||
'version' => '6.4.4.0',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../combodo/tcpdf',
|
||||
'aliases' => array(),
|
||||
'reference' => 'aedd4b7b8cf7fcc24e617c405c9d3304150f4b94',
|
||||
'reference' => '0e31c013ccd000aa6762e9186778aa6e259ac8e8',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'container-interop/container-interop' => array(
|
||||
@@ -107,12 +107,12 @@
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'nikic/php-parser' => array(
|
||||
'pretty_version' => 'v4.12.0',
|
||||
'version' => '4.12.0.0',
|
||||
'pretty_version' => 'v4.13.2',
|
||||
'version' => '4.13.2.0',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../nikic/php-parser',
|
||||
'aliases' => array(),
|
||||
'reference' => '6608f01670c3cc5079e18c1dab1104e002579143',
|
||||
'reference' => '210577fe3cf7badcc5814d99455df46564f3c077',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'paragonie/random_compat' => array(
|
||||
@@ -196,8 +196,8 @@
|
||||
'psr/container-implementation' => array(
|
||||
'dev_requirement' => false,
|
||||
'provided' => array(
|
||||
0 => '^1.0',
|
||||
1 => '1.0',
|
||||
0 => '1.0',
|
||||
1 => '^1.0',
|
||||
),
|
||||
),
|
||||
'psr/log' => array(
|
||||
@@ -237,12 +237,12 @@
|
||||
),
|
||||
),
|
||||
'scssphp/scssphp' => array(
|
||||
'pretty_version' => '1.0.6',
|
||||
'version' => '1.0.6.0',
|
||||
'pretty_version' => 'v1.10.2',
|
||||
'version' => '1.10.2.0',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../scssphp/scssphp',
|
||||
'aliases' => array(),
|
||||
'reference' => '5b3c9d704950d8f9637f5110c36c281ec47dc13c',
|
||||
'reference' => '387f4f4abf5d99f16be16314c5ab856f81c82f46',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'symfony/cache' => array(
|
||||
@@ -491,7 +491,7 @@
|
||||
'tecnickcom/tcpdf' => array(
|
||||
'dev_requirement' => false,
|
||||
'replaced' => array(
|
||||
0 => '6.3.5',
|
||||
0 => '6.4.4',
|
||||
),
|
||||
),
|
||||
'true/punycode' => array(
|
||||
@@ -504,12 +504,12 @@
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'twig/twig' => array(
|
||||
'pretty_version' => 'v1.42.4',
|
||||
'version' => '1.42.4.0',
|
||||
'pretty_version' => 'v1.42.5',
|
||||
'version' => '1.42.5.0',
|
||||
'type' => 'library',
|
||||
'install_path' => __DIR__ . '/../twig/twig',
|
||||
'aliases' => array(),
|
||||
'reference' => 'e587180584c3d2d6cb864a0454e777bb6dcb6152',
|
||||
'reference' => '87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e',
|
||||
'dev_requirement' => false,
|
||||
),
|
||||
'zendframework/zend-loader' => array(
|
||||
|
||||
Reference in New Issue
Block a user