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
Jerome Nadaud
e91460b8fe
[-] BO : Change Nested categories
2013-09-09 18:58:32 +02:00
Jerome Nadaud
4e8658f1d6
[+] BO : Helper Tree js improvement
2013-09-09 18:57:42 +02:00
Vincent Augagneur
b6e0583af8
//added security check on dashboard
2013-09-09 18:47:15 +02:00
Vincent Augagneur
4e1a513371
//added rss and useful link on dashboard
2013-09-09 18:44:34 +02:00
Kevin Granger
69b38f4d6f
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/products/helpers/tree/tree.tpl
admin-dev/themes/default/template/controllers/products/helpers/tree/tree_header.tpl
2013-09-09 18:13:49 +02:00
Kevin Granger
7774e46cb3
// tree view product
2013-09-09 18:12:31 +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
Jerome Nadaud
7bb295b076
//
2013-09-09 16:21:32 +02:00
gRoussac
e6d0a3e5a4
// revert form https://github.com/PrestaShop/PrestaShop/commit/2874f1498352228c84df969c42e9d8f699a8afc5
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
Vincent Augagneur
c18dea7296
//carrier wizard fix - bootstrap compatibility
2013-09-09 14:14:57 +02:00
Jerome Nadaud
accd2d77c1
[+] BO : Adding tree templates and functions
2013-09-09 12:20:58 +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
Jerome Nadaud
b5f6e8a1d8
[+] BO : Add "tree-selected" class to tree.js
2013-09-09 12:10:26 +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
gRoussac
b975a9375c
[-] IN : remove warnings while upgrading
2013-09-09 00:10:03 +02:00
gRoussac
9c756a7fcb
[-] IN : Do not duplicate images types when coming from 1.4, update it
2013-09-08 23:22:36 +02:00
Vincent Augagneur