dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,998 Commits 9 Branches 19 Tags
development
Commit Graph

18998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PhpMadman
7c1623c7fa [-] BO : Order-follow displayed order id instead of order reference 2013-10-29 14:53:50 +01:00
Jérôme Nadaud
ed2fbba996 Merge pull request #903 from PhpMadman/patch-2 
[-] BO : hide stmp options when selecting never send emails
 2013-10-29 05:31:02 -07:00
PhpMadman
87bb957431 fixed missing comma 2013-10-29 13:28:00 +01:00
PhpMadman
7b029457e4 [-] BO : hide stmp options when selecting never send emails 2013-10-29 12:41:24 +01:00
Jerome Nadaud
b605f33359 [-] BO : FixBug #PSCFV-10866 - Tagify system not working 2013-10-29 12:07:30 +01:00
Jerome Nadaud
580e201c48 [-] BO : FixBug #PSCFV-9319 - display only valid order id 2013-10-29 11:38:48 +01:00
gRoussac
d409614222 [-] FO : CustomerMessage ip_address to string 2013-10-29 11:18:53 +01:00
djfm
e1c7541a38 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-29 10:01:00 +00:00
gRoussac
1bee84d26c [-] BO : Do not delete other default jpg when _deleteOldImages and type defined 2013-10-29 10:57:33 +01:00
gRoussac
af61191a7e // rename field Action when out of stock 2013-10-29 10:55:46 +01:00
Rémi Gaillard
07222be5dd // demo mode on ajaxfilemanager 2013-10-29 10:53:00 +01:00
Jerome Nadaud
9f2580f3bd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-29 10:31:12 +01:00
Jerome Nadaud
d2e475dd3a // Removed line from merge 2013-10-29 10:30:59 +01:00
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 84454bbc1c (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
Julien
0bc1d21432 [-] MO : Fix NetworkError 404 Not Found on admin in blocklayered.php 
These files not exists :
 - /js/jquery/jquery-ui-1.8.10.custom.min.js
 - /css/jquery-ui-1.8.10.custom.css
 2013-10-26 15:08:07 +02: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