Skip to content
Snippets Groups Projects
  1. Jan 06, 2017
  2. Jan 05, 2017
  3. Jan 04, 2017
  4. Jan 03, 2017
    • Venkata Uppalapati's avatar
      Merge branch 'develop' into Fearless-Kiwis-MAGETWO-60765 · 71f621e1
      Venkata Uppalapati authored
      * develop: (136 commits)
        MAGETWO-58174: When catalog is being indexed it should index in place or leverage an index alias so store can still function during a long index run
        MTO-92: [Variation] Check Shipping Amount if not base currency
        MTO-92: [Variation] Check Shipping Amount if not base currency
        MAGETWO-61829: SOAP/REST tests fail on develop branch but builds are green
        MAGETWO-62387: Travis Build Fail - 2.2.0
        MAGETWO-61902: API for price update: Base, Cost, Tier price
        MTO-96: PR2 stabilization
        MAGETWO-58174: When catalog is being indexed it should index in place or leverage an index alias so store can still function during a long index run
        MAGETWO-58174: When catalog is being indexed it should index in place or leverage an index alias so store can still function during a long index run
        MAGETWO-58174: When catalog is being indexed it should index in place or leverage an index alias so store can still function during a long index run
        MAGETWO-58174: When catalog is being indexed it should index in place or leverage an index alias so store can still function during a long index run
        MTO-96: PR2 stabilization
        MAGETWO-58174: When catalog is being indexed it should index in place or leverage an index alias so store can still function during a long index run
        MTO-96: PR2 stabilization
        MTO-96: PR2 stabilization
        MTO-96: PR2 stabilization
        MAGETWO-58174: When catalog is being indexed it should index in place or leverage an index alias so store can still function during a long index run
        MTO-96: PR2 stabilization
        MTO-96: PR2 stabilization
        MTO-96: PR2 stabilization
        ...
      71f621e1
    • Igor Melnikov's avatar
      Merge branch 'MAGETWO-58455-n-MAGETWO-58463' of... · e83c4e95
      Igor Melnikov authored
      Merge branch 'MAGETWO-58455-n-MAGETWO-58463' of github.com:magento-jackalopes/magento2ce into MAGETWO-58455-n-MAGETWO-58463
      e83c4e95
    • Igor Melnikov's avatar
      MAGETWO-62902: Bundle and custom options of type file not converted · 22df83cd
      Igor Melnikov authored
      - Use \Magento\Sales\Setup\SerializedDataConverter for sales_order_item.product_options
      22df83cd
    • Joan He's avatar
      Merge remote-tracking branch 'upstream/develop' into MAGETWO-58455-n-MAGETWO-58463 · 10fb3aec
      Joan He authored
      # Conflicts:
      #	app/code/Magento/Bundle/Test/Unit/Model/Product/PriceTest.php
      10fb3aec
    • Joan He's avatar
    • olysenko's avatar
    • nmomotenko's avatar
      Merge pull request #710 from magento-dragons/pr-22-develop · 6868558a
      nmomotenko authored
      Fixed issues:
      - MAGETWO-58174: When catalog is being indexed it should index in place or leverage an index alias so store can still function during a long index run
      - MAGETWO-61829: SOAP/REST tests fail on develop branch but builds are green
      - MAGETWO-62387: Travis Build Fail - 2.2.0
      - MAGETWO-59990: Disable child product doesn't work in Configurable variations grid
      - MAGETWO-58701: memory_limit issue after running customer_grid indexer
      - MAGETWO-61159: Configurable Product visible on the Category when options are Out of Stock and Disabled
      6868558a