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
d914982961
// Rounded sales on dashboard
2013-09-12 19:26:38 +02:00
f20a3eb9b5
// Fixed most viewed conversion rate
2013-09-12 18:24:18 +02:00
26babfc8f9
// Binded most viewed products on analytics
2013-09-12 18:24:17 +02:00
481dc3d307
// Dashboard is almost complete
2013-09-12 18:24:17 +02:00
278cd952e2
// Gapi choose between 1.3 and 3.0 versions
2013-09-12 18:24:17 +02:00
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
6fa398e8e0
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-12 10:08:32 +02:00
38822bfb5e
//dashactivity configuration
2013-09-12 10:08:28 +02:00
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
a37033e478
[-] MO : Fixed a bug when displaying textures
...
Corrections links texture image in the blocklayered
2013-09-12 07:01:55 +02:00
739d1434b5
// Small fix
2013-09-11 17:02:44 +02:00
ddd7ed2d2b
// Connected traffic sources to analytics (dashboard)
2013-09-11 16:43:24 +02:00
0ff6b25f56
// Fixed norm
2013-09-11 14:15:56 +02:00
981ce70594
// Added realtime Analytics to the dashboard (private beta only at this time)
2013-09-11 14:07:56 +02:00
937ce38a1f
//added dashactivity config
2013-09-11 12:25:07 +02:00
486bb58bf6
//added dashboard widget config toggle display
2013-09-11 11:07:38 +02:00
3cc187a716
//dashactivity trafic source data_list & pie_chart
2013-09-11 10:34:01 +02:00
614e56283a
Update mailalerts.php
...
Fixes issue where customization data is not included in new order email.
2013-09-11 10:49:34 +08:00
c5afbc75bd
[-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691
2013-09-10 12:01:38 +02:00
f30a088848
[*] MO : MailAlerts : Add SQL update script for v2.5
2013-09-10 11:01:11 +02:00
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
a383d55421
Merge pull request #707 from sjousse/development
...
[-] MO: ShopImporter fix imported prices
2013-09-09 08:31:15 -07:00
00f3045690
fix imported prices
2013-09-09 17:24:27 +02:00
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
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
990a889b1c
Add some fields to Orders in Import module
2013-09-09 17:08:17 +02:00
a10b5a517f
// Added visits to chart
2013-09-06 17:56:26 +02:00
9377775eca
[-] MO productcomments :
...
- Module was broken and works now
- A message is displayed to indicate when a comment has been added.
- Error li are correctly indented
#PNM-753
#PNM-1601
#PNM-1660
#PNM-1609
#PNM-1491
#PNM-1311
#PNM-1233
#PNM-1232
#PNM-937
#PNM-775
2013-09-06 17:54:12 +02:00
8df63f256d
// Added chart data
2013-09-06 16:25:51 +02:00
663f592306
[-] MO sendtoafriend : a message is displayed whether the e-mail has been sent or not
...
#PNM-627
#PNM-1610
#PNM-1616
2013-09-06 11:40:41 +02:00
3c2a086296
//merge
2013-09-05 19:10:59 +02:00
4b2ef10dd6
//dashboard data-chart-line added
2013-09-05 19:07:49 +02:00
a7d619b208
[-] MO : fix bug #PSCFV-9906 again, bad url parsing
2013-09-05 18:39:07 +02:00
8868271c07
// push changes
2013-09-05 18:37:25 +02:00
6b080e1f02
Optimize image copy in ShopImport module
...
2 things :
- copy images to new folder structure instead of legacy one since it's a PS 1.5 branch
- don't create all sizes of images at migration, there's an Admin controller for that (Admin > Settings > Images). That's speed up the import and remove duplicate code (less code to support).
+ some cleaning of unused variables
2013-09-05 18:24:02 +02:00
e7495f3fe4
//oups
2013-09-05 17:38:17 +02:00
06b54d0519
//typo
2013-09-05 16:35:15 +02:00
e4932131f6
//small fix
2013-09-05 16:25:42 +02:00
1c88bdd24e
//dashboard widget regardless refresh
2013-09-05 11:52:18 +02:00
95c9edd87a
// Fixed Gapi v3.0 token refresh
2013-09-05 11:42:57 +02:00
2f6e0e3fae
Changed the way to get the home category (get it from Configuration table now)
2013-09-05 10:14:31 +02:00
6e3d24b567
// add push
2013-09-04 19:33:05 +02:00
114b86ed43
// Stats
2013-09-04 19:15:14 +02:00
6b2492b62c
//added data into dashproducts module
2013-09-04 18:26:58 +02:00
4d68595447
ShopImporter module is now aware of multi-shop
...
Imported categories was affected to Root category instead of a Shop's Home category.
I took the first shop home category is by default.
Maybe adding an option to choose the shop where the datas should be imported.
2013-09-04 18:26:24 +02:00
e9d066c981
fix value of date_add
2013-09-04 16:40:12 +02:00
56a1449c69
add date_add to categories
2013-09-04 16:32:00 +02:00
63c19ce1a9
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-04 15:39:25 +02:00
3ca2c8da95
[-] BO : Fix #PSCFV-9906 could not register search engines keywords
2013-09-04 15:39:02 +02:00
Kevin Granger