merge upstream develop#1

Merged

davidverholen merged 1282 commits into

davidverholen:patch-1from

magento:develop

Jan 13, 2016

This pull request is big! We're only showing the most recent 250 commits

Commits on Dec 23, 2015

Merge commit 'refs/pull/47/head' of https://github.com/magento/magento2ce into PR_Branch_ES
mazhalai
committed
MAGETWO-47220: Category image is not saved
Volodymyr Klymenko
committed
Merge pull request #268 from magento-firedrakes/MAGETWO-47215
mlogvin
committed
Merge remote-tracking branch 'mainline/develop' into PR_Branch
Olga Kopylova
committed
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-43491
Gurzhyi, Andrii
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-36914-hsts
Dale Sikkema
committed
Merge remote-tracking branch 'mainline/develop' into develop
Yu Tang
committed
MAGETWO-36914: HSTS, upgrade-insecure-requests and https by default
Dale Sikkema
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-46858-dash-in-host
Dale Sikkema
committed
Merge remote-tracking branch 'origin/MAGETWO-46858-dash-in-host' into MAGETWO-36914-hsts
Dale Sikkema
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-45429
Sergey Semenov
committed
MAGETWO-43491: Implementation of the Select Saved Card Shared Component for Storefront
Gurzhyi, Andrii
committed
Merge branch 'develop' into MAGETWO-47267
Andrii Lugovyi
committed
MAGETWO-47009: Github #2674 Plugins/Interceptors Don't Work with Early Stage Single Instance Objects in Developer Mode
Dale Sikkema
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-47009-non-interceptable-classes
Dale Sikkema
committed
MAGETWO-46343: Create functional tests for using vault on storefront
Elena Marchenko
committed
MAGETWO-47059: Category creation from product edit page fails
vkholoshenko
committed
Merge pull request #265 from magento-ogre/PR_Branch
Kopylova,Olga(okopylova)
committed
Merge remote-tracking branch 'mainline/develop' into PR_Branch_ES
Ankur Kaneria
committed
Merge pull request #261 from magento-ogre/PR_Branch_ES
Kopylova,Olga(okopylova)
committed
Merge remote-tracking branch 'mainline/develop' into develop
Yu Tang
committed

Commits on Dec 24, 2015

Merge pull request #262 from magento-fearless-kiwis/develop
Tang, Yu(ytang1)
committed
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into catalog_promotions
ishakhsuvarov
committed
MAGETWO-47284: Align grouped fields on category edit form
Olga Lytvynenko
committed
MAGETWO-47223: Google experiments should be displayed regarding config settings
rganin
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-41241
slavvka
committed
Merge branch 'MAGETWO-47223' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-42140
slopukhov
committed
Merge branch 'MAGETWO-42140' of https://github.corp.magento.com/magento-troll/magento2ce into MAGETWO-42140
rganin
committed
Merge branch 'MAGETWO-47220' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-42140
slopukhov
committed
MAGETWO-46483: Create sequence table for CMS pages
Oleksandr Karpenko
committed
Merge remote-tracking branch 'origin/MAGETWO-47220' into MAGETWO-42140
rganin
committed
Merge branch 'MAGETWO-42140' of https://github.corp.magento.com/magento-troll/magento2ce into MAGETWO-42140
rganin
committed
MAGETWO-46821: Update readable content

Dmytro Vilchynskyi
authored and
Natalia Momotenko
committed
MAGETWO-46821: Update readable content

Dmytro Vilchynskyi
authored and
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-46884' into PR-2
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-46727' into PR-2
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-46726' into PR-2
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-46716' into PR-2
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-46940' into PR-2
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-46054' into PR-2
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-46188' into PR-2
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-42861' into PR-2
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-46821_2' into PR-2
Natalia Momotenko
committed
MAGETWO-46483: Create sequence table for CMS pages
Oleksandr Karpenko
committed
MAGETWO-47269: bin/magento theme:unstall throws exception
Sergey Semenov
committed
MAGETWO-47122: MX FAT tests is broken
aavramenko
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-45429
Sergey Semenov
committed
MAGETWO-46352: Create functional tests for placing order via Braintree with 3D Secure
rliukshyn
committed
MAGETWO-46352: Create functional tests for placing order via Braintree with 3D Secure
rliukshyn
committed
Merge branch 'MAGETWO-43491' of github.corp.magento.com:magento-mpi/magento2ce into MAGETWO-46343
Elena Marchenko
committed
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-43491
Gurzhyi, Andrii
committed
MAGETWO-47218: URLKey is not shown in collapsible fieldset
slopukhov
committed
Merge branch 'MAGETWO-46343' of github.corp.magento.com:magento-mpi/magento2ce into MAGETWO-43491
Gurzhyi, Andrii
committed
MAGETWO-47218: URLKey is not shown in collapsible fieldset
slopukhov
committed
Merge pull request #264 from magento-south/MAGETWO-41241
slavvka
committed
MAGETWO-45813: Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into catalog_promotions
ishakhsuvarov
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-45429
Sergey Semenov
committed
MAGETWO-47308: Static tests fix for new category form
vzabaznov
committed
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-43491
Roman Liukshyn
committed
MAGETWO-47239: Product is not added to wishlist by guest after login
AndriyNasinnyk
committed
MAGETWO-47308: Static tests fix for new category form
vzabaznov
committed
MAGETWO-47308: Static tests fix for new category form
vzabaznov
committed
MAGETWO-45429: Selected options aren't displayed in Wish List product details section
Sergey Semenov
committed
Merge pull request #260 from magento-mpi/MAGETWO-43491
dkvashninbay
committed
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into catalog_promotions
ishakhsuvarov
committed
MAGETWO-47269: bin/magento theme:unstall throws exception
Sergey Semenov
committed
Merge branch 'MAGETWO-47218' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-42140
slopukhov
committed

Commits on Dec 25, 2015

Commits on Dec 28, 2015

Commits on Dec 29, 2015

MAGETWO-47301: PHP7 Integration test failed - syntax error, unexpected 'Gateway' (T_STRING)
mazhalai
committed
Merge branch 'MAGETWO-47392' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-42140
slopukhov
committed
Merge pull request #9 from magento-dragons/MAGETWO-45589
aavramenko
committed
Merge pull request #8 from magento-nord/MAGETWO-45878
aavramenko
committed
MAGETWO-47444: URL Key label is displayed for Default Category
slopukhov
committed
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-42140
slopukhov
committed
MAGETWO-47308: Static tests fix for new category form
slopukhov
committed
MAGETWO-45161: API Out: RPC Integration - Part 1

Oleksii Korshenko
authored and
arkadiych
committed
MAGETWO-46364: Final Functionality Check and Code Refactoring
arkadiych
committed
MAGETWO-46364: Final Functionality Check and Code Refactoring
arkadiych
committed
MAGETWO-46364: Final Functionality Check and Code Refactoring

Alexander Paliarush
authored and
arkadiych
committed
MAGETWO-46364: Final Functionality Check and Code Refactoring
arkadiych
committed
MAGETWO-46364: Final Functionality Check and Code Refactoring
arkadiych
committed
MAGETWO-46364: Final Functionality Check and Code Refactoring
arkadiych
committed
MAGETWO-46364: Final Functionality Check and Code Refactoring

Alexander Paliarush
authored and
arkadiych
committed
MAGETWO-46364: Final Functionality Check and Code Refactoring
arkadiych
committed
MAGETWO-46364: Final Functionality Check and Code Refactoring
arkadiych
committed
MAGETWO-46364: Final Functionality Check and Code Refactoring
arkadiych
committed
MAGETWO-45161: API Out: RPC Integration - Part 1

Hayder Sharhan
authored and
arkadiych
committed
MAGETWO-45161: API Out: RPC Integration - Part 1

Oleksii Korshenko
authored and
arkadiych
committed
MAGETWO-46739: Add validation to Magento:Framework:MessageQueue::Reader
arkadiych
committed
MAGETWO-45161: API Out: RPC Integration - Part 1

Oleksii Korshenko
authored and
arkadiych
committed
MAGETWO-45161: API Out: RPC Integration - Part 1

Oleksii Korshenko
authored and
arkadiych
committed
MAGETWO-45161: API Out: RPC Integration - Part 1

Oleksii Korshenko
authored and
arkadiych
committed
MAGETWO-45161: API Out: RPC Integration - Part 1

Oleksii Korshenko
authored and
arkadiych
committed
MAGETWO-45161: API Out: RPC Integration - Part 1

Oleksii Korshenko
authored and
arkadiych
committed
MAGETWO-47016: Fix integration tests
arkadiych
committed
MAGETWO-47016: Fix integration tests
arkadiych
committed
MAGETWO-47392: WYSIWYG Options not applied to wysiwyg on a category page
vkholoshenko
committed
Merge remote-tracking branch 'api/MAGETWO-46021-Integration-Unexpected-structure-of-integration-acl-xml' into MAGETWO-45161-RPC
arkadiych
committed
MAGETWO-46021: [Integration] Unexpected structure of integration/acl.xml

Hayder Sharhan
authored and
arkadiych
committed
Merge remote-tracking branch 'api/MAGETWO-45402-Page-Cache-Product-View' into MAGETWO-45161-RPC
arkadiych
committed
Merge branch 'MAGETWO-47392' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-42140
slopukhov
committed
MAGETWO-46019: [Integration] Integration is not created after adding integration/config.xml file
arkadiych
committed
MAGETWO-46678: Process public PRs and Issues

Oleksii Korshenko
authored and
arkadiych
committed
MAGETWO-46678: Process public PRs and Issues

Oleksii Korshenko
authored and
arkadiych
committed
MAGETWO-46678: Process public PRs and Issues

Oleksii Korshenko
authored and
arkadiych
committed
MAGETWO-47183: [GitHub] Add countries to exclude from the required state in config (bis) #2182

Oleksii Korshenko
authored and
arkadiych
committed
MAGETWO-47183: [GitHub] Add countries to exclude from the required state in config (bis) #2182

Oleksii Korshenko
authored and
arkadiych
committed
Merge remote-tracking branch 'mainline/develop' into pr-273
Michail Slabko
committed
Merge branch 'MAGETWO-47308' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-42140
slopukhov
committed
Merge remote-tracking branch 'origin/MAGETWO-47308' into MAGETWO-42140
vkholoshenko
committed
Merge branch 'MAGETWO-42140' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-42140
vkholoshenko
committed
MAGETWO-47457: Category path rewrites after save
Egor Shitikov
committed
MAGETWO-47454: Bamboo builds stabilization
slopukhov
committed
Merge pull request #2124 from https://github.com/printminion/magento2.git develop

Oleksii Korshenko
authored and
arkadiych
committed
Merge pull request #2388 from https://github.com/BlackIkeEagle/magento2.git email-subject-translatable

Oleksii Korshenko
authored and
arkadiych
committed
Merge remote-tracking branch 'api/public-prs' into MAGETWO-45161-RPC
arkadiych
committed
Merge branch 'MAGETWO-47457' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-42140
slopukhov
committed
MAGETWO-47457: Category path rewrites after save
Egor Shitikov
committed
Merge branch 'MAGETWO-47457' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-42140
slopukhov
committed
MAGETWO-45878: Video Preview Image is cached from previous Video on "New Video" pop-up in Admin
Michail Slabko
committed
MAGETWO-47454: Bamboo builds stabilization
katmoon
committed
MAGETWO-47016: Fix integration tests
arkadiych
committed
MAGETWO-47464: Create permanent redirect' for URL key is not applied
slopukhov
committed
MAGETWO-47454: Bamboo builds stabilization
slopukhov
committed
Merge branch 'MAGETWO-42140' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-42140
vkholoshenko
committed
MAGETWO-47454: Bamboo builds stabilization
slopukhov
committed
MAGETWO-47463: Image set in WYSIWYG in category description is not saved
vkholoshenko
committed
MAGETWO-47454: Bamboo builds stabilization
katmoon
committed
Merge branch 'MAGETWO-47464' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-47454
slopukhov
committed
Merge branch 'MAGETWO-47454' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-42140
slopukhov
committed
Merge pull request #273 from magento-goinc/pr-273
Slabko,Michael(mslabko)
committed
MAGETWO-47454: Bamboo builds stabilization
vkholoshenko
committed
MAGETWO-47440: [GITHUB-2471] Incorrect prices on configurable product page when catalog prices include tax
Partica, Cristian
committed

Commits on Dec 30, 2015

Merge remote-tracking branch 'mainline/develop' into bugs
Stanislav Idolov
committed
MAGETWO-47332: Sensitive Data Exposure during Checkout flow
Serhiy Shkolyarenko
committed
MAGETWO-47489: FAT build stabilization
vkholoshenko
committed
MAGETWO-47489: FAT build stabilization
slopukhov
committed

Commits on Dec 31, 2015

Commits on Jan 5, 2016

Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into bugs
ishakhsuvarov
committed
MAGETWO-47332: Sensitive Data Exposure during Checkout flow
ishakhsuvarov
committed
MAGETWO-47298: Grammatically incorrect error message for GiftMessage #1960
ishakhsuvarov
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-47239
Sergey Semenov
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-47269
Sergey Semenov
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-45429
Sergey Semenov
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-31897
Sergey Semenov
committed
Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-42140
rganin
committed
Merge remote-tracking branch 'origin/MAGETWO-47269' into BUGS
Sergey Semenov
committed
Merge remote-tracking branch 'origin/MAGETWO-45429' into BUGS
Sergey Semenov
committed
Merge remote-tracking branch 'origin/MAGETWO-31897' into BUGS
Sergey Semenov
committed
Merge pull request #275 from magento-folks/bugs
irenelagno
committed
Merge remote-tracking branch 'mainline/develop' into BUGS
Sergey Semenov
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-46581-ie-8-headers
Dale Sikkema
committed
MAGETWO-47239: Product is not added to wishlist by guest after login
Sergey Semenov
committed
Merge remote-tracking branch 'origin/MAGETWO-47239' into BUGS
Sergey Semenov
committed
MAGETWO-46581: X-XSS-Protection is set on IE 8
Dale Sikkema
committed

Commits on Jan 6, 2016

Commits on Jan 7, 2016

Commits on Jan 8, 2016

Commits on Jan 11, 2016

Commits on Jan 12, 2016

Commits on Jan 13, 2016

Merge pull request #293 from magento-fearless-kiwis/develop
Tang, Yu(ytang1)
committed