Commits · 1.6 · alfons83 / PrestaShop · GitLab

26 Jan, 2015 13 commits
- [-] BO : #PSCSX-4479 Add check on htaccess before changing media servers · bb368c69
  Gregory Roussac authored Jan 26, 2015
  
  bb368c69
- // AdminProductsControllers: wording · 954738d4
  Alex Even authored Jan 26, 2015
```
Updated "gross margin" definition
```
  954738d4
- // warning #PSCFV-12698 · a83ee093
  Gregory Roussac authored Jan 26, 2015
  
  a83ee093
- [-] CORE: Fix bug #PSCSX-4477, exception on adding profile · df63dd01
  Gregory Roussac authored Jan 26, 2015
  
  df63dd01
- // header.tpl: wording · aeaf3cad
  Alex Even authored Jan 26, 2015
  
  aeaf3cad
- // page.tpl: wording · 0c5f99c7
  Alex Even authored Jan 26, 2015
  
  0c5f99c7
- // follow up https://github.com/PrestaShop/PrestaShop/pull/2410 · 9780f366
  Gregory Roussac authored Jan 26, 2015
  
  9780f366
- // add some chars to the rtrim bce562f0 · 61aa2a50
  Rémi Gaillard authored Jan 26, 2015
  
  61aa2a50
- // rtrim ; on Db::getRow() / Db::getValue() in order to be sure that the limit... · bce562f0
  Rémi Gaillard authored Jan 26, 2015
```
// rtrim ; on Db::getRow() / Db::getValue() in order to be sure that the limit can be applied and the cursor can be closed after the query
```
  bce562f0
- // Redirection must always be done · e3d766de
  Rémi Gaillard authored Jan 26, 2015
  
  e3d766de
- // Can't use method return value in write context · cfff96b8
  Gregory Roussac authored Jan 26, 2015
  
  cfff96b8
- // follow up... · c1303551
  Gregory Roussac authored Jan 26, 2015
```
// follow up https://github.com/PrestaShop/PrestaShop/commit/30cc4fce47102335365076db9d96dfe3d3ac11c8#commitcomment-9428088
```
  c1303551
- // follow up... · 8693e8c5
  Gregory Roussac authored Jan 26, 2015
```
// follow up https://github.com/PrestaShop/PrestaShop/commit/cab6d52a189e69f137acae3122b3e3a29251ac06
```
  8693e8c5
23 Jan, 2015 11 commits
- Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6 · ba66547e
  Gregory Roussac authored Jan 23, 2015
  
  ba66547e
- // typo · a7a05287
  Gregory Roussac authored Jan 23, 2015
  
  a7a05287
- // retrocompat... · c2c2b3ff
  Gregory Roussac authored Jan 23, 2015
```
// retrocompat https://github.com/PrestaShop/PrestaShop/commit/cab6d52a189e69f137acae3122b3e3a29251ac06
```
  c2c2b3ff
- Merge pull request #2409 from Konafets/bugfix/arraySyntax · bd9422b2
  Jérôme Nadaud authored Jan 23, 2015
```
[-] Project : Fix syntax errors in js/retro-compat.js.php
```
  bd9422b2
- [-] Project : Fix syntax errors in js/retro-compat.js.php · dbf5bca2
  Stefano Kowalke authored Jan 23, 2015
```
Resolves: PSCSX-4442
```
  dbf5bca2
- Merge pull request #2408 from GiantLeapLab/fix_css · 0ed442c0
  Gregory Roussac authored Jan 23, 2015
```
[-] FO,BO : Changed absolute path to relative of bxSlider plugins' icon 
```
  0ed442c0
- [-] FO,BO : Changed an absolute to a relative path of the icon of bxSlider plugin · 18f65a77
  Valerii Savchenko authored Jan 23, 2015
  
  18f65a77
- // follow up https://github.com/PrestaShop/PrestaShop/pull/2407 · 119879cb
  Gregory Roussac authored Jan 23, 2015
  
  119879cb
- Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6 · 66c304ff
  Gregory Roussac authored Jan 23, 2015
  
  66c304ff
- [-] FO : Fix bug #PSCSX-4427, clear color list cache when removing combination · 3a714f62
  Gregory Roussac authored Jan 23, 2015
  
  3a714f62
- // Submodules updated · 6632b070
  Francois Gaillard authored Jan 23, 2015
  
  6632b070
22 Jan, 2015 16 commits
- Merge branch 'guestisp-use-constants-for-api-urls' into 1.6 · 542826dd
  Gregory Roussac authored Jan 22, 2015
  
  542826dd
- // norm · 0e25ccd8
  Gregory Roussac authored Jan 22, 2015
  
  0e25ccd8
- [*] CORE: Removed hardcoded API urls · cab6d52a
  GUEST.it authored Jan 22, 2015
  
  cab6d52a
- Merge pull request #2406 from guestisp/fix-cache-name-in-state.php · 2928bec1
  Gregory Roussac authored Jan 22, 2015
```
[-] Core: fix cache name in State.php
```
  2928bec1
- [-] Core: fix cache name in State.php · 95192382
  GUEST.it authored Jan 22, 2015
  
  95192382
- [-] BO : Fix #PSCSX-3408 : Carrier package size are tested for every rotation possible · 68404405
  Shudrum authored Jan 22, 2015
  
  68404405
- [*] BO : Carriers and Products package sizes have now the same order. · dbc535b1
  Shudrum authored Jan 22, 2015
  
  dbc535b1
- Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 · 802b84e4
  Shudrum authored Jan 22, 2015
  
  802b84e4
- [-] FO Fix #PNM-3160 : Wrong rights used when cache active. · 1f0a8995
  Shudrum authored Jan 22, 2015
  
  1f0a8995
- Merge pull request #2404 from harelguy/PSCSX-4423 · b49abdc3
  Gregory Roussac authored Jan 22, 2015
```
[-] WS : Bug fix - invalid method signature for getWsCurrentState in
```
  b49abdc3
- Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6 · 8e81cda6
  Gregory Roussac authored Jan 22, 2015
  
  8e81cda6
- [-] CORE: Fix #PSCFV-12694, set default value in base for available_date · 8cf57fce
  Gregory Roussac authored Jan 22, 2015
  
  8cf57fce
- [-] WS : Bug fix - invalid method signature for getWsCurrentState in · e40f9715
  harelguy authored Jan 22, 2015
```
Order.php. Issue PSCSX-4423 on Forge
```
  e40f9715
- Merge pull request #2403 from guestisp/fix-removal-shipping-fees · 3d8fb582
  Gregory Roussac authored Jan 22, 2015
```
[-] CORE: Stop blanking shipping fees in carrier wizard
```
  3d8fb582
- Remove blanking shipping fees when disabled · 3c548d42
  GUEST.it authored Jan 22, 2015
  
  3c548d42
- Merge pull request #2402 from kpodemski/patch-5 · 6c240416
  Gregory Roussac authored Jan 22, 2015
```
[*] BO: Modules to export checked by default
```
  6c240416