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

7937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Augagneur 6dfd94677a Merge pull request #152 from Shagshag/patch-4 
[-] _USER_ID_LANG_ doesn't exist anymore
 2013-01-07 01:03:33 -08:00
vAugagneur a54df8e36a Merge Pull request 154 - thanks to @prestashop-iran 2013-01-07 09:35:36 +01:00
Shagshag 910c23e5ba _USER_ID_LANG_ doesn't exist anymore 2013-01-04 21:34:02 +01:00
gRoussac 93fb44104a // Sorry correct \t for norms 2013-01-04 17:32:21 +01:00
Vincent Augagneur 1f9a3109b9 Merge pull request #150 from djfm/development 
//Changed English strings using the translationsenglish module.
 2013-01-04 08:06:15 -08:00
djfm 385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
Gregory Roussac ae117c2457 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-04 16:32:45 +01:00
gRoussac 51517e14a3 [-] FO : Fix #PSCFV-4885 for DNI field, states and postcode display 2013-01-04 16:31:05 +01:00
Rémi Gaillard 9c5f416f5e [-] FO: Fix #PSCFV-6493 root and home category id should be different of 1 and 2 2013-01-04 16:04:15 +01:00
Rémi Gaillard d7694b5900 [*] BO: Improve form of catalog price rules #PSCFV-6099 2013-01-04 15:50:13 +01:00
Rémi Gaillard 507309ddf5 [-] BO: Fix #PSCFV-6386 recyclable should be init to 0 on BO orders 2013-01-04 15:06:07 +01:00
Rémi Gaillard 3fbd7dc55c [-] BO: Fix #PSCFV-6120 display of shipping price on BO order summary detail with freeshipping 2013-01-04 14:51:01 +01:00
vAugagneur 20fa64b05b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-04 11:45:25 +01:00
vAugagneur 6a07626114 //small refacto 2013-01-04 11:45:17 +01:00
François Gaillard 064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Gregory Roussac b08444cccd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-03 18:43:14 +01:00
root ce24ce6d1b [-] FO : Fix #PSCFV-6307 correct invoice address in OPC 2013-01-03 18:35:01 +01:00
Rémi Gaillard b9b5e7e998 [-] BO: override the compile check to true for smarty in the BackOffice 2013-01-03 17:49:04 +01:00
Rémi Gaillard 6d7986dae0 [-] MO: Fix blockviewd for non identified customers #PSCFV-6042 2013-01-03 17:25:56 +01:00
Rémi Gaillard 6c1c3402bc [-] Core: Fix #PSCFV-5912 price computation on cart with multiple product without combinations 2013-01-03 16:44:10 +01:00
Gregory Roussac 9513a9e599 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-03 15:20:08 +01:00
gRoussac 5c80535287 [-] FO : Fix again #PSCFV-6209 #PSCFV-5686 no required phone 2013-01-03 15:19:04 +01:00
vAugagneur cc32366077 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-03 15:18:06 +01:00
vAugagneur 8d7196daf3 [-] BO : fixed import images 2013-01-03 15:18:00 +01:00
Rémi Gaillard b10b53028f [-] FO: Fix #PSCFV-6159 order way of best sales 2013-01-03 12:08:29 +01:00
Rémi Gaillard df405abfe9 [-] BO: Fix #PSCFV-6118 display of product image for git on BackOffice orders 2013-01-03 11:38:39 +01:00
Gregory Roussac 742c84bee8 // forgot delete 2013-01-03 11:11:16 +01:00
Gregory Roussac 4a26358517 [*] Installer : Lower memory for update_order_messages.php 2013-01-03 10:44:11 +01:00
vAugagneur 865c98e096 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-02 17:48:07 +01:00
vAugagneur a5ab1d5bc2 //small fix when disabled language with bulk action 2013-01-02 17:47:49 +01:00
Vincent Augagneur e0eafaaac1 Merge pull request #136 from PrestaEdit/patch-3 
//remove WAHOU
 2013-01-02 08:18:24 -08:00
vAugagneur 13ad25f331 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-02 17:09:44 +01:00
vAugagneur f7754045fb [-] BO : fixed bug #PSCFV-6130 - Wrong currency in product specific prices administration 2013-01-02 17:09:39 +01:00
PrestaEdit c811f6a835 [-] FO: remove WAHOU 2013-01-02 17:06:24 +01:00
Rémi Gaillard 384c610d81 [-] BO: Fix #PSCFV-6394 price/weight/unit_price reduction impact on combinations form 2013-01-02 16:48:30 +01:00
Rémi Gaillard 301dc491b4 [-] BO: Fix #PSCFV-6415 php notice 2013-01-02 16:21:54 +01:00
vAugagneur b9e688a4bf [-] FO : fixed bug #PSCFV-6411 Friendly URL on prices-drop for page 2 doesn't work 2013-01-02 14:40:35 +01:00
Damien Metzger 691dc919c4 // Changelog, readme and install_version.php 2013-01-02 12:01:12 +01:00
Damien Metzger 039b3fa9cf // Fix upgrade 2013-01-02 12:00:57 +01:00
vAugagneur a232288ee1 //retro compat smarty variable name 'onr_phone_at_least' 2013-01-02 11:53:43 +01:00
vAugagneur 2e90e12293 //Merge branch release 2013-01-02 09:56:20 +01:00
Rémi Gaillard b3639c958b // oups.... 2012-12-31 12:20:26 +01:00
Rémi Gaillard 1edd663b11 // small fix 2012-12-31 12:17:42 +01:00
Rémi Gaillard 37f9d31c0a [-] FO: Fix retrocompatibility for modules and old themes 2012-12-31 12:06:28 +01:00
Rémi Gaillard f49630e02b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-31 12:03:54 +01:00
Damien Metzger a9f123f3f2 // Just to be sure... 2012-12-31 12:00:29 +01:00
Rémi Gaillard ed238ad619 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-31 11:54:12 +01:00
Damien Metzger c6ca7b6215 [-] BO : fixed accentuated URLs in products 2012-12-31 10:22:53 +01:00
Rémi Gaillard 4d76877ec6 [-] FO: Fix PHP warning on category controller 2012-12-31 10:04:53 +01:00
Damien Metzger 6a67264325 Merge pull request #127 from PrestaEdit/Patch-#002 
[-] Project: Fix bug when you want to upload (and resize) an image
 2012-12-31 00:51:37 -08:00