dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,072 Commits 9 Branches 19 Tags
518998ded2b8da17d9617758be2fca2019c1f032
Commit Graph

17072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Augagneur 518998ded2 //added bootstrap in BO 2013-06-13 16:35:14 +02:00
Damien Metzger be0d6f1c6c // Just to be sure that we will not have any regression 2013-06-13 15:35:17 +02:00
Damien Metzger 534c10562f [*] Installer : added cookie mode instead of session for the installer 2013-06-13 15:28:16 +02:00
Rémi Gaillard fafb7fdef7 [-] BO: Fix #PSCFV-8904 bad id_warehouse is stored on ps_address table 2013-06-13 15:05:55 +02:00
Rémi Gaillard f5dfb12e4d [-] BO: association of product attributes on associating a product to another shop #PSCFV-8735 2013-06-13 14:30:21 +02:00
Rémi Gaillard e8288c5d7a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-13 12:02:09 +02:00
Rémi Gaillard 5bf4c17f4a [-] WS: Fix webservice sort for multishop fields #PSCFV-5634 2013-06-13 12:01:51 +02:00
Damien Metzger ecf59957ba [-] FO : fixed pdf template #PSCFV-9430 2013-06-13 11:18:03 +02:00
Damien Metzger babfbaa2d2 // Added missing space in installer 2013-06-13 11:00:01 +02:00
Damien Metzger d6b884b7b5 [-] MO : removed doubled "/" in homeslider template #PSCFV-9439 2013-06-13 10:34:35 +02:00
Damien Metzger e4535e892d [-] MO : fixed editorial issue when the entity does not exist yet for a shop #PSCFV-9442 2013-06-13 10:31:39 +02:00
Damien Metzger a4e6ddf29c [*] MO : blocklayered optimization 2013-06-13 09:42:34 +02:00
Damien Metzger b401ceb9d9 [-] MO : do not truncate order return state in pscleaner #PSCFV-9431 2013-06-13 08:57:31 +02:00
Rémi Gaillard 5d6d06f8fb [-] BO: Fix #PSCFV-9428 features duplicated with multishop on Feature::getFeatures() 2013-06-12 18:24:14 +02:00
Rémi Gaillard 1cd9d1bb7a [-] FO: Fix shop restriction on features #PSCFV-7848 2013-06-12 17:38:46 +02:00
Rémi Gaillard b3a823f876 [-] BO: Fix #PSCFV-7763 Re-inject quantities after deleting a product from a order 2013-06-12 17:08:00 +02:00
Rémi Gaillard 91ececef1a // missing return statement 2013-06-11 12:19:04 +02:00
Rémi Gaillard 7ed9ceb593 [-] BO: Addresses are now totally deleted from the database if not used on a order 2013-06-11 12:18:05 +02:00
Rémi Gaillard f3000f6c65 [-] BO: Fix #PSCFV-6657 translations of overriden admin templates 2013-06-10 18:23:59 +02:00
Rémi Gaillard 1838003353 [-] WS: Fix #PSCFI-7009 product prices on orders with specific prices 2013-06-10 16:59:02 +02:00
Rémi Gaillard d64b5efd10 [-] WS: Fix deletion of product_features on product update #PSCFI-6740 2013-06-10 16:23:16 +02:00
Vincent Augagneur 433e9338d9 //fix notice 2013-06-10 12:16:23 +02:00
Vincent Augagneur 5ec9aa56ac //small fix 2013-06-10 12:15:11 +02:00
Vincent Augagneur 12872fea65 [-] BO - fixed bug #PSCFV-9071 - PS_SHOP_DOMAIN and PS_SHOP_DOMAIN_SSL have not updated after updated Shop domain and SSL domain from Preferences > SEO & URLs 2013-06-10 10:47:57 +02:00
Vincent Augagneur a73326bfb2 [-] FO - fixed bug #PSCFV-9075 2013-06-10 10:22:44 +02:00
Vincent Augagneur 0334f593da [-] FO : fixed bug #PSCFV-9092 - conflict on the company field during account creation 2013-06-10 10:10:56 +02:00
sLorenzini 2f40c3126b [-] FO: fixed w3c errors 2013-06-07 18:08:29 +02:00
Damien Metzger d441725ccd // Small improvement on pscleaner 2013-06-07 18:02:08 +02:00
sLorenzini b5748e8a46 [-] FO: solved some W3C errors 2013-06-07 17:49:24 +02:00
Vincent Augagneur 3d614ca8ea [-] CORE : fixed bug #PSCFV-9121 - virtual product does not have link after upgrade - part 2 2013-06-07 16:41:33 +02:00
Vincent Augagneur 35d9d9d979 [-] CORE : fixed bug #PSCFV-9121 - virtual product does not have link after upgrade 2013-06-07 16:40:37 +02:00
sLorenzini 06af6bdfb5 [-] FO: some W3C errors corrected 2013-06-07 16:30:45 +02:00
Damien Metzger 90530a10f4 [-] MO : loyalty small smarty fix #PNM-1305 2013-06-07 16:01:43 +02:00
Damien Metzger 26608cea48 [-] MO : Fixed double creation of vouchers in loyalty and some redirections #PNM-1317 2013-06-07 15:52:56 +02:00
Rémi Gaillard 1688c7b0e6 [-] FO: Fix no image displayed for products in the cart when it was added from another store in multishop #PSCFV-9385 2013-06-07 15:37:38 +02:00
Damien Metzger aa41d6b762 // No escape in JS links 2013-06-07 12:33:44 +02:00
Damien Metzger 0e75dbdbf8 [*] BO : attributes taken into account for the language entity in the localization packs 2013-06-06 18:53:51 +02:00
Rémi Gaillard b51641ca49 [-] WS: Fix memory leak when getting synopsis 2013-06-06 16:59:03 +02:00
Damien Metzger 6222974430 // W3C 2013-06-06 15:48:46 +02:00
Damien Metzger ca64179950 // W3C 2013-06-06 15:27:29 +02:00
gRoussac beab13e966 // revert from Merge pull request #458 from runningz https://github.com/runningz/PrestaShop/commit/040ff3396ac32a1cc35d4d2464e8d36486cac418 2013-06-06 11:24:21 +02:00
gRoussac e5e93a6100 [-] FO : Report of #PSCFI-7240 typos in cms.tpl 2013-06-06 10:39:03 +02:00
gRoussac 3b23558ebb [-] MO : Report of #PNM-1413 when alert already set on default combination 2013-06-06 10:25:41 +02:00
gRoussac 81e8d76d31 // revert 2013-06-06 10:15:40 +02:00
gRoussac 896658633e [*] MO : Followup https://github.com/runningz/PrestaShop/commit/040ff3396ac32a1cc35d4d2464e8d36486cac418 2013-06-06 10:07:48 +02:00
Damien Metzger 83d3bed712 Merge pull request #478 from djfm/development 
[*] LO : Fix PSCFV-9330 (decimals=2)
 2013-06-05 06:56:07 -07:00
Francois Gaillard 73a372bab2 // Disable autocomplete on radio button in installer, error fixed with Chrome browser 2013-06-05 10:41:46 +02:00
Rémi Gaillard ba1c4b9f3a [-] FO: http page should be redirected to http when accessed with https #PSCFV-9212 2013-06-04 16:27:47 +02:00
Vincent Augagneur 23afba3c59 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-04 16:14:45 +02:00
Vincent Augagneur 5ec36dac88 [-] MO - fixed bug #PSCFV-9111 - Mailalert emails do not follow the new {color} 2013-06-04 16:14:34 +02:00