d27fe93daa
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
2e80ed8de5
// Cleaned conflict
2013-11-04 14:58:17 +01:00
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
3c1cdf4ef2
// Fixed new arrivals issue
2013-10-31 16:09:10 +01:00
1e094f4016
[-] FO: Fix bug #PSCFV-10623 blocknewproducts shows products when PS_NB_DAYS_NEW_PRODUCT == 0
2013-10-24 23:29:23 +02:00
e17dd1fdde
// theme installation
2013-10-24 09:49:46 +02:00
8144935d76
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
62aaf16d60
[*] FO : New hooks for home tabs
2013-10-16 11:44:55 +02:00
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
b7045b998a
//blocknewproducts now use boostrap design
2013-09-20 16:41:31 +02:00
08373c0541
[+] Modules : add hookHome
2013-09-14 14:57:00 +02:00
dlage
5f1e08e7e2
Fix variable context
...
Avoid attribution to the variable $newProducts inside the if. It caused the code to potentially misbehave throwing errors of:
"variable $newProducts not defined".
2013-09-01 22:47:41 +01:00
a519f4a7cb
//small fix
2013-07-01 16:40:08 +02:00
3d85e81c3d
// Oops, removing a block is a sure way to optimize...
2013-06-28 18:52:08 +02:00
8acf308639
[*] FO : added smarty cache on blocknewproducts
2013-06-28 15:17:53 +02:00
ed947bc123
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
064ba453e6
// Welcome 2013
2013-01-04 11:19:03 +01:00
17350c6149
[-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes
2012-12-18 14:59:34 +01:00
a1db83ef41
//remove svn keyword @version Release: $
2012-11-22 11:57:40 +01:00
93aae4afaa
// Renamed images types for the default theme (in order to avoid conflicts) #PSCFV-4242
2012-09-21 14:59:51 +00:00
1397fffa4b
// delete confirm message when updating module configuration
2012-05-09 08:29:07 +00:00
14e6929565
// Welcome 2012²
2012-02-23 16:33:10 +00:00
5d5bdb5efd
// Normalize
2012-01-27 10:28:56 +00:00
68d80262d5
// Remove Module->templateAssign() from modules (use $this->smarty->assign() instead)
2011-12-05 14:04:35 +00:00
91083e190c
// Merge -> revision 8800
2011-09-27 14:30:06 +00:00
dc957d3d3a
// Rename Module->smartyAssign to Module->templateAssign
...
[+] Front: Add module controller + url dispatch for modules
2011-09-23 13:50:33 +00:00
668a8d333c
[+] MO: Add Module->smartyAssign method, in order to assign variables with module name as prefix in module's templates
2011-09-22 12:05:49 +00:00
d0dbb5c185
// Merge -> revision 8014
2011-08-11 12:00:05 +00:00
2bb147128b
// Revert normalization
2011-08-11 10:20:59 +00:00
7fec565167
// Normalization
2011-08-11 09:58:20 +00:00
9213581a03
// Context part 27
2011-07-29 14:29:57 +00:00
52339502b6
// Context part 12
2011-07-19 09:28:11 +00:00
6551a3ece7
// Context part 11
2011-07-18 15:50:58 +00:00
139bb84f87
// Context - first commit
2011-07-11 14:32:05 +00:00
9b288cecf5
// revert previous commit
2011-07-08 16:12:27 +00:00
af4c7605de
// cancel commit
2011-07-08 15:43:24 +00:00
8fc7f11014
2011-07-06 10:54:11 +00:00
d1a13007b9
2011-07-06 10:10:43 +00:00
05a58f53e6
// 1.5 branche creation
2011-04-12 18:24:40 +00:00
Vincent Augagneur
dlage