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

50 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
Jerome Nadaud 6f57093f50 [-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security 2013-10-24 18:36:36 +02:00
Vincent Augagneur b38073ad72 //watermark now use bootstrap design 2013-10-23 18:01:23 +02:00
Fabio Chelly d1a7ff50d5 [*] BO Module watermark: minimum transparency level is 1 and not 0. 2013-10-11 10:51:28 +02:00
Fabio Chelly ea57b3fdd1 [-] MO watermark: original pictures are now protected through htaccess 
#PNM-109
 2013-10-03 15:32:10 +02:00
Rémi Gaillard dfd2b8f604 [-] Core: delete lang files 2013-03-21 14:15:55 +01:00
François Gaillard 064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur a35469768f //added translation 2012-12-28 09:27:12 +01:00
vAugagneur 768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur 76b435b639 //revert all config.xml 2012-12-06 11:41:52 +01:00
Sarah Lorenzini 31efb947ab // change h4, h5 2012-12-04 17:15:49 +01:00
vAugagneur a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre 55adbb5bbb [-] BO : #PSCFV-4392 : index.php in modules folder and sub folders 2012-09-26 07:11:37 +00:00
lLefevre d3cd0763cc [*] TR : add Deutsch translations 2012-09-13 08:32:36 +00:00
lLefevre 06e88dcdb7 [-] TR : #PSCFV-4027 : change string "tabs" by "Menus"... 2012-09-12 15:06:48 +00:00
rGaillard 4e5f28f6c1 // Fix PSCFV-3933 2012-09-06 15:43:45 +00:00
fBrignoli 8882b67de8 [-] MO : Watermark - Bug Fixed #PSCFV-2770 - Watermark is not working 2012-07-25 09:30:56 +00:00
lLefevre 46b391114b [*] TR : update English translations key for Modules 2012-07-12 10:08:13 +00:00
lLefevre 21d507e976 [*] TR : Update English translation : step 1 2012-07-09 09:43:17 +00:00
lLefevre 5d03fbd33b [*] BO : Update Italian translations 2012-07-03 16:14:41 +00:00
fSerny 87761422fd // Recommit english config xml file :) 2012-05-31 16:28:40 +00:00
lLefevre 0d6dd2f8c9 // Add spanish translations 2012-05-23 15:57:25 +00:00
mDeflotte 13f1c034d3 // Add some module translations 2012-05-15 08:34:24 +00:00
lLefevre f97093af7a [*] MO : change calls method Tools::displayError() by $name_module->l() && Translations 2012-05-09 10:06:23 +00:00
vChabot 1397fffa4b // delete confirm message when updating module configuration 2012-05-09 08:29:07 +00:00
vAugagneur c91279f459 //remove useless code 2012-05-03 16:25:15 +00:00
lLefevre 1998bb56d4 // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
fSerny 641d3847ef // Regen all modules config file (in english this time ^^') 2012-03-14 09:41:04 +00:00
fSerny 4ea89fe96e // Regen all modules config file 2012-03-14 09:37:58 +00:00
rMalie 4f5665d0c7 // Normalize 2012-03-05 10:31:27 +00:00
rMalie 14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie 91aae3e665 // Improve multishop API 2012-02-23 15:39:44 +00:00
mMarinetti 1c288bf01d // Welcome 2012 2012-02-22 09:28:22 +00:00
rMalie 94e549f9bc // French translations (by Xavier) 2012-02-16 09:34:29 +00:00
rMalie eb5b329a28 // Modules langs files moved to modules/*/translations/ folder 2012-02-01 14:42:15 +00:00
fSerny 44389bb4c3 [+] BO : AdminModules Preferences 2012-01-24 15:39:10 +00:00
rMalie 84f4d0838c [*] Classes : images.inc.php functions are now all deprecated, use the new class ImageManager instead 2012-01-23 10:21:51 +00:00
bMancone 35738e814d // #PSFV-124 Licenses update 2012-01-04 14:54:25 +00:00
rGaillard 4d36ed0619 // watermark is now multishop 2011-12-21 20:14:46 +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 91083e190c // Merge -> revision 8800 2011-09-27 14:30:06 +00:00
tDidierjean 7cd878079c [*] BO : Removed size limit for image upload (BL006, CC136) 2011-09-12 09:14:07 +00:00
rMalie d0dbb5c185 // Merge -> revision 8014 2011-08-11 12:00:05 +00:00
tDidierjean 0310674fe0 // Context part 29 2011-08-08 13:17:12 +00:00
rMalie c17e7c236d // MERGE with 1.4 r7770 2011-07-28 09:20:57 +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