dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,908 Commits 9 Branches 19 Tags
8609f077495c2d082eeb80948c8bbb2fffa7fce2
Commit Graph

8908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Augagneur
8609f07749 Merge pull request #346 from pxls/patch-1 
[-] FO : bad variable used for free product text
 2013-04-12 02:42:24 -07:00
Rémi Gaillard
305cf4dd9c [-] BO: Fix #PSCFV-8730 display of selected dates on the backoffice listings header - thank to pitt phunsanit for the patch 2013-04-12 11:39:56 +02:00
Vincent Augagneur
e8f3fcf581 Merge pull request #371 from PrestaEdit/patch-26 
[-] Config: juste more beautifull :)
 2013-04-12 01:50:54 -07:00
Rémi Gaillard
a632965b0d // fix for commit 3cbd8444d6 2013-04-12 10:49:30 +02:00
gRoussac
08c53d77b2 [-] CORE : Fix bug #PSCFV-5624 set order reference to CHAR(10) 2013-04-11 18:53:10 +02:00
Rémi Gaillard
3cbd8444d6 [-] FO: Fix #PSCFV-8722 displayed specific prices on product page was sometimes wrong 2013-04-11 18:09:35 +02:00
vAugagneur
714b57f225 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 17:51:34 +02:00
vAugagneur
d827879f8b //change the default color (#db3484) 2013-04-11 17:51:28 +02:00
gRoussac
61557f2fd0 [-] FO : Fix bug #PSCFV-8589 do not loose max level depth when upgrading 2013-04-11 17:34:15 +02:00
PrestaEdit
60e77597ac [-] Remove / 2013-04-11 18:18:15 +03:00
Vincent Augagneur
239dcb0179 Merge pull request #377 from PrestaEdit/patch-28 
[+] BO: show all languages in setting of employee
 2013-04-11 07:43:05 -07:00
Vincent Augagneur
0a0f28ee21 Merge pull request #375 from MrManchot/patch-1 
Update blocknewsletter.php
 2013-04-11 07:35:04 -07:00
vAugagneur
f9225cb8c2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 16:31:48 +02:00
vAugagneur
b1dc638120 //removed commented code 2013-04-11 16:31:43 +02:00
gRoussac
759de67222 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 15:59:58 +02:00
gRoussac
4738a15c16 //small change in table creation of linkstopmenu again 2013-04-11 15:59:23 +02:00
vAugagneur
0b7e9827af Merge pull request #65 from Ha99y:mobile-them-HR-fix2 2013-04-11 15:52:07 +02:00
gRoussac
7222af7466 //small chnage in table creation of linkstopmenu 2013-04-11 15:05:03 +02:00
gRoussac
2149c2a986 [-] INSTALLER : add counter loop in update_order_messages 2013-04-11 14:18:28 +02:00
vAugagneur
df1e71fe76 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 12:00:49 +02:00
vAugagneur
c1518dfcbf [-] CORE : fixed bug #PSCFV-8475 - Email templates with {shop_url} append url with index.php 2013-04-11 12:00:31 +02:00
gRoussac
0b21f0e221 [-] BO : Deactivate backwardcompatibility module 2013-04-11 11:59:32 +02:00
gRoussac
b12b6571a1 [-] Installer : Fix bug #PSCFV-8606 bad performance when updating messages 2013-04-11 11:49:29 +02:00
Gregory Roussac
89f5dbcde8 Merge pull request #384 from PrestaEdit/patch-30 
[-] MO: homefeatured - numbers are now the same
 2013-04-11 02:42:42 -07:00
PrestaEdit
a6dafcfa86 [-] MO: homefeatured - numbers are now the same 2013-04-11 12:40:26 +03:00
vAugagneur
7a27fa2f64 [-] FO : standardize behavior of selected country in the list when create a new address 2013-04-11 10:30:22 +02:00
Rémi Gaillard
f43aee9a25 [-] BO: PSCFV-7685 parent category for root categories after upgrade 2013-04-10 18:52:59 +02:00
gRoussac
17012ea00d [*] Installer : Set context in upgrader 2013-04-10 17:57:33 +02:00
gRoussac
8674313eae [-] INSTALLER : fix bug #PSCFV-7688 mailalert_customer_oos not existing in database 2013-04-10 10:27:25 +02:00
gRoussac
a0db01db58 // removed slash 2013-04-09 17:47:34 +02:00
gRoussac
1b01c7a602 [-] BO : Fix bug #PSCFV-8626 rename actual admin folder 2013-04-09 17:43:15 +02:00
vAugagneur
3ba776a9d1 [-] FO - fixed bug #PSCFV-8612 - Payment module: Bug in country restriction in multi store 2013-04-09 14:59:15 +02:00
sLorenzini
c26fa09667 [-] BO: fixed bug Cart rules - Javascript error - #PSCFV-5045 2013-04-09 11:22:19 +02:00
gRoussac
e5cf7a4c06 [-] BO : Fix bug #PSCFV-8620 returns with customized product 2013-04-09 10:37:15 +02:00
gRoussac
403b9b760f // miss logo 2013-04-09 10:16:49 +02:00
PrestaEdit
86c6b3154f [+] BO: show all languages in setting of employee 2013-04-09 00:33:49 +03:00
sLorenzini
66b321ae55 [-] FO: fixed bug DOCTYPE line - #PSCFV-8602 2013-04-08 18:01:58 +02:00
Rémi Gaillard
881b6e7a8b // something was missing in last commit 2013-04-08 17:53:56 +02:00
Rémi Gaillard
3ffe339a76 [*] BO: The translation of modules are now made in the theme if modules are overrided or directly in the module folder 2013-04-08 17:50:43 +02:00
Rémi Gaillard
a720b19854 [-] BO: Fix #PSCFV-8683 order_way collusion on listing between 2 tabs 2013-04-08 14:58:29 +02:00
Rémi Gaillard
90878d8a80 [-] FO: Fix htaccess generation when disable mod_security is selected #PSCFV-8675 2013-04-08 11:35:08 +02:00
Cédric Mouleyre
6c36a1ba72 Update blocknewsletter.php 
No cache on the newsletter tpl, else the message is never displayed
 2013-04-08 11:53:37 +03:00
gRoussac
d6ee2acc90 [-] BO : Fix bug : #PSCFV-8631 no download-product.tpl in languages packs 2013-04-08 10:50:03 +02:00
gRoussac
5b6dc1e9e9 [-] BO : Fix bug #PSCFV-8540 setting cookie key in cache key 2013-04-05 17:59:46 +02:00
Rémi Gaillard
3f1bcb4d18 // Fix #PSCFV-8599 remove non existant image from css 2013-04-05 17:50:21 +02:00
vAugagneur
6edc6c37f7 //small fix 2013-04-05 17:14:38 +02:00
Damien Metzger
d7b78e6f43 // Fixed commit a53163feee (shipping discount in the invoice) 2013-04-05 14:33:13 +02:00
Rémi Gaillard
26bdf77308 // And now use smarty cache groups for cache ids to be more efficient 2013-04-05 11:57:52 +02:00
Rémi Gaillard
3bbb9aa685 [*] FO: use subdirectory per template for smarty cache 2013-04-05 11:44:16 +02:00
Rémi Gaillard
d19cfc33bc [-] FO: Don't display vat_number field if not required for the country on address.tpl 2013-04-05 11:29:30 +02:00