Skip to content
Snippets Groups Projects
  1. Jan 11, 2017
  2. Jan 10, 2017
  3. Jan 06, 2017
    • Venkata Uppalapati's avatar
      Merge branch 'develop' into FearlessKiwis-MAGETWO-59785-IncorrectUrls-in-sitemap · 6d6aeae1
      Venkata Uppalapati authored
      * develop: (147 commits)
        MAGETWO-62855: Copyright Year Update 2017
        MAGETWO-62855: Copyright Year Update 2017
        MAGETWO-62855: Copyright Year Update 2017
        MAGETWO-62855: Copyright Year Update 2017
        MAGETWO-62855: Copyright Year Update 2017
        MAGETWO-62855: Copyright Year Update 2017
        MAGETWO-62850: API for price update: Special price
        MAGETWO-62902: Bundle and custom options of type file not converted
        MAGETWO-62134: Create data converter that can process nested serialized data
        MAGETWO-62134: Create data converter that can process nested serialized data
        MAGETWO-62134: Create data converter that can process nested serialized data
        MAGETWO-62134: Create data converter that can process nested serialized data
        MAGETWO-62134: Create data converter that can process nested serialized data
        MAGETWO-62253: Refactor code to remove unserialize
        MAGETWO-62134: Create data converter that can process nested serialized data
        MAGETWO-62134: Create data converter that can process nested serialized data
        MAGETWO-62253: Refactor code to remove unserialize
        MAGETWO-62253: Refactor code to remove unserialize
        MAGETWO-62133: Create QueryModifier to select only options of type file and info_buyRequest
        MAGETWO-62133: Create QueryModifier to select only options of type file and info_buyRequest
        ...
      
      # Conflicts:
      #	app/code/Magento/Sitemap/Model/Sitemap.php
      #	app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
      6d6aeae1
    • nmomotenko's avatar
      Merge pull request #724 from magento-south/MAGETWO-62855 · b1e56ed3
      nmomotenko authored
      Fixed issue:
      - MAGETWO-62855: Copyright Year Update 2017
      b1e56ed3
    • Sergii Kovalenko's avatar
      34430343
    • Sergii Kovalenko's avatar
      MAGETWO-62855: Copyright Year Update 2017 · 234cfb0f
      Sergii Kovalenko authored
      # Conflicts:
      #	app/code/Magento/Catalog/Model/Product/Price/TierPriceValidator.php
      #	app/code/Magento/Catalog/Test/Unit/Model/Product/Price/TierPriceValidatorTest.php
      234cfb0f
    • nmomotenko's avatar
      Merge pull request #721 from magento-nord/SPRINT-26-NORD · bd4fbd25
      nmomotenko authored
      Task:
      - MAGETWO-62850: API for price update: Special price
      bd4fbd25
    • Sergii Kovalenko's avatar
      MAGETWO-62855: Copyright Year Update 2017 · c80705a9
      Sergii Kovalenko authored
      --fix ModuleDbChanged test
      c80705a9
    • Sergii Kovalenko's avatar
      MAGETWO-62855: Year Copyright · 565acf5a
      Sergii Kovalenko authored
      565acf5a
    • Sergii Kovalenko's avatar
      MAGETWO-62855: Copyright Year Update 2017 · 43da5814
      Sergii Kovalenko authored
      --fix ModuleDbChanged test
      43da5814