dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,123 Commits 9 Branches 19 Tags
855c8a8de4fe07afcba50089feb997fe033dcf62
Commit Graph

54 Commits

Author SHA1 Message Date
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
Damien Metzger ad2702e609 // Config files were translated in french 2013-08-20 17:49:05 +02:00
Vincent Augagneur fcc1867a94 //merge 2013-07-30 18:02:30 +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
Kevin Granger 2a3820f068 Added close span tag to avoid bug on IE8 (thanks Atch) 2013-05-20 18:20:55 +03:00
Rémi Gaillard f3dfbda02a [-] Core: delete lang files 2013-03-21 14:15:55 +01:00
sLorenzini 542d3aa1da [-] FO: fixed bug CSS 2013-01-10 17:23:32 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur 321eaa191b //added translation 2012-12-28 09:27:12 +01:00
vAugagneur 4fa7eb6a3d //revert all config.xml 2012-12-06 11:41:52 +01:00
Sarah Lorenzini 2b10fcd712 // change h4, h5 2012-12-04 17:15:49 +01:00
vAugagneur be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre d1e7ca4e7c [-] BO : fix #PSCFV-4469 2012-09-28 07:24:09 +00:00
lLefevre f6d41dea32 [-] BO : #PSCFV-4392 : index.php in modules folder and sub folders 2012-09-26 07:11:37 +00:00
lLefevre 4c75f80236 [*] TR : add Deutsch translations 2012-09-13 08:32:36 +00:00
vAugagneur bad83093f2 [-] FO : fixed bug #PSCFV-3784 - fixed display bug in dateofdelivery and order history 2012-08-28 08:48:21 +00:00
lLefevre a29ffa70de [*] TR : update Italian translations 2012-07-12 08:34:34 +00:00
lLefevre f36f1c03d1 [-] BO : Fix W3C errors 2012-07-06 14:32:35 +00:00
lLefevre 1a9e8e99e5 [*] BO : Update Italian translations 2012-07-04 07:37:06 +00:00
lLefevre c2301680cd [*] BO : Update Italian translations 2012-07-03 16:14:41 +00:00
lLefevre 8d6c373da6 [*] BO : Update Deutsch translations 2012-07-03 16:05:43 +00:00
lLefevre 7121955c4d // Add spanish translations 2012-05-23 15:57:25 +00:00
lLefevre f0bfc8b3d1 // Add Deutsch (German) translations 2012-05-23 11:58:42 +00:00
lLefevre 53504c37a3 [-] FO : #PSCFV-2150 : Translations of modules are connected width sprintf() 2012-05-15 08:54:24 +00:00
mDeflotte ef279f7abf // Fix little bug 2012-05-04 14:01:41 +00:00
mDeflotte abcfa78c03 [-] FO : #PSCFV-2147 - Fix bug with date of delivery 2012-05-04 09:12:02 +00:00
lLefevre c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
fSerny 593a673afb // Regen all modules config file (in english this time ^^') 2012-03-14 09:41:04 +00:00
fSerny c49329d4df // Regen all modules config file 2012-03-14 09:37:58 +00:00
rMalie 1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie 30d526422c // French translations (by Xavier) 2012-02-15 13:22:27 +00:00
rMalie beedaff103 // Modules langs files moved to modules/*/translations/ folder 2012-02-01 14:42:15 +00:00
bMancone 9f00ee6e7f // #PSFV-124 Licenses update 2012-01-04 14:54:25 +00:00
rMalie 443092c811 // Normalize + use $this->smarty instead of $this->context->smarty in modules 2011-12-30 14:59:57 +00:00
mDeflotte ed3abf2087 // Traductions files 2011-12-19 09:25:37 +00:00
fBrignoli 1059836a8f [*] 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
vKham 5eedee4129 // new icon for adminhome, adminmodules and header 2011-11-21 09:21:26 +00:00
rMalie d79fcf00fb // Merge -> revision 9352 2011-10-14 08:20:54 +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
rMalie c17e7c236d // MERGE with 1.4 r7770 2011-07-28 09:20:57 +00:00
tDidierjean 52339502b6 // Context part 12 2011-07-19 09:28:11 +00:00