 Vincent Augagneur
|
d27fe93daa
|
//modules added ->bootstrap = true;
|
2013-11-05 18:08:01 +01:00 |
|
|
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 |
|
|
Vincent Augagneur
|
8144935d76
|
//btn-primary => btn btn-default thanks @Shipow
|
2013-10-22 09:12:01 +02:00 |
|
|
Rémi Gaillard
|
6ee538c710
|
// fix on ps_cleaner
|
2013-10-15 19:53:59 +02:00 |
|
|
Vincent Augagneur
|
d6a541df58
|
//pscleaner now use bootstrap design
|
2013-09-30 11:23:41 +02:00 |
|
|
Damien Metzger
|
2820314586
|
[-] MO : fixed potential warning in pscleaner #PSCFV-10070
|
2013-08-09 11:40:59 +02:00 |
|
|
Damien Metzger
|
192940946d
|
// Fixed pscleaner method
|
2013-07-30 09:21:41 +02:00 |
|
|
Damien Metzger
|
6ae0717e32
|
// PS Cleaner now clean the img/tmp dir
|
2013-07-18 14:48:47 +02:00 |
|
|
Damien Metzger
|
3be36f9897
|
[*] MO : added configuration cleaning to pscleaner
|
2013-07-18 09:36:01 +02:00 |
|
|
Damien Metzger
|
db7f0da746
|
// Improved display in pscleaner
|
2013-07-15 10:48:48 +02:00 |
|
|
Piotr Kaczor
|
54b882e936
|
[*] MO : pscleaner reset employees notyfications
pscleaner afetr truncating orders, messages and customers reset also employees notyfications
|
2013-07-05 08:05:51 +02:00 |
|
|
Sébastien
|
16e90488c4
|
[-] MO : Bug fix - PS Cleaner, check if module favoriteproducts is installed.
Fix Bug when favoriteproducts is not install.
|
2013-07-03 14:55:32 +02:00 |
|
|
Damien Metzger
|
b401ceb9d9
|
[-] MO : do not truncate order return state in pscleaner #PSCFV-9431
|
2013-06-13 08:57:31 +02:00 |
|
|
Damien Metzger
|
d441725ccd
|
// Small improvement on pscleaner
|
2013-06-07 18:02:08 +02:00 |
|
|
vAugagneur
|
0ba4d91c43
|
[-] MO : fixed hug #PSCFV-8994 - clear cache when truncate catalog
|
2013-05-02 11:41:49 +02:00 |
|
|
Damien Metzger
|
17536ff682
|
// Fixed potential warning
|
2013-04-18 17:12:59 -03:00 |
|
|
Rémi Gaillard
|
76f584a70d
|
// pscleaner clean address inversion between customers and manufacturers/suppliers
|
2013-04-17 11:39:11 +02:00 |
|
|
Damien Metzger
|
e9e74a171d
|
// Improved pscleaner
|
2013-03-11 12:31:42 +01:00 |
|
|
Damien Metzger
|
fdeba0497d
|
// Small fix (module installation and pscleaner)
|
2013-03-11 12:31:42 +01:00 |
|
|
PrestaEdit
|
87ab3be15a
|
[-] MO: pscleaner - fixed bugs
We need to know that 'editorial' is a module and not always install (so, table can not be there).
ps2 need to be _DB_PREFIX_ !
|
2013-03-08 20:07:08 +01:00 |
|
|
Damien Metzger
|
9d0b6de69f
|
[+] MO : new module PrestaShop Cleaner: Check and fix functional integrity constraints and remove default data
|
2013-03-08 18:11:00 +01:00 |
|