Commit Graph

Select branches

Hide Pull Requests

1.5

1.6

bootstrap

carrierwizard

development

export_excel

ignore_stock_without_combination

master

patch-1

1.5.0.0

1.5.0.1

1.5.0.13

1.5.0.15

1.5.0.17

1.5.0.2

1.5.0.3

1.5.0.5

1.5.0.9

1.5.1.0

1.5.2.0

1.5.3.0

1.5.3.1

1.5.4.0

1.5.4.1

1.5.5.0

1.5.6.0

1.5.6.1

1.6.0.1

Mono Color

• b414bd06a4 [-] Core: Fix #PSCFV-5966 the tax rate applied to shipping cost for the visitors was the product tax rate Rémi Gaillard 2012-12-04 15:09:41 +01:00
• 6cad7c2bf4 // Fix PHP notice #PSCFV-5967 Rémi Gaillard 2012-12-04 14:33:12 +01:00
• a4b6594f9c // Fix PHP notice #PSCFV-5967 Rémi Gaillard 2012-12-04 14:33:12 +01:00
• e568e0992d [-] WS: #PSCFV-5982 logo email/invoices/mail don't return standard logo if not exists Rémi Gaillard 2012-12-04 11:56:17 +01:00
• e70069bdfa [-] WS: #PSCFV-5982 logo email/invoices/mail don't return standard logo if not exists Rémi Gaillard 2012-12-04 11:56:17 +01:00
• b80bc2a6ba [-] WS: Fix #PSCFV-5981 logo path Rémi Gaillard 2012-12-04 11:52:04 +01:00
• aac0500c72 [-] WS: Fix #PSCFV-5981 logo path Rémi Gaillard 2012-12-04 11:52:04 +01:00
• 7d05a6d8e9 [-] BO: Fix #PSCFV-4889 don't delete product if physical stock > 0 Rémi Gaillard 2012-12-04 11:38:47 +01:00
• 69fbd79eee [-] BO: Fix #PSCFV-4889 don't delete product if physical stock > 0 Rémi Gaillard 2012-12-04 11:38:47 +01:00
• e5ec07f95a [-] BO: Add display of modules errors on reset #PSCFV-2077 Rémi Gaillard 2012-12-04 11:13:06 +01:00
• 6e87020ddf [-] BO: Add display of modules errors on reset #PSCFV-2077 Rémi Gaillard 2012-12-04 11:13:06 +01:00
• 3510cc03ab //small html fix vAugagneur 2012-12-04 11:07:56 +01:00
• 8baa2b34b8 //small html fix vAugagneur 2012-12-04 11:07:56 +01:00
• 640c0202dd Merge pull request #63 from Ha99y/blockcms-fix Vincent Augagneur 2012-12-04 01:37:32 -08:00
• 85daf29f87 Merge pull request #63 from Ha99y/blockcms-fix Vincent Augagneur 2012-12-04 01:37:32 -08:00
• 7d9057a476 // Fix PHP warning Rémi Gaillard 2012-12-03 19:11:37 +01:00
• 1091d82546 // Fix PHP warning Rémi Gaillard 2012-12-03 19:11:37 +01:00
• d42172e6f8 [-] BO: Fix #PSCFV-5706 save of product availability on global context Rémi Gaillard 2012-12-03 17:53:47 +01:00
• 627125e1de [-] BO: Fix #PSCFV-5706 save of product availability on global context Rémi Gaillard 2012-12-03 17:53:47 +01:00
• 6ddd3a03bb [-] Core: Fix isDate validator Rémi Gaillard 2012-12-03 16:52:22 +01:00
• f8365220e2 [-] Core: Fix isDate validator Rémi Gaillard 2012-12-03 16:52:22 +01:00
• 0f3bbaf65c [-] Core: Fix date validator #PSCFV-5797 Rémi Gaillard 2012-12-03 16:12:08 +01:00
• a3c28f3ace [-] Core: Fix date validator #PSCFV-5797 Rémi Gaillard 2012-12-03 16:12:08 +01:00
• edd6bf7b7e [+] Project: add the possibility to change the default color (#db3484) Jonathan Danse 2012-12-03 16:11:43 +01:00
• a88b23b16f [+] Project: add the possibility to change the default color (#db3484) Jonathan Danse 2012-12-03 16:11:43 +01:00
• c6d5d6a95b //small js fix vAugagneur 2012-12-03 15:55:46 +01:00
• b1706d47eb //small js fix vAugagneur 2012-12-03 15:55:46 +01:00
• f278ab5bd8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-03 15:23:40 +01:00
• 9875e5581c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-03 15:23:40 +01:00
• f6b1e86449 [-] BO : fixed bug when toggle status on product listing, redirect_type was not good vAugagneur 2012-12-03 15:23:25 +01:00
• c769a2599c [-] BO : fixed bug when toggle status on product listing, redirect_type was not good vAugagneur 2012-12-03 15:23:25 +01:00
• 38044ad2cf [-] BO: Fix #PSCFV-5345 quotes in translations of languages packs imported Rémi Gaillard 2012-12-03 15:03:32 +01:00
• 769f5e7a64 [-] BO: Fix #PSCFV-5345 quotes in translations of languages packs imported Rémi Gaillard 2012-12-03 15:03:32 +01:00
• 6a4100687f //small fix with js on product page vAugagneur 2012-12-03 14:47:38 +01:00
• 51d8ef576b //small fix with js on product page vAugagneur 2012-12-03 14:47:38 +01:00
• 13ebd3afef Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-03 14:14:54 +01:00
• c2f31109e4 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-03 14:14:54 +01:00
• ed3e0e1a58 [+] CORE : now you can choose the redirect option when your product is disable vAugagneur 2012-12-03 14:13:50 +01:00
• 2195f9bdcb [+] CORE : now you can choose the redirect option when your product is disable vAugagneur 2012-12-03 14:13:50 +01:00
• 428c1fa99b [-] BO: Fix #PSCFV-5332 wrong rights on folder after uploading image Rémi Gaillard 2012-12-03 12:26:27 +01:00
• 4a94d54f6d [-] BO: Fix #PSCFV-5332 wrong rights on folder after uploading image Rémi Gaillard 2012-12-03 12:26:27 +01:00
• 4a106e51bb [-] BO: Fix category association in global context #PSCFV-5551 Rémi Gaillard 2012-12-03 11:25:59 +01:00
• c73be7904a [-] BO: Fix category association in global context #PSCFV-5551 Rémi Gaillard 2012-12-03 11:25:59 +01:00
• 088cb759f0 [-] FO: js was missing on order follow #PSCFV-5441 Rémi Gaillard 2012-12-03 10:44:32 +01:00
• 5b9f6dffc9 [-] FO: js was missing on order follow #PSCFV-5441 Rémi Gaillard 2012-12-03 10:44:32 +01:00
• 936817999c [-] FO: fix CSS / formatting needed on blocks - #PSCFV-3013 Sarah Lorenzini 2012-12-03 10:25:35 +01:00
• 585d7ddbab [-] FO: fix CSS / formatting needed on blocks - #PSCFV-3013 Sarah Lorenzini 2012-12-03 10:25:35 +01:00
• 12cb5316ee //remove debug vAugagneur 2012-12-02 20:05:39 +01:00
• 0de7579f58 //remove debug vAugagneur 2012-12-02 20:05:39 +01:00
• 2d30a966c3 [*] FO : improve SEO and http error code vAugagneur 2012-12-02 19:46:09 +01:00
• 49e1a536e3 [*] FO : improve SEO and http error code vAugagneur 2012-12-02 19:46:09 +01:00
• c0fedd3c16 Update modules/blockcms/blockcms.tpl Ha!*!*y 2012-12-01 22:09:00 -08:00
• 2a11d0c9b6 Update modules/blockcms/blockcms.tpl Ha!*!*y 2012-12-01 22:09:00 -08:00
• c8ce3749ec [-] FO: fix Add to cart button needs some changes in its css code - #PSCFV-5933 Sarah Lorenzini 2012-11-30 16:30:34 +01:00
• 22d92a6d3a [-] FO: fix Add to cart button needs some changes in its css code - #PSCFV-5933 Sarah Lorenzini 2012-11-30 16:30:34 +01:00
• 84763df3de Merge pull request #45 from PrestaEdit/PSCFV-5442 Vincent Augagneur 2012-11-30 02:57:06 -08:00
• bf08de2c3b Merge pull request #45 from PrestaEdit/PSCFV-5442 Vincent Augagneur 2012-11-30 02:57:06 -08:00
• 539011c057 Merge pull request #55 from PrestaEdit/mobile_logo Vincent Augagneur 2012-11-30 02:06:19 -08:00
• 7c04885560 Merge pull request #55 from PrestaEdit/mobile_logo Vincent Augagneur 2012-11-30 02:06:19 -08:00
• 4276af150e Merge pull request #40 from Milow/development Vincent Augagneur 2012-11-30 02:02:42 -08:00
• 66108a770b Merge pull request #40 from Milow/development Vincent Augagneur 2012-11-30 02:02:42 -08:00
• e36548ad3c //updated CONTRIBUTING.md & CONTRIBUTORS.md thanks to @all vAugagneur 2012-11-30 10:56:18 +01:00
• 2668323c6b //updated CONTRIBUTORS.md thanks @all vAugagneur 2012-11-30 10:54:08 +01:00
• c6a1e0e585 //updated CONTRIBUTORS.md thanks @all vAugagneur 2012-11-30 10:54:08 +01:00
• b8e93d8c44 //small cookie expire fix vAugagneur 2012-11-30 09:35:42 +01:00
• f1b36279cf //small cookie expire fix vAugagneur 2012-11-30 09:35:42 +01:00
• 1286cd3a89 Merge pull request #1 from PrestaEdit/mobile PrestaEdit 2012-11-29 13:01:22 -08:00
• 68c3f18f16 Merge pull request #1 from PrestaEdit/mobile PrestaEdit 2012-11-29 13:01:22 -08:00
• 99b97d9bb7 [*] FO: use initLogoAndFavicon() function PrestaEdit 2012-11-29 21:57:04 +01:00
• 291431fc49 [*] FO: use initLogoAndFavicon() function PrestaEdit 2012-11-29 21:57:04 +01:00
• f7b40b24b9 [*] FO: add initLogoAndFavicon() PrestaEdit 2012-11-29 21:56:03 +01:00
• b433db02b1 [*] FO: add initLogoAndFavicon() PrestaEdit 2012-11-29 21:56:03 +01:00
• 7edd3555eb [-] MO : fixed bug #PSCFV-5396 - Notices when ordering categories with layered navigation module vAugagneur 2012-11-29 18:51:22 +01:00
• 91a31bf556 [-] MO : fixed bug #PSCFV-5396 - Notices when ordering categories with layered navigation module vAugagneur 2012-11-29 18:51:22 +01:00
• dbda08099a //wrong define unsing _MAIL_DIR_ instead of _PS_MAIL_DIR_ vAugagneur 2012-11-29 18:44:51 +01:00
• ab66251968 //wrong define unsing _MAIL_DIR_ instead of _PS_MAIL_DIR_ vAugagneur 2012-11-29 18:44:51 +01:00
• 639590c535 //remove comment vAugagneur 2012-11-29 18:36:18 +01:00
• 6f33a9dd54 //remove comment vAugagneur 2012-11-29 18:36:18 +01:00
• 24d2e87e8e [-] FO : fixed bug #PSCFV-5563 - address can't be changed when making an order as a guest vAugagneur 2012-11-29 18:35:05 +01:00
• 035d7b7421 [-] FO : fixed bug #PSCFV-5563 - address can't be changed when making an order as a guest vAugagneur 2012-11-29 18:35:05 +01:00
• c8d63a7819 [-] BO : fixed bug #PSCFV-5501 - Can't edit Guest AccountAddress in Custumer -> Addresses vAugagneur 2012-11-29 18:16:56 +01:00
• f563e12912 [-] BO : fixed bug #PSCFV-5501 - Can't edit Guest AccountAddress in Custumer -> Addresses vAugagneur 2012-11-29 18:16:56 +01:00
• 317938d883 [-] FO : fixed bug #PSCFV-5776 - Converting a guest account via GuestTrackingController allows empty passwords, warns of an invalid password but DOES convert the account vAugagneur 2012-11-29 18:06:34 +01:00
• 65e6264a0a [-] FO : fixed bug #PSCFV-5776 - Converting a guest account via GuestTrackingController allows empty passwords, warns of an invalid password but DOES convert the account vAugagneur 2012-11-29 18:06:34 +01:00
• 4188bb5f58 [-] FO: Don't display categories in breadcrumb if there are not associated to the shop Rémi Gaillard 2012-11-29 18:01:39 +01:00
• deb5adb6f4 [-] FO: Don't display categories in breadcrumb if there are not associated to the shop Rémi Gaillard 2012-11-29 18:01:39 +01:00
• b13f3b0344 Merge pull request #42 from PrestaEdit/PSCFV-5766 Vincent Augagneur 2012-11-29 08:30:57 -08:00
• a9bc9481dd Merge pull request #42 from PrestaEdit/PSCFV-5766 Vincent Augagneur 2012-11-29 08:30:57 -08:00
• 2bddec6089 //small fix in Context::getMobileDevice() vAugagneur 2012-11-29 17:20:18 +01:00
• f6c8af26cc //small fix in Context::getMobileDevice() vAugagneur 2012-11-29 17:20:18 +01:00
• 671b11b84c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2012-11-29 16:29:03 +01:00
• 0155b69592 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2012-11-29 16:29:03 +01:00
• 0e4bf800c6 [-] Module: Mailalert should not send email to employee if stock management is disabled #PSCFV-5841 Rémi Gaillard 2012-11-29 16:28:18 +01:00
• a1ad0d29e8 [-] Module: Mailalert should not send email to employee if stock management is disabled #PSCFV-5841 Rémi Gaillard 2012-11-29 16:28:18 +01:00
• ee941d2c58 Merge pull request #56 from damonsk/patch2 Vincent Augagneur 2012-11-29 07:14:43 -08:00
• 7bcc7dcddc Merge pull request #56 from damonsk/patch2 Vincent Augagneur 2012-11-29 07:14:43 -08:00
• ce58891b02 Merge pull request #54 from PrestaEdit/mobile Vincent Augagneur 2012-11-29 07:13:29 -08:00
• 5199b81b50 Merge pull request #54 from PrestaEdit/mobile Vincent Augagneur 2012-11-29 07:13:29 -08:00
• edfe048a58 Additional instance and removed inline style since CSS present in global.css Damon Skelhorn 2012-11-29 14:43:38 +00:00
• 37edf2c9b6 Additional instance and removed inline style since CSS present in global.css Damon Skelhorn 2012-11-29 14:43:38 +00:00