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

2773 Commits

Author SHA1 Message Date
Rémi Gaillard 7e6728b342 // small changes 2013-02-19 15:02:09 +01:00
Damien Metzger 28e8653e9c [-] FO : Fixed regexp for images embbed in description 2013-02-18 16:17:05 +01:00
Damien Metzger d811f74d6c // Fixed fatal error 2013-02-18 16:17:05 +01:00
Damien Metzger 4479aa7c41 // Added information 2013-02-18 16:17:04 +01:00
Rémi Gaillard 7c26ea32e7 [-] BO: Fix #PSCFV-7851 - shop logo and name should depend of the order shop and from the context 2013-02-18 15:43:37 +01:00
Rémi Gaillard 08f5a01bd8 [-] BO: Fix #PSCFV-7646 JS error when adding a product existing in an other shop 2013-02-18 15:29:48 +01:00
Rémi Gaillard 4da97fe62e [-] BO: Fix #PSCFV-7730 update the multishop fields in adminproducts on default shop if context is all and if product is not associated to all shops 2013-02-15 17:25:53 +01:00
vAugagneur 70f4142fbd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-15 11:33:06 +01:00
vAugagneur 505bea4cef [-] BO : fixed bug #PSCFV-7551 - wrong breadcrumb when create root category 2013-02-15 11:33:00 +01:00
Rémi Gaillard ee9e0b6380 // display image against standard error page for 404 on images 2013-02-14 16:44:50 +01:00
Rémi Gaillard f137de9613 [*] BO: store filter by category in admin products 2013-02-14 14:51:51 +01:00
Damien Metzger f4f6055bc3 [-] FO : deprecated free_shipping var set to "false" 2013-02-14 10:32:21 +01:00
Damien Metzger 849c2da9eb [*] BO : the option for accented URLs is now available in the backend 2013-02-14 09:15:01 +01:00
Rémi Gaillard 2c2f4170bb // something was missing 2013-02-13 16:17:10 +01:00
Rémi Gaillard 9dcb75e572 [*] BO: you can now export listing of some tabs in CSV 2013-02-13 16:15:37 +01:00
Rémi Gaillard 2671b43dbd // List only module categories which contains at least 1 module 2013-02-13 11:26:18 +01:00
vAugagneur fa34534654 [+] BO : added new marketing tab 2013-02-13 09:57:30 +01:00
gRoussac d9fbe89270 [-] FO : Fix Bug #PSCFV-7339 available date on product page 2013-02-12 16:40:26 +01:00
Rémi Gaillard 887092d292 [*] BO: Add an option to htaccess generator to disable mod_security (some rules reject ajax file upload) 2013-02-12 11:35:10 +01:00
Rémi Gaillard 5e5cbb0d65 // Fix SQL error 2013-02-11 18:45:00 +01:00
Rémi Gaillard 1197d9248b [-] FO: Fix PHP warning on update quantity in cart with customizables products 2013-02-11 18:04:23 +01:00
Rémi Gaillard adecde6ee1 [-] FO: don't load medias if error on product page to avoid JS bugs 2013-02-11 17:33:19 +01:00
Rémi Gaillard 9dc31dd415 [-] FO: Fix product restriction by shop 2013-02-11 15:21:54 +01:00
gRoussac 069814051d [-] FO : Fix bug #PSCFV-7491 special characters in direct search 2013-02-11 15:07:43 +01:00
gRoussac c83a0fda3f // small fix on displayError in Admincountries 2013-02-07 18:40:20 +01:00
Rémi Gaillard 90462ad746 [-] BO: Fix connection with Addons on AdminModules 2013-02-07 18:01:53 +01:00
Rémi Gaillard 40a81674ba [-] FO: Fix #PSCFV-7714 quantity discounts displaying in product page for specific customer 2013-02-07 16:57:56 +01:00
Rémi Gaillard f6d9771de8 [-] FO: Fix #PSCFV-7627 customer group reduction was applied on combinations for unidentified users on the product page 2013-02-07 16:06:32 +01:00
Rémi Gaillard 5ba95dddc9 // AdminRequestSql::returnBytes is useless 2013-02-07 14:19:08 +01:00
Rémi Gaillard 76c80680a2 [-] BO: Forbid to add a pack into a pack 2013-02-06 20:10:59 +01:00
Rémi Gaillard 08d5440c7f // something missing in the last commit 2013-02-06 15:48:16 +01:00
Rémi Gaillard fbf48fadf8 [*] BO: Improvements on customer services - you are now able to create new threads for synced emails 2013-02-06 15:28:57 +01:00
Rémi Gaillard 604602a6b6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 18:22:58 +01:00
Damien Metzger 063e6597e3 [-] FO : you need to execute CartRule::autoAddToCart() after CartRule::autoRemoveFromCart(), everytime #PSCFV-7674 2013-02-05 18:19:22 +01:00
Damien Metzger 38cc7103fb // Fixed conversion commar/dot for floating value in CSV import 2013-02-05 18:09:32 +01:00
Damien Metzger 2df3e7ee8b // Cannot import in a shop that does not exists 2013-02-05 18:09:32 +01:00
Rémi Gaillard 4fe6006e20 [-] BO: Forbid to delete the defaults return statuses 2013-02-05 17:04:17 +01:00
Rémi Gaillard 61265e587f [-] BO: Fix error message for new language creation and iso code not exists 2013-02-05 16:33:29 +01:00
Rémi Gaillard d2ba246a08 [-] BO: Don't display delete icon for order carts 2013-02-05 15:28:09 +01:00
Rémi Gaillard 0836efb02f [-] BO: Not allow to give an existing email when editing an employee 2013-02-05 12:20:46 +01:00
vAugagneur 3f8fce6720 [-] TR : now you can use " or ' in tpl files 2013-02-05 10:59:29 +01:00
Vincent Augagneur fdf5a4c3e1 Merge pull request #129 from PrestaEdit/Forum-#213412 
[-] BO: don't have the delivery PDF - User can define which statuses sho...
 2013-02-05 00:59:48 -08:00
vAugagneur 4ef61eb8f8 [-] BO : error message on install module 2013-02-05 09:41:34 +01:00
vAugagneur b23aa76d6b Merge branch 'dispatch_modules' into development 2013-02-04 18:20:24 +01:00
vAugagneur 0de5c242ca [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
Rémi Gaillard 1dbf4855cc [-] BO: Fix id_shop for configuration variables in global context for orders 2013-02-04 16:05:01 +01:00
Rémi Gaillard 7bd44ca1b1 [-] BO: get the invoice prefix from the right shop 2013-02-04 15:11:29 +01:00
Rémi Gaillard d6bd352844 // Fix PHP Notice 2013-02-04 14:46:55 +01:00
Damien Metzger 2ab51816d4 [-] FO : fixed retro compatibility issue with discounts #PSCFV-7553 2013-02-04 11:53:06 +01:00
Damien Metzger ad7cd0b467 Merge pull request #188 from PrestaEdit/patch-11 
[*] BO : use the employee lang
 2013-02-01 10:43:57 -08:00