Commit Graph
8984 Commits
Author SHA1 Message Date
Rémi Gaillard 6cad7c2bf4 // Fix PHP notice #PSCFV-5967 2012-12-04 14:33:12 +01:00
Rémi Gaillard e568e0992d [-] WS: #PSCFV-5982 logo email/invoices/mail don't return standard logo if not exists 2012-12-04 11:56:17 +01:00
Rémi Gaillard b80bc2a6ba [-] WS: Fix #PSCFV-5981 logo path 2012-12-04 11:52:04 +01:00
Rémi Gaillard 7d05a6d8e9 [-] BO: Fix #PSCFV-4889 don't delete product if physical stock > 0 2012-12-04 11:38:47 +01:00
Rémi Gaillard e5ec07f95a [-] BO: Add display of modules errors on reset #PSCFV-2077 2012-12-04 11:13:06 +01:00
vAugagneur 3510cc03ab //small html fix 2012-12-04 11:07:56 +01:00
Vincent Augagneur 640c0202dd Merge pull request #63 from Ha99y/blockcms-fix
[*] FO - Update modules/blockcms/blockcms.tpl
2012-12-04 01:37:32 -08:00
Rémi Gaillard 7d9057a476 // Fix PHP warning 2012-12-03 19:11:37 +01:00
Rémi Gaillard d42172e6f8 [-] BO: Fix #PSCFV-5706 save of product availability on global context 2012-12-03 17:53:47 +01:00
Rémi Gaillard 6ddd3a03bb [-] Core: Fix isDate validator 2012-12-03 16:52:22 +01:00
Rémi Gaillard 0f3bbaf65c [-] Core: Fix date validator #PSCFV-5797 2012-12-03 16:12:08 +01:00
Jonathan Danse edd6bf7b7e [+] Project: add the possibility to change the default color (#db3484)
Let the user set the default color in the mail with a color picker (configuration set in Back Office, Themes)
2012-12-03 16:11:43 +01:00
vAugagneur c6d5d6a95b //small js fix 2012-12-03 15:55:46 +01:00
vAugagneur f278ab5bd8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-03 15:23:40 +01:00
vAugagneur f6b1e86449 [-] BO : fixed bug when toggle status on product listing, redirect_type was not good 2012-12-03 15:23:25 +01:00
Rémi Gaillard 38044ad2cf [-] BO: Fix #PSCFV-5345 quotes in translations of languages packs imported 2012-12-03 15:03:32 +01:00
vAugagneur 6a4100687f //small fix with js on product page 2012-12-03 14:47:38 +01:00
vAugagneur 13ebd3afef Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-03 14:14:54 +01:00
vAugagneur ed3e0e1a58 [+] CORE : now you can choose the redirect option when your product is disable 2012-12-03 14:13:50 +01:00
Rémi Gaillard 428c1fa99b [-] BO: Fix #PSCFV-5332 wrong rights on folder after uploading image 2012-12-03 12:26:27 +01:00
Rémi Gaillard 4a106e51bb [-] BO: Fix category association in global context #PSCFV-5551 2012-12-03 11:25:59 +01:00
Rémi Gaillard 088cb759f0 [-] FO: js was missing on order follow #PSCFV-5441 2012-12-03 10:44:32 +01:00
Sarah Lorenzini 936817999c [-] FO: fix CSS / formatting needed on blocks - #PSCFV-3013 2012-12-03 10:25:35 +01:00
vAugagneur 12cb5316ee //remove debug 2012-12-02 20:05:39 +01:00
vAugagneur 2d30a966c3 [*] FO : improve SEO and http error code 2012-12-02 19:46:09 +01:00
Ha!*!*y c0fedd3c16 Update modules/blockcms/blockcms.tpl
remove blockpermanentlinks and ID header_link_sitemap

https://github.com/PrestaShop/PrestaShop/pull/11
2012-12-01 22:09:00 -08:00
Sarah Lorenzini c8ce3749ec [-] FO: fix Add to cart button needs some changes in its css code - #PSCFV-5933 2012-11-30 16:30:34 +01:00
Vincent Augagneur 84763df3de Merge pull request #45 from PrestaEdit/PSCFV-5442
[-] FO : Fixed bug #PSCFV-5442: rss and &amp problem
2012-11-30 02:57:06 -08:00
Vincent Augagneur 539011c057 Merge pull request #55 from PrestaEdit/mobile_logo
[+] FO: Mobile logo
2012-11-30 02:06:19 -08:00
Vincent Augagneur 4276af150e Merge pull request #40 from Milow/development
[-] FO : Fix css errors, clean up javascript
2012-11-30 02:02:42 -08:00
vAugagneur 2668323c6b //updated CONTRIBUTORS.md thanks @all 2012-11-30 10:54:08 +01:00
vAugagneur b8e93d8c44 //small cookie expire fix 2012-11-30 09:35:42 +01:00
PrestaEdit 1286cd3a89 Merge pull request #1 from PrestaEdit/mobile
[-] FO : show mobile theme if you have click "Broswe the mobile site" on...
2012-11-29 13:01:22 -08:00
PrestaEdit 99b97d9bb7 [*] FO: use initLogoAndFavicon() function 2012-11-29 21:57:04 +01:00
PrestaEdit f7b40b24b9 [*] FO: add initLogoAndFavicon() 2012-11-29 21:56:03 +01:00
vAugagneur 7edd3555eb [-] MO : fixed bug #PSCFV-5396 - Notices when ordering categories with layered navigation module 2012-11-29 18:51:22 +01:00
vAugagneur dbda08099a //wrong define unsing _MAIL_DIR_ instead of _PS_MAIL_DIR_ 2012-11-29 18:44:51 +01:00
vAugagneur 639590c535 //remove comment 2012-11-29 18:36:18 +01:00
vAugagneur 24d2e87e8e [-] FO : fixed bug #PSCFV-5563 - address can't be changed when making an order as a guest 2012-11-29 18:35:05 +01:00
vAugagneur c8d63a7819 [-] BO : fixed bug #PSCFV-5501 - Can't edit Guest AccountAddress in Custumer -> Addresses 2012-11-29 18:16:56 +01:00
vAugagneur 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 2012-11-29 18:06:34 +01:00
Rémi Gaillard 4188bb5f58 [-] FO: Don't display categories in breadcrumb if there are not associated to the shop 2012-11-29 18:01:39 +01:00
Vincent Augagneur b13f3b0344 Merge pull request #42 from PrestaEdit/PSCFV-5766
[-] FO : fixed bug #PSCFV-5766 - Truncate smarty_modifier_truncate $etc param is not taken
2012-11-29 08:30:57 -08:00
vAugagneur 2bddec6089 //small fix in Context::getMobileDevice() 2012-11-29 17:20:18 +01:00
Rémi Gaillard 671b11b84c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-11-29 16:29:03 +01:00
Rémi Gaillard 0e4bf800c6 [-] Module: Mailalert should not send email to employee if stock management is disabled #PSCFV-5841 2012-11-29 16:28:18 +01:00
Vincent Augagneur ee941d2c58 Merge pull request #56 from damonsk/patch2
[-] FO : Removed ID from repeating product rows in shopping cart table.
2012-11-29 07:14:43 -08:00
Vincent Augagneur ce58891b02 Merge pull request #54 from PrestaEdit/mobile
[-] FO : show mobile theme if you have click "Broswe the mobile site"
2012-11-29 07:13:29 -08:00
Damon Skelhorn edfe048a58 Additional instance and removed inline style since CSS present in global.css 2012-11-29 14:43:38 +00:00
Vincent Augagneur 3b63713cdd Merge pull request #3 from damonsk/development
[-] FO : fixed bug #PSCFV-5637 - Order reference (string) if passed in from a 1.4 theme...
2012-11-29 06:15:56 -08:00