 Kevin Granger
|
77f80b1774
|
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
.gitignore
admin-dev/themes/default/css/admin.css
admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/modules/page.tpl
admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
admin-dev/themes/default/template/controllers/orders/_documents.tpl
admin-dev/themes/default/template/controllers/orders/_shipping.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/payment/restrictions.tpl
admin-dev/themes/default/template/controllers/products/images.tpl
admin-dev/themes/default/template/controllers/products/informations.tpl
admin-dev/themes/default/template/header.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/modules_list/list.tpl
classes/Tools.php
controllers/admin/AdminCartRulesController.php
controllers/admin/AdminProductsController.php
css/admin.css
|
2013-07-24 17:01:23 +02:00 |
|
|
Damien Metzger
|
4e0723b3cc
|
[-] BO : fixed charts and grids in multishop #PSCFV-8978
|
2013-07-12 16:29:31 +02:00 |
|
|
Kevin Granger
|
ec466b8c70
|
// Porting more product tpl
|
2013-07-09 19:10:56 +02:00 |
|
|
vAugagneur
|
5f47b81211
|
//replace dirname(__FILE__) by _PS_ADMIN_DIR_ to prevent cache bug with __FILE__
|
2013-03-11 15:10:22 +01:00 |
|
|
vAugagneur
|
0688061b0a
|
//replace dirname(__FILE__) by _PS_ADMIN_DIR_ to prevent cache bug with __FILE__
|
2013-03-11 15:10:22 +01:00 |
|
|
François Gaillard
|
064ba453e6
|
// Welcome 2013
|
2013-01-04 11:19:03 +01:00 |
|
|
Francois Gaillard
|
8baf87eef5
|
// 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 |
|
|
vAugagneur
|
be946319be
|
//remove svn keyword @version Release: $
|
2012-11-22 11:57:40 +01:00 |
|
|
lLefevre
|
779cf350af
|
// Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 09:29:43 +00:00 |
|
|
lLefevre
|
6588f9514c
|
// Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 09:29:43 +00:00 |
|
|
lLefevre
|
046b51ab99
|
// #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 06:18:59 +00:00 |
|
|
lLefevre
|
398d345362
|
// #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 06:18:59 +00:00 |
|
|
rGaillard
|
b96c6531be
|
// small fixes
|
2012-04-16 09:47:34 +00:00 |
|
|
rGaillard
|
0dbe603cdb
|
// small fixes
|
2012-04-16 09:47:34 +00:00 |
|
|
rMalie
|
14e6929565
|
// Welcome 2012²
|
2012-02-23 16:33:10 +00:00 |
|
|
rMalie
|
1dc629a949
|
// Welcome 2012²
|
2012-02-23 16:33:10 +00:00 |
|
|
mMarinetti
|
1c288bf01d
|
// Welcome 2012
|
2012-02-22 09:28:22 +00:00 |
|
|
mMarinetti
|
677a4e485c
|
// Welcome 2012
|
2012-02-22 09:28:22 +00:00 |
|
|
tDidierjean
|
b556966762
|
// remove deprecated PS_ADMIN_DIR by _PS_ADMIN_DIR_
|
2011-09-20 15:53:57 +00:00 |
|
|
tDidierjean
|
3d733ae6e2
|
// Context part 31
|
2011-08-17 10:07:12 +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 |
|