Prestaspirit
a37033e478
[-] MO : Fixed a bug when displaying textures
...
Corrections links texture image in the blocklayered
2013-09-12 07:01:55 +02:00
Jerome Nadaud
e9dbadcabf
// Tree
2013-09-11 20:41:14 +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
Kevin Granger
ab8d5bc265
// VT theme
2013-09-11 18:17:57 +02:00
Kevin Granger
18212420c3
// fix switch menu top // side
2013-09-11 17:26:44 +02:00
Damien Metzger
739d1434b5
// Small fix
2013-09-11 17:02:44 +02:00
Kevin Granger
99263a1492
// switch menu top // side
2013-09-11 16:56:10 +02:00
Damien Metzger
ddd7ed2d2b
// Connected traffic sources to analytics (dashboard)
2013-09-11 16:43:24 +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
Jerome Nadaud
7909a7388c
//Fix disabled categories with add parameter
2013-09-11 15:41:08 +02:00
Jerome Nadaud
617b58ba2f
//Fix Text input desc error
2013-09-11 15:40:21 +02:00
Rémi Gaillard
3e750490fe
// chmod class_index 666 instead of 664
2013-09-11 15:16:15 +02:00
Jerome Nadaud
49c9afec40
// Categories tree
2013-09-11 15:08:24 +02:00
gRoussac
01be908e51
[-] CORE : Could not add several cart rules
2013-09-11 14:50:42 +02:00
Damien Metzger
0ff6b25f56
// Fixed norm
2013-09-11 14:15:56 +02:00
Damien Metzger
981ce70594
// Added realtime Analytics to the dashboard (private beta only at this time)
2013-09-11 14:07:56 +02:00
Vincent Augagneur
937ce38a1f
//added dashactivity config
2013-09-11 12:25:07 +02:00
Kevin Granger
913ee1007c
// menu top
2013-09-11 11:32:06 +02:00
Vincent Augagneur
486bb58bf6
//added dashboard widget config toggle display
2013-09-11 11:07:38 +02:00
Vincent Augagneur
3cc187a716
//dashactivity trafic source data_list & pie_chart
2013-09-11 10:34:01 +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
Kevin Granger
f29b1b3a31
// perts fix + menu top WIP
2013-09-10 20:23:06 +02: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
Jerome Nadaud
e0d33eae9e
// Categories Tree changes
2013-09-10 18:40:05 +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
Vincent Augagneur
1aba28ff6f
//typo
2013-09-10 16:42:54 +02:00
Jerome Nadaud
7990db8b0c
// Tree folders icon problem
2013-09-10 14:34:48 +02:00
Jerome Nadaud
85dc552667
// Toolbar
2013-09-10 14:08:29 +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
Kevin Granger
03d1697e19
// treeview helper
2013-09-10 09:41:39 +02:00
Damien Metzger
1d8da79507
[-] BO : fixed notifications when there is too much data
2013-09-10 09:17:54 +02:00
gRoussac
4968a792b4
[-] IN : Remove notice when upgrading from
2013-09-10 01:12:52 +02:00
Kevin Granger
2a7bc49190
// treeview
2013-09-09 19:03:38 +02:00