merge upstream (#2) #8794
Closed
merge upstream (#2) #8794
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* MAGETWO-64607: Implement custom provider to collect store and system configuration * MAGETWO-64608: Configure store and website reports for data collection * MAGETWO-64612: Implement config for Analytics cron setting * Create wishlist.js * Delete wishlist.js * Update requirejs-config.js * MAGETWO-64607: Implement custom provider to collect store and system configuration * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MAGETWO-64629: Add plugin for base url change small refactoring * MAGETWO-64630: Create cronjob that executes update command * MAGETWO-64629: Add plugin for base url change review fixes * MTO-142: [Test] Captcha on front login - Defects fixed. * MTO-142: [Test] Captcha on front login - Defects fixed. * MAGETWO-64630: Create cronjob that executes update command * MAGETWO-63406: [Github] Paypal Payment Order Transaction ID Link will result to 404 not found - Fixed returned link - Fixed unit tests * Update Save.php If quantity is changed using mass action for attribute changes, but no stock item exists for the product, saving the newly created stockItem in StockItemRepository->save($stockItem) returns without saving the stockItem, since $stockItem->getProductId() is null, due to it being added to the array with key '0' (see line 165). To fix this, the array key has been changed to "product_id", such that StockItemRepository successfully creates the stockItem. Also, in my opinion, StockItemRepository->save() should not just return without notice, especially as it already encapsulates the functionality in a try/catch block. Throwing an exception would actually tell the user that something went wrong. * MAGETWO-64630: Create cronjob that executes update command * MAGETWO-64224: Remove usages of AttributeCache from customer module - fixing annotation * MAGETWO-64224: Remove usages of AttributeCache from customer module - making inheritdoc lowercase * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MAGETWO-64612: Implement config for Analytics cron setting * MAGETWO-64629: Add plugin for base url change add secure url check * MAGETWO-64629: Add plugin for base url change add secure url check test * MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter * MAGETWO-64505: [Integration] Advanced Analytics subscription create API request add data provider * MAGETWO-64505: [Integration] Advanced Analytics subscription create API request * MTO-111: [Test] Update Category if Use Category Flat (Cron is ON, "Update on Save" Mode) - Defects fixed. * MTO-113: [Test] Captcha on admin login - Defects fixed * MAGETWO-64625: Implement API for file downloading by MA allow only secure connections for analytics * MAGETWO-53457: [COMMUNITY] [FEEDBACK] Improve error reporting for failed order placement (checkout) magento#4682 updated unit tests * MTO-142: [Test] Captcha on front login - Defects fixed. * MTO-113: [Test] Captcha on admin login - Defects fixed * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MAGETWO-64630: Create cronjob that executes update command * MAGETWO-65047 [GitHub][PR] Refactor contact module magento#8420 - fix code style issues * MAGETWO-65047 [GitHub][PR] Refactor contact module magento#8420 - fix integrity tests issues * MAGETWO-65047 [GitHub][PR] Refactor contact module magento#8420 - fix integration tests * MAGETWO-64902: [GitHub][PR] bug magento#8277 fixing bug with https downloading. magento#8278 * MAGETWO-64775: [GitHub] [PR] Make "is_required" and "is_visible" properties of telephone, company and fax attributes of addresses configurable magento#8519 - fix unit and integration tests * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter * MAGETWO-64625: Implement API for file downloading by MA add base64 encoding for transferring binary vector * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MAGETWO-64613: Implement service to enrypt collected data * MAGETWO-64775: [GitHub] [PR] Make "is_required" and "is_visible" properties of telephone, company and fax attributes of addresses configurable magento#8519 - fix unit tests * MAGETWO-64613: Implement service to enrypt collected data * MAGETWO-64609: Extend modules report for data colection * MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter * MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter - covered skipping already converted data with integration test * MAGETWO-64608: Configure store and website reports for data collection * MAGETWO-64613: Implement service to enrypt collected data * MAGETWO-64505: [Integration] Advanced Analytics subscription create API request -- fix test * MAGETWO-62322: Performance Profile Generator * MAGETWO-62322: Performance Profile Generator * Add correct return type in order service The method return $this. I corrected the doc-block. * MAGETWO-64625: Implement API for file downloading by MA fix tests * MAGETWO-62549: Collect Data by cron and encrypt file -- fix code style * MAGETWO-64625: Implement API for file downloading by MA allow only secure connections for analytics * MAGETWO-62549: Collect Data by cron and encrypt file -- fix code style * MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Issue added to variation * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MAGETWO-64626: Web API test for file export edit test for run on http * MAGETWO-65006: [GitHub][PR] Keep transparency when resizing images magento#7307 - fix is created based on public pull request magento#7307 by @kassner - closing magento#7307 * MAGETWO-51176: ST compiler supplies ObjectManagerInterface to direct third party dependencies * Fixed Doc Block for the dispatch method of the Rest Controller - provided more information on how dispatch method handles the Request * remove unused ComponentRegistrar instance from being passed to Populator::populateMappings * Fixed return type of OrderRepository::getList * MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter - custom converters coverage * MAGETWO-64626: Web API test for file export edit test for run on http * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MAGETWO-64626: Web API test for file export edit test for run on http * MAGETWO-64626: Web API test for file export allow only secure connections for analytics * MTO-111: [Test] Update Category if Use Category Flat (Cron is ON, "Update on Save" Mode) - Duplicated new line removed. * MAGETWO-64626: Web API test for file export edit test for run on http * MTO-146: [Test] Create offline Order from "Edit Customer" Admin page - Defects fixed * MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter - custom converters - fixed integration test and removed dependency * MTO-142: [Test] Captcha on front login - Defects fixed. * MAGETWO-64796: Added fixture for Customer module with assigned website * MAGETWO-64601: [Integration] report page API request for Advanced analytics * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart * MAGETWO-64515: change comment in file due to PR risk * MAGETWO-64515: change comment in file due to PR risk * MAGETWO-62168: Improve field data converter logging and error reporting * MAGETWO-62168: Improve field data converter logging and error reporting * MAGETWO-62168: Improve field data converter logging and error reporting * MAGETWO-62168: Improve field data converter logging and error reporting * MAGETWO-62168: Improve field data converter logging and error reporting * MAGETWO-62168: Improve field data converter logging and error reporting
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
MAGETWO-64607: Implement custom provider to collect store and system configuration
MAGETWO-64608: Configure store and website reports for data collection
MAGETWO-64612: Implement config for Analytics cron setting
Create wishlist.js
Delete wishlist.js
Update requirejs-config.js
MAGETWO-64607: Implement custom provider to collect store and system configuration
MTO-146: [Test] Create offline Order from "Edit Customer" Admin page
small refactoring
MAGETWO-64630: Create cronjob that executes update command
MAGETWO-64629: Add plugin for base url change
review fixes
MAGETWO-64630: Create cronjob that executes update command
MAGETWO-63406: [Github] Paypal Payment Order Transaction ID Link will result to 404 not found
If quantity is changed using mass action for attribute changes, but no stock item exists for the product, saving the newly created stockItem in StockItemRepository->save($stockItem) returns without saving the stockItem, since $stockItem->getProductId() is null, due to it being added to the array with key '0' (see line 165). To fix this, the array key has been changed to "product_id", such that StockItemRepository successfully creates the stockItem.
Also, in my opinion, StockItemRepository->save() should not just return without notice, especially as it already encapsulates the functionality in a try/catch block. Throwing an exception would actually tell the user that something went wrong.
MAGETWO-64630: Create cronjob that executes update command
MAGETWO-64224: Remove usages of AttributeCache from customer module
MAGETWO-64612: Implement config for Analytics cron setting
MAGETWO-64629: Add plugin for base url change
add secure url check
add secure url check test
MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter
MAGETWO-64505: [Integration] Advanced Analytics subscription create API request
add data provider
MAGETWO-64505: [Integration] Advanced Analytics subscription create API request
MTO-111: [Test] Update Category if Use Category Flat (Cron is ON, "Update on Save" Mode)
allow only secure connections for analytics
updated unit tests
MAGETWO-64630: Create cronjob that executes update command
MAGETWO-65047 [GitHub][PR] Refactor contact module Refactor contact module #8420
MAGETWO-64902: [GitHub][PR] bug CatalogImportExport uploader can't handle HTTPS images #8277 fixing bug with https downloading. bug #8277 fixing bug with https downloading. #8278
MAGETWO-64775: [GitHub] [PR] Make "is_required" and "is_visible" properties of telephone, company and fax attributes of addresses configurable Make "is_required" and "is_visible" properties of telephone, company and fax attributes of addresses configurable #8519
MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter
MAGETWO-64625: Implement API for file downloading by MA
add base64 encoding for transferring binary vector
MAGETWO-64613: Implement service to enrypt collected data
MAGETWO-64775: [GitHub] [PR] Make "is_required" and "is_visible" properties of telephone, company and fax attributes of addresses configurable Make "is_required" and "is_visible" properties of telephone, company and fax attributes of addresses configurable #8519
MAGETWO-64613: Implement service to enrypt collected data
MAGETWO-64609: Extend modules report for data colection
MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter
MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter
MAGETWO-64608: Configure store and website reports for data collection
MAGETWO-64613: Implement service to enrypt collected data
MAGETWO-64505: [Integration] Advanced Analytics subscription create API request
-- fix test
MAGETWO-62322: Performance Profile Generator
MAGETWO-62322: Performance Profile Generator
Add correct return type in order service
The method return $this. I corrected the doc-block.
fix tests
-- fix code style
allow only secure connections for analytics
-- fix code style
MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter
MTO-146: [Test] Create offline Order from "Edit Customer" Admin page
edit test for run on http
MAGETWO-51176: ST compiler supplies ObjectManagerInterface to direct third party dependencies
Fixed Doc Block for the dispatch method of the Rest Controller
remove unused ComponentRegistrar instance from being passed to Populator::populateMappings
Fixed return type of OrderRepository::getList
MAGETWO-64802: Implement corrupted data reporting for fieldDataConverter
edit test for run on http
edit test for run on http
allow only secure connections for analytics
edit test for run on http
MAGETWO-64796: Added fixture for Customer module with assigned website
MAGETWO-64601: [Integration] report page API request for Advanced analytics
MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart
MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart
MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart
MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart
MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart
MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart
MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart
MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart
MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart
MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart
MAGETWO-64515: change comment in file due to PR risk
MAGETWO-64515: change comment in file due to PR risk
MAGETWO-62168: Improve field data converter logging and error reporting
MAGETWO-62168: Improve field data converter logging and error reporting
MAGETWO-62168: Improve field data converter logging and error reporting
MAGETWO-62168: Improve field data converter logging and error reporting
MAGETWO-62168: Improve field data converter logging and error reporting
MAGETWO-62168: Improve field data converter logging and error reporting