dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,850 Commits 9 Branches 19 Tags
5832ab3eb5d62a81b427ff5f7c8bdea7d94ec00a
Commit Graph
17850 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Gaillard f49630e02b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-31 12:03:54 +01:00
Rémi Gaillard a76d05b650 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-31 12:03:54 +01:00
Damien Metzger a9f123f3f2 // Just to be sure... 2012-12-31 12:00:29 +01:00
Damien Metzger 31859f6e6f // Just to be sure... 2012-12-31 12:00:29 +01:00
Rémi Gaillard ed238ad619 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-31 11:54:12 +01:00
Rémi Gaillard b28d561e4b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-31 11:54:12 +01:00
Jonathan Danse 96c6f36b69 [-] BO: don't have the delivery PDF - User can define which statuses show the delivery PDF 2012-12-31 10:45:46 +01:00
Jonathan Danse 04ad0a5e4a [-] BO: don't have the delivery PDF - User can define which statuses show the delivery PDF 2012-12-31 10:45:46 +01:00
Damien Metzger c6ca7b6215 [-] BO : fixed accentuated URLs in products 2012-12-31 10:22:53 +01:00
Damien Metzger 6c00cf69e0 [-] BO : fixed accentuated URLs in products 2012-12-31 10:22:53 +01:00
Rémi Gaillard 4d76877ec6 [-] FO: Fix PHP warning on category controller 2012-12-31 10:04:53 +01:00
Rémi Gaillard 8b44ef218b [-] FO: Fix PHP warning on category controller 2012-12-31 10:04:53 +01:00
Damien Metzger 6a67264325 Merge pull request #127 from PrestaEdit/Patch-#002 
[-] Project: Fix bug when you want to upload (and resize) an image
 2012-12-31 00:51:37 -08:00
Damien Metzger 68dbfcbfb0 Merge pull request #127 from PrestaEdit/Patch-#002 
[-] Project: Fix bug when you want to upload (and resize) an image
 2012-12-31 00:51:37 -08:00
Damien Metzger 0af5008818 // Missing part of a fix 2012-12-31 09:45:10 +01:00
Damien Metzger 0c6b1aaf77 // Missing part of a fix 2012-12-31 09:45:10 +01:00
Damien Metzger 50b8332bf7 [-] Installer : mysql text cannot have a default value #PSCFV-6395 2012-12-31 09:42:07 +01:00
Damien Metzger b83b0215a0 [-] Installer : mysql text cannot have a default value #PSCFV-6395 2012-12-31 09:42:07 +01:00
Rémi Gaillard 062d74912d [-] Installer: Fix #PSCFV-6392 redirect_type was missing on upgrade 2012-12-31 09:35:00 +01:00
Rémi Gaillard 0fa343bafd [-] Installer: Fix #PSCFV-6392 redirect_type was missing on upgrade 2012-12-31 09:35:00 +01:00
PrestaEdit 353fa14078 [-] Project: Fix bug when you want to upload (and resize) an image 2012-12-30 20:14:51 +01:00
PrestaEdit 80f3012345 [-] Project: Fix bug when you want to upload (and resize) an image 2012-12-30 20:14:51 +01:00
Mats Rynge f2dbf94973 [-] BO : Fixed a problem with the breadcrumbs in the admin category editing controller. The previous code used asort() which put the category breadcrumbs in the wrong order. 2012-12-30 00:24:03 -08:00
Mats Rynge 230cd38839 [-] BO : Fixed a problem with the breadcrumbs in the admin category editing controller. The previous code used asort() which put the category breadcrumbs in the wrong order. 2012-12-30 00:24:03 -08:00
vAugagneur 992449c99e //CHANGELOG 1.5.3.0 2012-12-28 16:14:42 +01:00
vAugagneur a82cb7a8f4 //CHANGELOG 2012-12-28 16:14:42 +01:00
Rémi Gaillard a788394a4a [*] Core: Log the exceptions in a file #PSCFV-6334 2012-12-28 16:12:28 +01:00
Rémi Gaillard 5e367744b6 [*] Core: Log the exceptions in a file #PSCFV-6334 2012-12-28 16:12:28 +01:00
vAugagneur f296f4e642 //small fix in upgrade 2012-12-28 16:08:21 +01:00
vAugagneur 2e38587070 //small fix in upgrade 2012-12-28 16:08:21 +01:00
vAugagneur d10bf0620a Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-28 10:23:52 +01:00
vAugagneur a5568e8196 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2012-12-28 10:23:52 +01:00
vAugagneur ef46d41800 //Merge controllers/admin/AdminTranslationsController.php 2012-12-28 10:23:37 +01:00
vAugagneur 289a203bce //Merge controllers/admin/AdminTranslationsController.php 2012-12-28 10:23:37 +01:00
vAugagneur aae9aa82c4 //added methode to write default content in index.php file && added check in translation pack import 2012-12-28 10:18:14 +01:00
vAugagneur e8920c859d //added methode to write default content in index.php file && added check in translation pack import 2012-12-28 10:18:14 +01:00
Damien Metzger 1dde9b6f2a // Fixed deleteDirectory function (is_dir is cached and must not be used, because use the result of scandir) 2012-12-28 09:47:09 +01:00
Damien Metzger 7bebdb5eb5 // Fixed deleteDirectory function (is_dir is cached and must not be used, because use the result of scandir) 2012-12-28 09:47:09 +01:00
vAugagneur a35469768f //added translation 2012-12-28 09:27:12 +01:00
vAugagneur 321eaa191b //added translation 2012-12-28 09:27:12 +01:00
vAugagneur d4ba087158 //added check in translation pack import 2012-12-28 09:19:54 +01:00
vAugagneur 6e7b462317 //added check in translation pack import 2012-12-28 09:19:54 +01:00
Damien Metzger 434c0c43a9 // Clean covers in multishop 2012-12-28 09:17:16 +01:00
Damien Metzger 25ea171202 // Clean covers in multishop 2012-12-28 09:17:16 +01:00
Gregory Roussac d0eb31f3d6 [-] FO : Fix #PSCFV-6209 required phone with Guest Checkout 2012-12-27 18:05:26 +01:00
Gregory Roussac 33f09fb92f [-] FO : Fix #PSCFV-6209 required phone with Guest Checkout 2012-12-27 18:05:26 +01:00
Damien Metzger c4d8bff01c [+] BO : you can now choose if a voucher is displayed under the cart in the frontend 2012-12-27 18:04:16 +01:00
Damien Metzger 7a8adaec25 [+] BO : you can now choose if a voucher is displayed under the cart in the frontend 2012-12-27 18:04:16 +01:00
Damien Metzger 070a4b013b [-] FO : vouchers created in the backend order creation are not displayed in the frontend anymore 2012-12-27 17:44:24 +01:00
Damien Metzger 691932f2bd [-] FO : vouchers created in the backend order creation are not displayed in the frontend anymore 2012-12-27 17:44:24 +01:00