Kevin Granger
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
Jerome Nadaud
b6d6336e26
// Add date subtitle
2013-10-22 12:12:41 +02:00
djfm
5e407db21e
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
2013-10-14 09:30:45 +00:00
Fabio Chelly
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
Fabio Chelly
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
jeromenadaud
d68363fdda
[-] FO : FixBug #PSCFV-9846 Bookmark title escape problem on special language
2013-07-31 10:24:14 +02:00
gRoussac
e00d7e736f
[-] FO : Fix bug #PSCFV-8202 special chars for checkCustomizations js function
2013-03-21 15:09:02 +01:00
Gregory Roussac
33e287d20f
[-] FO : Home w3c validation removed "legend" attribute and target="_blank"
2013-03-01 00:25:19 +01:00
gRoussac
fa878720f6
[*] FO : Fix #PSCFV-7463 No Add to favorite for Chrome
2013-02-13 10:44:06 +01:00
gRoussac
a48d2668d3
[-] FO : Apply changes from commit 1.4.X 1d0d59845b5f9cb9333a89e60523ab41df076d89 no cache for POST queries
2013-01-23 15:48:15 +01:00
François Gaillard
064ba453e6
// Welcome 2013
2013-01-04 11:19:03 +01:00
vAugagneur
a1db83ef41
//remove svn keyword @version Release: $
2012-11-22 11:57:40 +01:00
lLefevre
ef1f4bde50
[-] BO : #PSCFV-3670 : add a new format of currency in JS files
2012-08-29 14:52:47 +00:00
mDeflotte
8245e83e63
[-] BO : #PSCFV-2947 - isArrowKey doesn't always return a valaue
2012-06-29 11:38:51 +00:00
rMalie
14e6929565
// Welcome 2012²
2012-02-23 16:33:10 +00:00
mMarinetti
1c288bf01d
// Welcome 2012
2012-02-22 09:28:22 +00:00
vChabot
fd3890d9ca
// report bugfix from saving customization with combination
2012-02-10 14:08:03 +00:00
dMetzger
d902a38ec8
[+] BO : add new feature, Order edition
2011-11-23 17:45:52 +00:00
rMalie
468306a3ca
// Merge -> revision 8952
2011-10-03 09:14:01 +00:00
rGaillard
8fc7f11014
2011-07-06 10:54:11 +00:00
rGaillard
d1a13007b9
2011-07-06 10:10:43 +00:00
aFolletete
05a58f53e6
// 1.5 branche creation
2011-04-12 18:24:40 +00:00
