 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 |
|
|
sLorenzini
|
160857bdc3
|
// update css module tab
|
2013-07-12 14:30:44 +02:00 |
|
|
sLorenzini
|
40967e6525
|
// update modules list tab
|
2013-07-11 17:27:11 +02:00 |
|
|
Damien Metzger
|
a8d96ed0c0
|
// Removed useless feature
|
2013-06-28 16:38:08 +02:00 |
|
|
Kevin Granger
|
40f03d0ba1
|
[+] BO: Form components
|
2013-06-18 21:03:43 +02:00 |
|
|
Rémi Gaillard
|
02baab7393
|
[*] BO: List all modules with an upgrade available on AdminModules header
|
2013-03-27 18:58:21 +01:00 |
|
|
Rémi Gaillard
|
c2d8853f57
|
[*] BO: List all modules with an upgrade available on AdminModules header
|
2013-03-27 18:58:21 +01:00 |
|
|
fram
|
ed947bc123
|
// changed English strings, especially focusing on colons harmonization
|
2013-03-12 19:39:30 +01:00 |
|
|
fram
|
77efe4c04e
|
// changed English strings, especially focusing on colons harmonization
|
2013-03-12 19:39:30 +01:00 |
|
|
Damien Metzger
|
7ec0f0e391
|
// Fixed modules list icons retrieval
|
2013-03-08 11:53:25 +01:00 |
|
|
Damien Metzger
|
6d98b9a6ac
|
// Fixed modules list icons retrieval
|
2013-03-08 11:53:25 +01:00 |
|
|
djfm
|
385c593129
|
//Changed English strings using the translationsenglish module.
|
2013-01-04 16:58:58 +01:00 |
|
|
djfm
|
714a5e08cc
|
//Changed English strings using the translationsenglish module.
|
2013-01-04 16:58:58 +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 |
|
|
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 |
|
|
vKham
|
bf7acc1d11
|
// change layout dashboard flexible, add button change view module list normal favorite
|
2012-01-30 17:26:28 +00:00 |
|
|
vKham
|
5342c35e1d
|
// change layout dashboard flexible, add button change view module list normal favorite
|
2012-01-30 17:26:28 +00:00 |
|
|
fSerny
|
44389bb4c3
|
[+] BO : AdminModules Preferences
|
2012-01-24 15:39:10 +00:00 |
|
|
fSerny
|
48cb2f5dc5
|
[+] BO : AdminModules Preferences
|
2012-01-24 15:39:10 +00:00 |
|
|
tDidierjean
|
e2dbac517f
|
// Move controller templates to subfolder controllers/
|
2012-01-09 17:23:42 +00:00 |
|
|
tDidierjean
|
b1e9cedf42
|
// Move controller templates to subfolder controllers/
|
2012-01-09 17:23:42 +00:00 |
|