 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 |
|
|
gRoussac
|
942d3c7151
|
[-] MO : Fixbug #PSCFV-10679 dateofdelivery PDF invoice array and array
|
2013-10-25 00:01:25 +02:00 |
|
|
Vincent Augagneur
|
8144935d76
|
//btn-primary => btn btn-default thanks @Shipow
|
2013-10-22 09:12:01 +02:00 |
|
|
Vincent Augagneur
|
b9c6b0e8af
|
//dateofdelivery now use bootstrap design
|
2013-10-14 14:55:56 +02:00 |
|
|
Jérôme Nadaud
|
23e0467993
|
[-] MO dateofdelivery : FixBug #PNM-1478 Now take care of product available date
|
2013-07-26 11:48:18 +02: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
|
0b8dc08acf
|
[-] BO : Fix W3C errors
|
2012-07-06 14:32:35 +00:00 |
|
|
lLefevre
|
c1fda58982
|
[-] FO : #PSCFV-2150 : Translations of modules are connected width sprintf()
|
2012-05-15 08:54:24 +00:00 |
|
|
mDeflotte
|
0323ed6866
|
// Fix little bug
|
2012-05-04 14:01:41 +00:00 |
|
|
mDeflotte
|
f65e49a246
|
[-] FO : #PSCFV-2147 - Fix bug with date of delivery
|
2012-05-04 09:12:02 +00:00 |
|
|
rMalie
|
14e6929565
|
// Welcome 2012²
|
2012-02-23 16:33:10 +00:00 |
|
|
rMalie
|
c24ff8e9c7
|
// Normalize + use $this->smarty instead of $this->context->smarty in modules
|
2011-12-30 14:59:57 +00:00 |
|
|
fBrignoli
|
63822a2f34
|
[*] PDF : Licenses + Hook in templates
|
2011-12-06 10:58:20 +00:00 |
|
|
rGaillard
|
052f9ba5af
|
// Replacement of AdminTab by AdminController on modules
|
2011-11-21 11:06:35 +00:00 |
|
|
rMalie
|
9510337b1d
|
// Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names
|
2011-10-10 12:18:56 +00:00 |
|
|
rMalie
|
3d89058084
|
// Merge -> revision 8342
|
2011-09-05 14:56:02 +00:00 |
|
|
rMalie
|
d0dbb5c185
|
// Merge -> revision 8014
|
2011-08-11 12:00:05 +00:00 |
|
|
rMalie
|
83734c7bb9
|
// Merge -> revision 7875
|
2011-08-03 16:16:49 +00:00 |
|
|
tDidierjean
|
9213581a03
|
// Context part 27
|
2011-07-29 14:29:57 +00:00 |
|
|
tDidierjean
|
52339502b6
|
// Context part 12
|
2011-07-19 09:28:11 +00:00 |
|
|
tDidierjean
|
6551a3ece7
|
// Context part 11
|
2011-07-18 15:50:58 +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 |
|