Skip to content

Commit b152f68

Browse files
author
Oleksii Korshenko
committed
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-71174
# Conflicts: # app/code/Magento/Analytics/Api/Data/LinkInterface.php # app/code/Magento/Analytics/Api/LinkProviderInterface.php # app/code/Magento/Analytics/Block/Adminhtml/System/Config/AdditionalComment.php # app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php # app/code/Magento/Analytics/Block/Adminhtml/System/Config/SubscriptionStatusLabel.php # app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php # app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php # app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Activate.php # app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Postpone.php # app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Retry.php # app/code/Magento/Analytics/Cron/CollectData.php # app/code/Magento/Analytics/Cron/SignUp.php # app/code/Magento/Analytics/Cron/Update.php # app/code/Magento/Analytics/Model/AnalyticsToken.php # app/code/Magento/Analytics/Model/Condition/CanViewNotification.php # app/code/Magento/Analytics/Model/Config.php # app/code/Magento/Analytics/Model/Config/Backend/Baseurl/SubscriptionUpdateHandler.php # app/code/Magento/Analytics/Model/Config/Backend/CollectionTime.php # app/code/Magento/Analytics/Model/Config/Backend/Enabled.php # app/code/Magento/Analytics/Model/Config/Backend/Enabled/SubscriptionHandler.php # app/code/Magento/Analytics/Model/Config/Backend/Vertical.php # app/code/Magento/Analytics/Model/Config/Mapper.php # app/code/Magento/Analytics/Model/Config/Reader.php # app/code/Magento/Analytics/Model/Config/Source/Vertical.php # app/code/Magento/Analytics/Model/ConfigInterface.php # app/code/Magento/Analytics/Model/Connector.php # app/code/Magento/Analytics/Model/Connector/CommandInterface.php # app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php # app/code/Magento/Analytics/Model/Connector/Http/ClientInterface.php # app/code/Magento/Analytics/Model/Connector/Http/ConverterInterface.php # app/code/Magento/Analytics/Model/Connector/Http/JsonConverter.php # app/code/Magento/Analytics/Model/Connector/Http/ResponseFactory.php # app/code/Magento/Analytics/Model/Connector/Http/ResponseHandlerInterface.php # app/code/Magento/Analytics/Model/Connector/Http/ResponseResolver.php # app/code/Magento/Analytics/Model/Connector/NotifyDataChangedCommand.php # app/code/Magento/Analytics/Model/Connector/OTPRequest.php # app/code/Magento/Analytics/Model/Connector/ResponseHandler/OTP.php # app/code/Magento/Analytics/Model/Connector/ResponseHandler/ReSignUp.php # app/code/Magento/Analytics/Model/Connector/ResponseHandler/SignUp.php # app/code/Magento/Analytics/Model/Connector/ResponseHandler/Update.php # app/code/Magento/Analytics/Model/Connector/SignUpCommand.php # app/code/Magento/Analytics/Model/Connector/UpdateCommand.php # app/code/Magento/Analytics/Model/Cryptographer.php # app/code/Magento/Analytics/Model/EncodedContext.php # app/code/Magento/Analytics/Model/Exception/State/SubscriptionUpdateException.php # app/code/Magento/Analytics/Model/ExportDataHandler.php # app/code/Magento/Analytics/Model/ExportDataHandlerInterface.php # app/code/Magento/Analytics/Model/ExportDataHandlerNotification.php # app/code/Magento/Analytics/Model/FileInfo.php # app/code/Magento/Analytics/Model/FileInfoManager.php # app/code/Magento/Analytics/Model/FileRecorder.php # app/code/Magento/Analytics/Model/IntegrationManager.php # app/code/Magento/Analytics/Model/Link.php # app/code/Magento/Analytics/Model/LinkProvider.php # app/code/Magento/Analytics/Model/NotificationTime.php # app/code/Magento/Analytics/Model/Plugin/BaseUrlConfigPlugin.php # app/code/Magento/Analytics/Model/ProviderFactory.php # app/code/Magento/Analytics/Model/ReportUrlProvider.php # app/code/Magento/Analytics/Model/ReportWriter.php # app/code/Magento/Analytics/Model/ReportWriterInterface.php # app/code/Magento/Analytics/Model/ReportXml/ModuleIterator.php # app/code/Magento/Analytics/Model/StoreConfigurationProvider.php # app/code/Magento/Analytics/Model/SubscriptionStatusProvider.php # app/code/Magento/Analytics/Model/System/Message/NotificationAboutFailedSubscription.php # app/code/Magento/Analytics/ReportXml/Config.php # app/code/Magento/Analytics/ReportXml/Config/Converter/Xml.php # app/code/Magento/Analytics/ReportXml/Config/Mapper.php # app/code/Magento/Analytics/ReportXml/Config/Reader.php # app/code/Magento/Analytics/ReportXml/ConfigInterface.php # app/code/Magento/Analytics/ReportXml/ConnectionFactory.php # app/code/Magento/Analytics/ReportXml/DB/Assembler/AssemblerInterface.php # app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php # app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php # app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php # app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php # app/code/Magento/Analytics/ReportXml/DB/ConditionResolver.php # app/code/Magento/Analytics/ReportXml/DB/NameResolver.php # app/code/Magento/Analytics/ReportXml/DB/ReportValidator.php # app/code/Magento/Analytics/ReportXml/DB/SelectBuilder.php # app/code/Magento/Analytics/ReportXml/DB/SelectBuilderFactory.php # app/code/Magento/Analytics/ReportXml/IteratorFactory.php # app/code/Magento/Analytics/ReportXml/Query.php # app/code/Magento/Analytics/ReportXml/QueryFactory.php # app/code/Magento/Analytics/ReportXml/ReportProvider.php # app/code/Magento/Analytics/ReportXml/SelectHydrator.php # app/code/Magento/Analytics/Setup/InstallData.php # app/code/Magento/Analytics/Ui/DataProvider/DummyDataProvider.php
2 parents 227208e + ca9141d commit b152f68

File tree

289 files changed

+42
-20621
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

289 files changed

+42
-20621
lines changed

‎app/code/Magento/Analytics/Api/Data/LinkInterface.php

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎app/code/Magento/Analytics/Api/LinkProviderInterface.php

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎app/code/Magento/Analytics/Block/Adminhtml/System/Config/AdditionalComment.php

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎app/code/Magento/Analytics/Block/Adminhtml/System/Config/SubscriptionStatusLabel.php

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎app/code/Magento/Analytics/Controller/Adminhtml/Reports/Show.php

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)