dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,782 Commits 9 Branches 19 Tags
2b67d7072ce14e5e640c2d20d47dbd1140fb83d7
Commit Graph
18782 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Gaillard 2b67d7072c // type of logger field 2013-10-29 10:18:29 +01:00
Gregory Roussac b885c63564 Merge pull request #900 from kpodemski/patch-10 
[*] MO: productcomments optimization
 2013-10-29 02:06:56 -07:00
Gregory Roussac d74291e5b5 Merge pull request #901 from kpodemski/patch-11 
[*] MO: blocksharefb optimization
 2013-10-29 02:06:25 -07:00
Jerome Nadaud 1d90218e0d // Update mailalert module version 2013-10-29 10:00:57 +01:00
Jerome Nadaud 9660cef0aa [-] MO : mailalert - Fix deprecated warning on displayDate 2013-10-29 09:58:42 +01:00
Jérôme Nadaud 4b1f198cc4 Merge pull request #899 from cedricfontaine/patch-3 
Update stores.js
 2013-10-29 01:43:03 -07:00
gRoussac 0aca1d4a67 [*] BO : AdminProducts find smallest images 2013-10-29 08:47:41 +01:00
Krystian Podemski 526f32b6a0 [*] MO: blocksharefb optimization 2013-10-28 23:24:32 +01:00
Krystian Podemski faa4a18a82 [*] MO: productcomments optimization 2013-10-28 23:21:35 +01:00
gRoussac 79cba4b655 [-] FO : Fix bug #PSCFV-10851, no shop restriction in vouchers display in cart 2013-10-28 19:00:00 +01:00
cedricfontaine 0ba8fbc39a Update stores.js 
Phone number is already in the address field
 2013-10-28 13:46:42 -04:00
Rémi Gaillard edf54eb2ca // re-generate class_index on the first step of install 2013-10-28 18:43:02 +01:00
gRoussac e86c56172d [*] FO: Can not establish purchase total when tax incl. 2013-10-28 17:42:23 +01:00
Jerome Nadaud 48b7a49b1a // Product image upload failed with bad content-type header 2013-10-28 14:58:19 +01:00
Gregory Roussac 12a257db7a Merge pull request #898 from Jacky75/blulab20131028-slider-virtualuri 
[-] MO : homeslider stores slider about multistore with virtual uri
 2013-10-28 06:53:41 -07:00
Sarah Lorenzini 63141a9c4d [-] FO: fixed bug #PSCFV-10654 - TinyMCE editor: List of products by manufacturer, products by supplier - Long description is not hidden. 2013-10-28 14:48:48 +01:00
Daniele Giachino c84689ec71 homeslider stores slider about multistore with virtual uri 2013-10-28 14:09:35 +01:00
gRoussac 4103339f53 [-] BO : AdminImport, fix bug from https://github.com/indesign47/PrestaShop/commit/84454bbc1c7a315e232245c5e43b300b8f153473#commitcomment-4418502 2013-10-28 11:21:25 +01:00
Gregory Roussac 9a879bc133 Merge pull request #897 from freedayko/development 
[*] BO : improved unicode characters replacement in URLs
 2013-10-28 03:09:16 -07:00
gRoussac e1d1479f22 [*] FO : Fix bug #PSCFV-10689 handle image legend 2013-10-27 23:31:36 +01:00
gRoussac 2dbaa5f73b [-] BO : Fix bug #10689, could not set image legend in back office 2013-10-27 22:49:25 +01:00
gRoussac 9a3cfece69 //missing line feed after disable_modsec 2013-10-27 16:05:55 +01:00
Aleksander Palyan ee06d3114d [*] BO : improved unicode characters replacement in URLs (Russian and Ukrainian characters added) 2013-10-27 15:05:49 +02:00
gRoussac c5c861b59e [-] MO : Blockwishlist no product image when id_product_attribute is defined, thanks @Broceliande 2013-10-27 13:28:34 +01:00
gRoussac 4c484afda1 [-] MO : Fix bug #PSCFV-10841, blockcart hides on product page when last product is removed from cart 2013-10-25 17:37:32 +02:00
gRoussac 025b62f995 // norms 2013-10-25 17:33:44 +02:00
Fabio Chelly 8f6a5bb3a1 Merge remote-tracking branch 'origin/development' into development 2013-10-25 17:01:51 +02:00
Fabio Chelly a7d0794c43 [-] BO : Fixed bug PSCFV-9910 using basic queries to prevent locking errors 2013-10-25 17:01:28 +02:00
Gregory Roussac 6359c1ca33 Merge pull request #893 from neemzy/development 
[*] FO : Turned "true" and "false" strings to proper booleans in address.tpl
 2013-10-25 07:42:59 -07:00
Tom Panier 9a26cf02a8 Turned "true" and "false" strings to proper booleans 
It's cleaner this way, and matches how it is done on similar templates.
 2013-10-25 16:36:39 +02:00
gRoussac eb8ea1cba5 [-] CORE : SetEnv in if statement 2013-10-25 15:29:15 +02:00
gRoussac 4e6585a1b8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-25 15:21:55 +02:00
gRoussac a03efe152c [-] CORE : SetEnv not available on all config // @todo curl request on dummy .htacces 2013-10-25 15:21:40 +02:00
gRoussac 942d3c7151 [-] MO : Fixbug #PSCFV-10679 dateofdelivery PDF invoice array and array 2013-10-25 00:01:25 +02:00
gRoussac 1e094f4016 [-] FO: Fix bug #PSCFV-10623 blocknewproducts shows products when PS_NB_DAYS_NEW_PRODUCT == 0 2013-10-24 23:29:23 +02:00
gRoussac a9643c80c3 // bad commit sorry 2013-10-24 22:45:43 +02:00
gRoussac 438a3dda2b [-] BO : Fix bug #PSCFV-10718 AdminAttachments old file not deleted on update 2013-10-24 22:42:13 +02:00
gRoussac 4cd3e1b830 [-] FO: Fix bug #PSCFV-10230, Blockspecials still caching when files cache limit is 0 2013-10-24 21:59:32 +02:00
gRoussac 97ef888345 [-] FO: Fix bug #PSCFV-10625 Js error on carriers step if AjaxCart disabled 2013-10-24 21:28:22 +02:00
Gregory Roussac 4207bdff32 Merge pull request #890 from indesign47/patch-14 
[-] BO : AdminImport change width height depth
 2013-10-24 09:43:54 -07:00
Jerome Nadaud 6f57093f50 [-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security 2013-10-24 18:36:36 +02:00
indesign47 8cb1806e49 // small fixes for Width Height Depth 
change
0,1;0,2;0,3
to
1,2,3
 2013-10-24 18:13:05 +02:00
gRoussac 759fe2f671 // norms 2013-10-24 18:09:21 +02:00
Gregory Roussac 0416aca547 Merge pull request #889 from PhpMadman/PSCFV-10728 
[-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO
 2013-10-24 09:06:43 -07:00
Rémi Gaillard cc3363011e // rewrited urls for feeder module 2013-10-24 17:54:44 +02:00
PhpMadman c516035e0e [-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO 2013-10-24 17:19:28 +02:00
gRoussac c5324a653b [-] IN: Fix bug #PSCFV-10644 no carrier available after upgrade from 1.4.x 2013-10-24 16:31:50 +02:00
Rémi Gaillard 3cd702da42 [-] WS: Fix stockavailables list when stock is shared between shops #PSCFV-10793 2013-10-24 16:30:02 +02:00
Gregory Roussac 65401efcb6 Merge pull request #887 from indesign47/patch-13 
[*] BO : AdminImport add img manufacturers-suppliers
 2013-10-24 07:22:57 -07:00
indesign47 84454bbc1c [*] BO : AdminImport add img manufacturers-suppliers 2013-10-24 16:16:29 +02:00