dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,989 Commits 9 Branches 19 Tags
0af76e01fb303fa6eeb7ee7a78755d2bc8dfd708
Commit Graph

2908 Commits

Author SHA1 Message Date
vAugagneur
07c03ecf6d //blockcategories is now using bootstrap design 2013-09-20 11:18:30 +02:00
Fabio Chelly
4f639329e9 Merge remote-tracking branch 'origin/development' into development 2013-09-20 10:47:17 +02:00
Fabio Chelly
91ae972655 [-] MO mailalert : products alerts can be registered for multiple guests 
#PNM-1669
 2013-09-20 10:46:56 +02:00
Damien Metzger
f8ca06d927 // Better cache depth management for smarty 2013-09-20 10:26:58 +02:00
Damien Metzger
33405ed858 // Rollback file wrongly modified by previous commit 2013-09-19 17:57:29 +02:00
Damien Metzger
cda7b225e2 // Removed deprecated module 2013-09-19 17:57:29 +02:00
Francois Gaillard
8c6aaa3c7d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-19 17:31:42 +02:00
Francois Gaillard
63f4743134 [-] MO : PNM-1715 - Bug fix accented chars & ajax-cart 2013-09-19 17:31:35 +02:00
Vincent Augagneur
97cff2210f //removed unused code 2013-09-19 17:01:20 +02:00
Vincent Augagneur
53e046c4b5 //removed unused code 2013-09-19 17:00:50 +02:00
Vincent Augagneur
2b2b502ba2 //blockbestsellers && bankwire now use displayError & displayConfirmation 2013-09-19 16:55:04 +02:00
Vincent Augagneur
a5642d43a3 //blockbestsellers module configuration is now using bootstrap design 2013-09-19 16:47:51 +02:00
Vincent Augagneur
ef063db2f0 //bankwire module configuration is now using bootstrap design 2013-09-19 16:39:22 +02:00
Sarah Lorenzini
5621a3b039 // update tabs stats 2013-09-18 17:47:42 +02:00
Francois Gaillard
6e0be0c226 Dashboard - Fixed last day trend 2013-09-18 17:28:04 +02:00
gRoussac
3aec242600 [-] MO : Editorial could not delete image 2013-09-18 16:16:36 +02:00
Sarah Lorenzini
bdb797a66c // update tabs stats 2013-09-17 17:49:49 +02:00
Damien Metzger
f7855f2a3a // Always more KPIs 2013-09-17 12:47:13 +02:00
Damien Metzger
70f284ad88 [+] BO : new graph engine nvd3 (still need some development - will replace the other engines) 2013-09-17 10:24:46 +02:00
Sarah Lorenzini
4ef7bd0b77 // update stats tab 2013-09-16 17:51:03 +02:00
Sarah Lorenzini
9dfb573422 // update stats tab 2013-09-16 15:46:21 +02:00
Vincent Augagneur
636c4575f7 //added warning domaine on dashboard && prestashop news improve 2013-09-16 10:59:42 +02:00
Julien
08373c0541 [+] Modules : add hookHome 2013-09-14 14:57:00 +02:00
Kevin Granger
c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
 2013-09-13 11:41:14 +02:00
Damien Metzger
d914982961 // Rounded sales on dashboard 2013-09-12 19:26:38 +02:00
Damien Metzger
f20a3eb9b5 // Fixed most viewed conversion rate 2013-09-12 18:24:18 +02:00
Damien Metzger
26babfc8f9 // Binded most viewed products on analytics 2013-09-12 18:24:17 +02:00
Damien Metzger
481dc3d307 // Dashboard is almost complete 2013-09-12 18:24:17 +02:00
Damien Metzger
278cd952e2 // Gapi choose between 1.3 and 3.0 versions 2013-09-12 18:24:17 +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
Vincent Augagneur
6fa398e8e0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-12 10:08:32 +02:00
Vincent Augagneur
38822bfb5e //dashactivity configuration 2013-09-12 10:08:28 +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
Prestaspirit
a37033e478 [-] MO : Fixed a bug when displaying textures 
Corrections links texture image in the blocklayered
 2013-09-12 07:01:55 +02:00
Damien Metzger
739d1434b5 // Small fix 2013-09-11 17:02:44 +02:00
Damien Metzger
ddd7ed2d2b // Connected traffic sources to analytics (dashboard) 2013-09-11 16:43:24 +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
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
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
unknown
c5afbc75bd [-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691 2013-09-10 12:01:38 +02:00
Nicolas Sorosac
f30a088848 [*] MO : MailAlerts : Add SQL update script for v2.5 2013-09-10 11:01:11 +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
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