Francois Gaillard
cc36eb2d27
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-12 14:32:22 +02:00
Francois Gaillard
53c1e56c51
[-] BO : Bug fix - Encoding & tips of the day
2013-09-12 14:32:02 +02:00
Gregory Roussac
8590b0e699
Merge pull request #716 from romainberger/typos
...
[*] FO : removed extra slash and point
2013-09-12 05:30:36 -07:00
romainberger
876be3b452
[*] FO : removed extra slash and point
2013-09-12 14:07:45 +02:00
gRoussac
e5276ff531
[-] FO : 301 Redirect /iso_lang to /iso_lang/ url
2013-09-12 11:16:12 +02:00
gRoussac
90091d4f2c
[-] BO : Do not copy link_rewrite from title if cms already has one
2013-09-12 10:50:04 +02:00
gRoussac
3870388e1c
Merge branch 'mailalerts_real_multishop' of https://github.com/axome/PrestaShop into axome-mailalerts_real_multishop
...
Conflicts:
modules/mailalerts/mailalerts.php
2013-09-12 10:09:25 +02:00
Rémi Gaillard
ea1bdbc849
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-12 10:01:39 +02:00
Gregory Roussac
f0297824d7
Merge pull request #709 from AgenceNetDesign/development
...
[-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691
2013-09-12 00:56:36 -07:00
Gregory Roussac
c91a86740f
Merge pull request #715 from Prestaspirit/patch-6
...
[-] MO : Blocklayered Fixed a bug when displaying textures
2013-09-12 00:55:28 -07:00
Prestaspirit
a37033e478
[-] MO : Fixed a bug when displaying textures
...
Corrections links texture image in the blocklayered
2013-09-12 07:01:55 +02:00
Rémi Gaillard
9fa6c86a94
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-11 20:05:13 +02:00
Rémi Gaillard
f4f3084c35
[-] Core: Set a remote addr with php-cli #PSCFV-10372
2013-09-11 16:40:33 +02:00
Rémi Gaillard
a4d131eac9
[-] WS: Fix entities retrieve for some cases
2013-09-11 16:32:11 +02:00
gRoussac
e2dac03baa
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-11 16:30:52 +02:00
gRoussac
dfdbe39ee3
[-] BO : Small changes when creating vouchers in back office orders
2013-09-11 16:28:11 +02:00
Rémi Gaillard
31c94caebc
[-] BO: Fix out of stock creation with multishop and stock sharing
2013-09-11 16:22:13 +02:00
Damien Metzger
4a3e0c5075
// Updated README.md
2013-09-11 16:11:28 +02:00
Rémi Gaillard
c42d71b8f5
// oups
2013-09-11 16:06:23 +02:00
Rémi Gaillard
669c3791b5
[-] BO: Fix preview url with multishop
2013-09-11 15:55:25 +02:00
Rémi Gaillard
3e750490fe
// chmod class_index 666 instead of 664
2013-09-11 15:16:15 +02:00
gRoussac
01be908e51
[-] CORE : Could not add several cart rules
2013-09-11 14:50:42 +02:00
gRoussac
9f12ff15be
[-] BO : Fix possible Uncaught exception 'ReflectionException' when viewing AdminMeta
2013-09-11 10:30:40 +02:00
Gregory Roussac
53805f2b93
Merge pull request #712 from Prestaworks/patch-13
...
[-] MO : Customization data is not included in new order email.
2013-09-11 00:58:30 -07:00
Daniel
614e56283a
Update mailalerts.php
...
Fixes issue where customization data is not included in new order email.
2013-09-11 10:49:34 +08:00
gRoussac
85a471a690
//bad commit , sorry for that
2013-09-10 18:51:20 +02:00
gRoussac
86d3a8afe1
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-10 18:49:05 +02:00
gRoussac
f94f0f14a4
[-] FO : Fix bug #PSCFV-8917 taxes calculation when changing delivery address
2013-09-10 18:48:28 +02:00
Gregory Roussac
31d762b88a
Merge pull request #710 from nilsga/development
...
[*] CORE : Add Bcc support in Mail class
2013-09-10 09:24:04 -07:00
Nils-Helge Garli Hegvik
9713f93075
Add Bcc support in Mail class
2013-09-10 17:11:34 +02:00
unknown
c5afbc75bd
[-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691
2013-09-10 12:01:38 +02:00
gRoussac
332d68c7ec
[-] MO : Statsdata, exception on duplicate entry
2013-09-10 11:08:57 +02:00
Nicolas Sorosac
f30a088848
[*] MO : MailAlerts : Add SQL update script for v2.5
2013-09-10 11:01:11 +02:00
Rémi Gaillard
3c090535a9
// small fix for image SSL links
2013-09-10 10:39:03 +02:00
Nicolas Sorosac
c4681c1fb1
[*] MO : MailAlerts : multishop/multilang full compatibility
...
Customers will receive alerts based on the real context of the moment they subscribed to the alert (sho, theme & language)
SQL update table : `ps_mailalert_customer_oos`
=========================================
ALTER TABLE `ps_mailalert_customer_oos`
ADD `id_lang` INT( 10 ) UNSIGNED NOT NULL ,
DROP PRIMARY KEY ,
ADD PRIMARY KEY ( `id_customer` , `customer_email` , `id_product` , `id_product_attribute` , `id_shop` ) ;
2013-09-10 10:24:40 +02:00
Rémi Gaillard
021790a3e2
[-] FO: Fix SSL links on domain_ssl instead domain
2013-09-10 10:15:52 +02:00
gRoussac
4968a792b4
[-] IN : Remove notice when upgrading from
2013-09-10 01:12:52 +02:00
Gregory Roussac
a383d55421
Merge pull request #707 from sjousse/development
...
[-] MO: ShopImporter fix imported prices
2013-09-09 08:31:15 -07:00
sjousse
00f3045690
fix imported prices
2013-09-09 17:24:27 +02:00
Gregory Roussac
5362f4d426
Merge pull request #699 from sjousse/patch-1
...
[*] MO : ShopImporter Optimize image copy in ShopImport module
2013-09-09 08:11:51 -07:00
Gregory Roussac
9880d152d4
Merge pull request #706 from sjousse/development
...
[*] MO : Add some fields to Orders in Import module
2013-09-09 08:10:12 -07:00
sjousse
990a889b1c
Add some fields to Orders in Import module
2013-09-09 17:08:17 +02:00
gRoussac
e6d0a3e5a4
// revert form 2874f14983
2013-09-09 15:11:55 +02:00
Rémi Gaillard
242556e176
[-] MO: Fix unifunc smarty errors if module is displayed on multiplehook without cache
2013-09-09 15:12:26 +02:00
Jerome Nadaud
c502c9766f
[-] BO : FixBug PSCFV-10331 - Tax rules Pagination
2013-09-09 15:04:14 +02:00
gRoussac
54f7c65165
[-] BO : Display the old image system migration tool if product images are in _PS_PROD_IMG_DIR_
2013-09-09 12:20:38 +02:00
djfm
641cf225f2
// fix small translation bug PSCFV-10329
2013-09-09 09:47:44 +00:00
djfm
6ea3783013
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-09 09:46:49 +00:00
Damien Metzger
dcad699ede
[-] FO : fixed chinese search with multiple symbols #PSCFV-10322
2013-09-09 11:19:11 +02:00
Francois Gaillard
e1d0347757
[-] Classes : Bug fix - FrontController, mobile & JS minifier fixed
2013-09-09 10:17:15 +02:00
