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

7765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien Metzger 6180cb1fa9 // And another 2012-12-12 14:33:54 +01:00
Damien Metzger 6532868e1d // Fixed duplicated lines #PSCFV-6109 2012-12-12 14:31:46 +01:00
Damien Metzger 0f6b60a3af // Merged 4 lignes of code in the Configuration class 2012-12-12 14:29:37 +01:00
Vincent Augagneur e060a32e60 Merge pull request #79 from PrestaEdit/PSCFV-3877 
[-] FO : mobile template - states management
 2012-12-12 03:34:09 -08:00
Jonathan Danse 1780a5ea7b [*] FO : mobile template - states management 
Put "p" and "div" in the same selector
 2012-12-12 12:30:10 +01:00
Vincent Augagneur 651743734e Merge pull request #74 from mcdado/patch-1 
[-] FO : order-carrier more compatible with opc
 2012-12-12 03:21:19 -08:00
Rémi Gaillard 1d909b1248 [-] FO: The dispatcher now load the custom routes prior the defaults to avoid infinite loops 2012-12-12 11:46:19 +01:00
vAugagneur bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Vincent Augagneur 04ad50908e Merge pull request #78 from montes/redution-typo 
[-] FO : Fixed variable typo (redution instead of reduction in some places)
 2012-12-12 00:53:00 -08:00
Rémi Gaillard 98d9575c4c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-11 18:05:02 +01:00
Rémi Gaillard 4061c67c5b [-] MO: Mailalert should send alert for new order independently of the stock management 2012-12-11 18:04:33 +01:00
vAugagneur a2f7ef0136 [-] FO : fixed bug #PSCFV-6057 - In step 4 by pressing terms and conditions, do not load css in Internet Explorer 8 2012-12-11 17:53:58 +01:00
Rémi Gaillard b3b5f7a1e9 [-] Core: Fix #PSCFV-5997 - Product::priceCalculation not return the price of default combination 2012-12-11 17:45:06 +01:00
sLorenzini 05a6f856da [-] FO: CLONE - order_conf still not fixed propertly #2 - #PSCFV-5817 2012-12-11 17:43:30 +01:00
Rémi Gaillard bf1b491e94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-11 16:59:56 +01:00
vAugagneur ec05f5e384 [-] CORE : fixed bug #PSCFV-6084 2012-12-11 16:59:35 +01:00
Rémi Gaillard 8d2f5d6e42 [-] BO: don't display stock available if stock management is disabled #PSCFV-6029 2012-12-11 16:59:26 +01:00
Rémi Gaillard ef4b3576fc [-] BO: Improve memory usage in admin product in global context with a lot of shops and attributes 2012-12-11 16:05:29 +01:00
vAugagneur 5698e05f63 [-] CORE : fixed bug #PSCFV-6098 Double @ in customer email address crashes BO 2012-12-11 15:44:32 +01:00
Damien Metzger 575983a52e // Fixed stripos !== false in module search 2012-12-11 15:36:51 +01:00
Damien Metzger e6ad7ec815 [-] FO : jquery mobile was not compatible with js minifier, I updated both 2012-12-11 14:01:40 +01:00
Rémi Gaillard a0041364a1 // replace bad attribute name 2012-12-11 12:11:47 +01:00
Rémi Gaillard e8718ec42f [-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885 2012-12-11 12:01:04 +01:00
Rémi Gaillard a8096c2800 [-] BO: Fix various bugs in categories ntree generation 2012-12-11 11:19:21 +01:00
Damien Metzger 7eb764e596 // config.xml in english 2012-12-11 11:19:40 +01:00
Damien Metzger b7d4321e5a [-] MO : fixed backslashes in homeslider #PSCFV-5664 2012-12-11 11:16:56 +01:00
Rémi Gaillard 4c31212fa5 // Only js strings need to add slashes 2012-12-10 16:05:38 +01:00
Rémi Gaillard 131f99eb69 [-] Core: send email when payment is remotly accepted #PSCFV-6064 2012-12-10 15:57:59 +01:00
sLorenzini ae2c41286f [-] FO: fix The French order_return_state HTML mail template has the wrong colours - #PSCFV-6005 2012-12-10 15:17:23 +01:00
Rémi Gaillard a68e5c1cfb [-] Core: Fix Swift and TCPDF for hosting which disallow getmypid() php function 2012-12-10 15:06:03 +01:00
vAugagneur 1db4c7875e //added more check on module upload part 2 2012-12-10 14:45:14 +01:00
vAugagneur 401b3dd41d //added more check on module upload 2012-12-10 14:44:11 +01:00
Rémi Gaillard 8b817a4a8c [-] Core: Fix search indexation when id_product is forced #PSCFV-6039 2012-12-10 13:52:09 +01:00
sLorenzini fb93b5376b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-10 11:43:51 +01:00
sLorenzini 1c7f88e048 [-] FO: fix Image attributes not set - #PSCFV-5957 2012-12-10 11:42:13 +01:00
Francois Gaillard c246082e72 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-10 11:39:11 +01:00
Francois Gaillard acfb43c284 [*] FO : Bug fix : h4 -> title_block 2012-12-10 11:38:48 +01:00
vAugagneur 25229b51ae [-] BO : fixed bug #PSCFV-6000 - added check if zip uploaded is a real module in AdminModules 2012-12-10 11:16:33 +01:00
vAugagneur 221667a80d [-] BO : fixed bug #PSCFV-5991 - CMS friendly URL does not automatically copied 2012-12-10 10:51:46 +01:00
Rémi Gaillard 53f1e8fcbb // Display exception in admin regardless mode dev 2012-12-10 10:47:41 +01:00
Francois Gaillard 2f3799abb8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-10 10:18:53 +01:00
Francois Gaillard 9ab0485946 [*] FO : Cart vouchers style edited 2012-12-10 10:18:41 +01:00
vAugagneur ae7569bde3 [-] BO : added import button on listing 2012-12-10 10:14:03 +01:00
PrestaEdit 7a91409023 [-] FO : mobile template - states management 2012-12-08 23:46:14 +01:00
montes aa4b474522 Fixed variable typo (redution instead of reduction in some places) 2012-12-07 23:24:41 +01:00
Rémi Gaillard 7e6d94053b // small fix 2012-12-07 18:01:32 +01:00
vAugagneur 90d4c27d17 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-07 18:01:46 +01:00
vAugagneur af3eb2cc38 //small js fix 2012-12-07 18:01:32 +01:00
Rémi Gaillard 3280bfbeed [-] WS: Fix #PSCFV-5915 temporary images deletion 2012-12-07 17:58:46 +01:00
Rémi Gaillard 3497af985a [-] FO: FIX #PSCFV-5703 quotes in modules translations break javascript execution 2012-12-07 17:23:06 +01:00