1aadb10fb2
// English emails
2013-11-06 16:20:19 +00:00
f742e817da
// updated English emails: now responsive
2013-11-05 18:10:31 +00:00
d27fe93daa
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
71e3a8a937
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 16:58:17 +00:00
5372f31b4c
// updated English emails
2013-11-04 16:57:50 +00:00
889a2006ec
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/customer_threads/message.tpl
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/modules/favorites.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
admin-dev/themes/default/template/controllers/orders/form.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/associations.tpl
admin-dev/themes/default/template/controllers/products/combinations.tpl
admin-dev/themes/default/template/controllers/products/images.tpl
admin-dev/themes/default/template/controllers/products/informations.tpl
admin-dev/themes/default/template/controllers/products/prices.tpl
admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
admin-dev/themes/default/template/header.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/list/list_header.tpl
classes/ProductSale.php
classes/helper/HelperList.php
controllers/admin/AdminCmsController.php
controllers/admin/AdminCustomersController.php
controllers/admin/AdminMetaController.php
controllers/admin/AdminModulesController.php
controllers/admin/AdminPerformanceController.php
controllers/admin/AdminProductsController.php
controllers/front/ParentOrderController.php
install-dev/theme/views/welcome.phtml
modules/blocknewproducts/blocknewproducts.php
modules/blocktopmenu/blocktopmenu.php
modules/importerosc/importerosc.php
modules/mailalerts/mailalerts.php
modules/shopimporter/shopimporter.php
modules/statsstock/statsstock.php
themes/default/css/product_list.css
2013-11-04 14:43:01 +01:00
b9ad576fb0
// -> mailsrc branch
2013-10-30 15:02:06 +01:00
d2e475dd3a
// Removed line from merge
2013-10-29 10:30:59 +01:00
1d90218e0d
// Update mailalert module version
2013-10-29 10:00:57 +01:00
9660cef0aa
[-] MO : mailalert - Fix deprecated warning on displayDate
2013-10-29 09:58:42 +01:00
4f8d153469
// fixed links in new English mails
2013-10-28 08:57:59 +00:00
3a749823bb
// small fixes in English Email php templates
2013-10-25 12:29:39 +00:00
cd5fa81025
// Fixed boulette
2013-10-24 19:29:22 +02:00
2989538ce1
[*] BO Module mailalerts: send e-mail to merchand when product is out of stock
2013-10-22 15:53:20 +02:00
8144935d76
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
7133e74c17
[-] MO mailalerts: module mailalerts shows all messages regarding the order
...
PNM-1632 - MailAlert does not show Paypal error message if order has comments
2013-10-18 17:49:00 +02:00
67dc7aac04
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/modules/filters.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/orders/form.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
classes/Category.php
classes/controller/AdminController.php
controllers/admin/AdminAttributesGroupsController.php
controllers/admin/AdminFeaturesController.php
controllers/admin/AdminImportController.php
controllers/admin/AdminLogsController.php
install-dev/install_version.php
install-dev/langs/ru/data/tab.xml
js/admin_carrier_wizard.js
modules/loyalty/loyalty.php
2013-10-14 12:21:29 +02:00
45e9040606
[-] Bo : Could not update mailarler 2.5 with id_mlang
2013-10-11 15:51:02 +02:00
8ed77030aa
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/informations.tpl
admin-dev/themes/default/template/controllers/products/prices.tpl
admin-dev/themes/default/template/controllers/products/suppliers.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/toolbar.tpl
classes/helper/HelperList.php
controllers/admin/AdminGroupsController.php
controllers/admin/AdminManufacturersController.php
2013-09-30 11:01:23 +02:00
a913a43b17
//mailalerts now use bootstrap design
2013-09-24 14:49:56 +02:00
91ae972655
[-] MO mailalert : products alerts can be registered for multiple guests
...
#PNM-1669
2013-09-20 10:46:56 +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
614e56283a
Update mailalerts.php
...
Fixes issue where customization data is not included in new order email.
2013-09-11 10:49:34 +08: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
40c64b54e2
[+] MO : Mailalerts - Add Total tax paid to order confirmation
2013-08-29 17:13:48 +02:00
ad2702e609
// Config files were translated in french
2013-08-20 17:49:05 +02:00
fcc1867a94
//merge
2013-07-30 18:02:30 +02:00
bff2844adf
[*] MO : Added customer and product object to hook sending email
2013-07-25 14:50:35 +02:00
5825dda836
[-] MO mailalerts : infinite coverage (-1) is taken into account when sending coverage e-mails
...
#PNM-1563
#PNM-1597
2013-07-19 17:36:51 +02:00
0c2aa996a2
//oups 😋
2013-07-01 16:48:25 +02:00
a519f4a7cb
//small fix
2013-07-01 16:40:08 +02:00
dfc7456980
//replace some escape:'html' by addslashes in .tpl with javascript
2013-06-28 11:06:08 +02:00
4f1e246c71
// remove deprecated
2013-06-24 15:52:56 +02:00
ca64179950
// W3C
2013-06-06 15:27:29 +02:00
beab13e966
// revert from Merge pull request #458 from runningz https://github.com/runningz/PrestaShop/commit/040ff3396ac32a1cc35d4d2464e8d36486cac418
2013-06-06 11:24:21 +02:00
3b23558ebb
[-] MO : Report of #PNM-1413 when alert already set on default combination
2013-06-06 10:25:41 +02:00
81e8d76d31
// revert
2013-06-06 10:15:40 +02:00
896658633e
[*] MO : Followup https://github.com/runningz/PrestaShop/commit/040ff3396ac32a1cc35d4d2464e8d36486cac418
2013-06-06 10:07:48 +02:00
5ec36dac88
[-] MO - fixed bug #PSCFV-9111 - Mailalert emails do not follow the new {color}
2013-06-04 16:14:34 +02:00
040ff3396a
[-] MO : Remove link "Notify me when available" when in stock
2013-05-28 23:06:05 +03:00
92da1ffa83
//Merged pull request 124 - thanks to @rynge
2013-05-23 15:24:25 +02:00
83088a1905
[*] Mails : delete a hard-coded pink background
2013-04-29 10:21:53 +02:00
4b52f6da2e
Replacing the default pinkish background with a grey one, and put the text in {color}
2013-04-28 11:13:46 +02:00
2d2b9f76e0
Merge Pull Request #53 - Thanks @Caleydon
2013-04-23 11:40:08 +02:00
0786cf617f
//change the default color (#db3484)
2013-04-11 17:51:28 +02:00
36e7eee76b
// delete also module emails
2013-03-25 18:08:34 +01:00
6d7ea35e97
// Ignore list updated + fr translations updated
2013-03-25 14:59:01 +01:00
f3dfbda02a
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
46b4570e14
[-] MO : fixed phone number in mailalert #PSCFV-6667
2013-01-15 20:08:37 +01:00
djfm