Kevin Granger 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

..

controllers

[-] MO mailalert : products alerts can be registered for multiple guests

2013-09-20 10:46:56 +02:00

img

// Welcome 2013

2013-01-04 11:19:03 +01:00

mails

[+] MO : Mailalerts - Add Total tax paid to order confirmation

2013-08-29 17:13:48 +02:00

translations

[-] Core: delete lang files

2013-03-21 14:15:55 +01:00

upgrade

[*] MO : MailAlerts : Add SQL update script for v2.5

2013-09-10 11:01:11 +02:00

views

//replace some escape:'html' by addslashes in .tpl with javascript

2013-06-28 11:06:08 +02:00

config.xml

// Config files were translated in french

2013-08-20 17:49:05 +02:00

index.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

logo.gif

2011-07-06 10:54:11 +00:00

logo.png

// new icon for adminhome, adminmodules and header

2011-11-21 09:21:26 +00:00

MailAlert.php

[-] MO mailalert : products alerts can be registered for multiple guests

2013-09-20 10:46:56 +02:00

mailalerts-account.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

mailalerts-ajax.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

mailalerts-extra.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

mailalerts.css

[-] MO : MailAlerts module upgraded for PrestaShop 1.5

2012-01-25 16:04:31 +00:00

mailalerts.php

//mailalerts now use bootstrap design

2013-09-24 14:49:56 +02:00