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

9141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien Metzger 7c4cabf0f2 Merge pull request #420 from e-gaulue/Module_translation_patch_2 
[-] BO : don't show unecessary tpl module translations - complience with documentation
 2013-05-06 07:08:41 -07:00
Damien Metzger 2af342c864 [-] BO : fixed potential warning with texture list #PSCFV-9050 2013-05-06 09:27:03 +02:00
Damien Metzger dc294d24cb [-] BO : tab cache wasn't emptied on delete #PSCFV-9053 2013-05-06 09:23:07 +02:00
Rémi Gaillard abcb083cb3 [-] BO: You can now disable the email sent after account creation 2013-05-03 17:01:12 +02:00
Gregory Roussac 4e8c5a24df [-] FO : Fix bug #PSCFV-8967 large image instead of thickbox when one image 2013-05-02 22:19:28 +02:00
gRoussac 3e93198b13 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-02 19:03:11 +02:00
gRoussac 049d00a9db [-] INSTALLER : Fix bug #PSCFV-8605 first part, do not affect memeory limit when upgrading if set to -1 2013-05-02 19:02:48 +02:00
Rémi Gaillard 32a11677e7 // small fix 2013-05-02 18:58:05 +02:00
Edouard Gaulué fdb931e3e8 [-] BO : don't show unecessary tpl module translations - complience with documentation 2013-05-02 18:46:13 +02:00
Rémi Gaillard 4d4eb9df19 [-] BO: Fix #PSCFV-8179 shop domain used in emails sometimes was for the wrong shop 2013-05-02 18:42:01 +02:00
gRoussac 63fe5b8d4a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-02 17:10:49 +02:00
gRoussac 311ad3087c // small fix when rel of big pic is empty 2013-05-02 17:06:32 +02:00
Damien Metzger 87be8bd39e [-] BO : fixed infinite loop in the categories #PSCFV-8965 2013-05-02 16:06:26 +02:00
sLorenzini e67965e6bc // FO: improve jqzoom product 2013-05-02 15:56:55 +02:00
gRoussac 15a4d1c60f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-02 15:41:34 +02:00
gRoussac 605f95eb88 [-] INSTALLER : Fix bug #PSCFV-8750 do not activate disabled module during upgrade 2013-05-02 15:41:21 +02:00
sLorenzini e158ea1227 [-] FO: fixed bug: Solved a javascript problem on the new 1.5.4.1 with the full image on product page - PSCFV-8967 2013-05-02 15:06:57 +02:00
vAugagneur 77b8e106f7 [-] MO : fixed hug #PSCFV-8994 - clear cache when truncate catalog 2013-05-02 11:41:49 +02:00
Rémi Gaillard 46f7922a8f // id_product_attribute is not necessary in the cache name of Product::getPriceStatic for cart_quantity 2013-04-30 12:33:52 +02:00
sLorenzini e0a16977ef [-] FO: improve some css for RTL language 2013-04-30 11:34:13 +02:00
sLorenzini 4d961564f7 [-] FO: replace logo on the left (fixed bug RTL language - #PSCFV-8891) 2013-04-30 11:23:18 +02:00
sLorenzini 00bd78e843 // BO: Improve product display on supplier page 2013-04-30 11:09:08 +02:00
Gregory Roussac cb29f20f1e // remove unused .show() 2013-04-29 23:14:57 +02:00
Gregory Roussac 1e4e8d6a13 [-] FO : Jqzoom must be enabled to add class jqzoom 2013-04-29 22:05:01 +02:00
Gregory Roussac d618c8618a //norms 2013-04-29 21:55:30 +02:00
Gregory Roussac a8698d9e59 [-] Bo : Admin login loop under Firefox 2013-04-29 21:54:26 +02:00
Rémi Gaillard 9fc4bce500 [-] Core: Fix specific prices if they are configured to count quantity per product and not per combination 2013-04-29 18:49:42 +02:00
Damien Metzger 548ef7691a // BO : Changed product display on supplier page 2013-04-29 18:34:34 +02:00
Dragan Skrbic d00ccdf306 // Fixed image import 2013-04-29 18:07:42 +02:00
Damien Metzger 4c259393f5 // Fixed case which caused duplicated translation #PSCFV-8936 2013-04-29 17:45:45 +02:00
Damien Metzger 989b19d94a [-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181 2013-04-29 17:45:45 +02:00
gRoussac 88adba8e5b // typo 2013-04-29 17:19:07 +02:00
gRoussac 78747eedc2 // rework of https://github.com/PrestaShop/PrestaShop/commit/5f6d0614df4bf7d354988dd7320d012238488401#commitcomment-3108107 2013-04-29 17:12:17 +02:00
gRoussac 9ce2249883 // revert from commit 5f6d0614df 2013-04-29 17:03:41 +02:00
vAugagneur 716b79b8c6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-29 16:21:51 +02:00
vAugagneur acccaf5fbc Merged Pull Request #242 - thanks @andskiba 2013-04-29 16:21:33 +02:00
Rémi Gaillard dc7f1ceddf [-] BO: Fix #PSCFV-8957 order creation when id_cart=0 is present in database but should normally not happen 2013-04-29 13:47:46 +02:00
Vincent Augagneur d0f6f2b6c7 Merge pull request #389 from ccauw/patch-5 
[*] BO : Add block "override_form_extra"
 2013-04-29 03:11:40 -07:00
Damien Metzger 527f87a691 // Fixed directory creation in translation #PSCFV-8212 2013-04-29 12:08:45 +02:00
Damien Metzger 3b5591dc55 [-] FO : removed misleading label on the shipping total #PSCFV-8556 2013-04-29 11:35:47 +02:00
Damien Metzger c587934e25 [-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785 2013-04-29 11:16:26 +02:00
Damien Metzger a06b42704e [-] FO : fixed truncate and entities in the cart block #PSCFV-8870 2013-04-29 10:52:44 +02:00
Damien Metzger 903b17979c [-] BO : fixed error message in language form #PSCFV-8890 2013-04-29 10:47:59 +02:00
Vincent Augagneur 795d7aa952 Merge pull request #259 from ldecoker/patch-3 
[*] [MO] blocksupplier - missing uninstall method
 2013-04-29 01:38:17 -07:00
Vincent Augagneur ad3ba5342d Merge pull request #291 from minicstudio/development 
[*] MO : blocksearch - override buttons for ajax cart
 2013-04-29 01:35:38 -07:00
Vincent Augagneur ad17dbc700 Merge pull request #310 from Patanock/patch-5 
[*] BO: Customer and carrier need to be send to the hook
 2013-04-29 01:31:16 -07:00
Vincent Augagneur 83bc226508 Merge pull request #411 from MyBB-Services/dev/gb/mailcolor 
[*] Mails : delete a hard-coded pink background
 2013-04-29 01:28:19 -07:00
Vincent Augagneur 5438a131b4 Merge pull request #330 from DrySs/patch-5 
[-] FO: CMS link to conditions should not be in SSL
 2013-04-29 01:22:21 -07:00
Grégoire Bélorgey 0fed37eecd [*] Mails : delete a hard-coded pink background 2013-04-29 10:21:53 +02:00
Grégoire Bélorgey 1a81461965 Replacing the default pinkish background with a grey one, and put the text in {color} 2013-04-28 11:13:46 +02:00