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

42 Commits

Author SHA1 Message Date
Damien Metzger
c095d8f1ca [-] Core : fixed smarty escape htmlall > html 2013-11-22 09:47:15 +01:00
Kevin Granger
9eefcfd058 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/modules.css
	admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/Autoload.php
	classes/Carrier.php
	classes/Product.php
	classes/ProductSale.php
	classes/Tools.php
	classes/Validate.php
	classes/tax/TaxRulesTaxManager.php
	controllers/admin/AdminPPreferencesController.php
	controllers/admin/AdminPerformanceController.php
	install-dev/install_version.php
	js/admin_carrier_wizard.js
	modules/blockcategories/blockcategories.php
	modules/blocklayered/blocklayered.php
	modules/statsequipment/statsequipment.php
	modules/statsproduct/statsproduct.php
	modules/watermark/watermark.php
	themes/default/address.tpl
	themes/default/authentication.tpl
	themes/default/category.tpl
	themes/default/contact-form.tpl
	themes/default/css/history.css
	themes/default/header.tpl
	themes/default/js/cart-summary.js
	themes/default/js/product.js
	themes/default/mobile/order-detail.tpl
	themes/default/modules/blocksearch/blocksearch.tpl
	themes/default/modules/productcomments/productcomments.tpl
	themes/default/order-carrier.tpl
	themes/default/order-detail.tpl
	themes/default/order-opc-new-account.tpl
	themes/default/product.tpl
 2013-11-21 17:43:51 +01:00
Kevin Granger
68cda947ed // removed login.css 2013-11-04 16:53:43 +01:00
gRoussac
b8b7fbaf71 [*] MO : New modules version since 1.5.6.0 2013-11-04 11:57:31 +01:00
gRoussac
f9cfde9a05 [-] MO : Trackingfront, could not load employee stats date 2013-10-12 23:24:32 +02:00
gRoussac
ee29f4365e [-] FO : Copuld not load datepicker in trackingfront stats.php 2013-10-12 17:54:26 +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
Damien Metzger
184515a27c [-] MO : fixed bad redirection in trackingfront #PSCFV-8378 2013-07-11 18:03:39 +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
dMetzger
eec5624768 // Code cleaning 2012-09-20 13:16:01 +00:00
lLefevre
46b391114b [*] TR : update English translations key for Modules 2012-07-12 10:08:13 +00:00
rGaillard
3672b02c66 // Fix some bug on advanced stock management 2012-07-11 15:46:39 +00:00
lLefevre
21d507e976 [*] TR : Update English translation : step 1 2012-07-09 09:43:17 +00:00
lLefevre
4134945127 [*] BO : Update Deutsch translations 2012-07-03 16:05:43 +00:00
lLefevre
0d6dd2f8c9 // Add spanish translations 2012-05-23 15:57:25 +00:00
fBrignoli
d5c0d7a80d [*] Project : Jquery 1.7.2 2012-04-20 15:45:43 +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
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +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
bMancone
35738e814d // #PSFV-124 Licenses update 2012-01-04 14:54:25 +00:00
rMalie
c24ff8e9c7 // Normalize + use $this->smarty instead of $this->context->smarty in modules 2011-12-30 14:59:57 +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
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
fBrignoli
1bb4a61a42 [+] Dispatcher 2011-06-15 16:32:06 +00:00
aFolletete
05a58f53e6 // 1.5 branche creation 2011-04-12 18:24:40 +00:00