1. 21 Jan, 2015 9 commits
  2. 20 Jan, 2015 9 commits
  3. 19 Jan, 2015 20 commits
  4. 18 Jan, 2015 2 commits
    • Stefano Kowalke's avatar
      Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6 · 0fadc7bf
      Stefano Kowalke authored
      # By Gregory Roussac (29) and others
      # Via Gregory Roussac (13) and others
      * '1.6' of github.com:PrestaShop/PrestaShop: (57 commits)
        // refacto
        [+]BO : Warning added if openssl is not loaded
        [-] TR: Fix bug #PSCSX-4330, could not transalate moudle string with quote
        [-] FO : #PSCSX-4337, move to getProducts
        [*] FO, BO : Removed recall method
        [-] FO : #PSCSX-4337, product total
        [-] FO : Fix bug #PSCSX-4337, bad unit price display and update
        // forgot to commit
        // follow up https://github.com/PrestaShop/PrestaShop/pull/2380
        // norms
        // Submodules updated
        // revert
        Fix small bug
        Fix #PSCSX-4339 - "default" theme name should be customizable
        [-] CORE : Fix bug #PSCSX-4326, bad specific price conversion
        // Norm
        // Escape var for PSCSX-3488
        [-] BO : #PSCSX-3031 - Set KPI for product out of stock
        [*] CORE : Use named constante for GeoLiteCity.dat
        [-]FO : Fix PSCSX-4144 : Logo on invoice can be too big.
        ...
      0fadc7bf
    • Stefano Kowalke's avatar
      [*] BO : Imrove rewrite of german umlauts in category url · 3f055935
      Stefano Kowalke authored
      * Ä -> AE
      * Ö -> OE
      * Ü -> UE
      * ä -> ae
      * ö -> oe
      * ü -> ue
      
      Resolves: #PSCSX-4325
      3f055935