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

81 Commits

Author SHA1 Message Date
Vincent Augagneur
33b7c554f7 //small fix #PSCSX-39 2013-11-26 10:59:03 +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
Damien Metzger
3f5963885e // Install multilang 2013-11-19 00:56:53 +01:00
Damien Metzger
54786a6f75 // Install 2013-11-19 00:10:46 +01:00
Damien Metzger
359f408bd1 // Install 2013-11-19 00:05:51 +01:00
Damien Metzger
89e09c32e8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 23:55:39 +01:00
Damien Metzger
e2c930a165 // Install 2013-11-18 23:55:29 +01:00
Jerome Nadaud
1b96c590bb // fix stock available on install 2013-11-18 23:53:47 +01:00
Lucas CERDAN
4001a99414 Fixtures product 2013-11-18 22:21:10 +01:00
Damien Metzger
51e5163761 // Moulinette for installer attributes 2013-11-18 22:10:22 +01:00
Lucas CERDAN
c451ee1bd8 // Fixtures 2013-11-18 20:46:22 +01:00
Lucas CERDAN
bde8d02c81 Fixtures: category_product 2013-11-18 20:27:01 +01:00
Damien Metzger
e4fcb31836 // Install 2013-11-18 20:02:14 +01:00
Lucas CERDAN
72b6b3d482 Fixtures (en) 2013-11-18 19:27:10 +01:00
Lucas CERDAN
770d48cf3c Fixtures (en) : category_product 2013-11-18 19:15:10 +01:00
Damien Metzger
36baadad1a // Set to new fixtures 2013-11-18 18:51:11 +01:00
Lucas CERDAN
c78252f64b Fixtures images 2013-11-18 18:38:24 +01:00
Lucas CERDAN
5ca7f683ac // Fixture (en): add description to categories 2013-11-18 18:09:40 +01:00
Lucas CERDAN
09a558485a New fixtures (en) 
(my first commit, yay! :) )
 2013-11-18 17:24:06 +01:00
Damien Metzger
b4385c346f [+] Installer : new demo products (part 1) 2013-11-18 14:53:39 +01:00
gRoussac
fc4a660f76 [-] BO : Fix bug #PSCFV-10666 product_supllier currency set to 0 2013-11-07 11:24:32 +01:00
Damien Metzger
9492557284 // Removed administrator account from the installer, replaced by the superadministrator account 2013-10-16 15:40:30 +02:00
Rémi Gaillard
1ed26e2d4e // default perms profiles 2013-10-07 12:13:59 +02:00
djfm
4668d8ffa2 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into pstw 2013-10-03 06:56:08 +00:00
Gregory Roussac
6b30cc5084 Merge pull request #750 from djfm/psindonesia 
[+] TR : Psindonesia
 2013-09-27 00:57:20 -07:00
smartdatasoft
37170c74b3 [+] LO : Added Bengali installer 2013-09-26 11:39:58 +00:00
djfm
78c1dce528 [+] LO: Added Traditional Chinese installer 2013-09-26 08:23:16 +00:00
djfm
54b3ac5a32 [+] TR : Added Indonesian installer 2013-09-25 09:41:59 +00:00
djfm
2f6a53f971 [+] TR: Created file structure for Dutch installer 2013-07-19 15:34:10 +00:00
Rémi Gaillard
4b88e8cc06 // John Doe is really a big scammer ! #PSCFV-9434 2013-07-08 11:17:12 +02:00
Rémi Gaillard
c01619dfe3 // Change administrator access fixture 2013-06-26 12:05:36 +02:00
Rémi Gaillard
fdd4b50bf6 [-] Installer: fix installer in PT languahe 2013-04-03 11:36:44 +02:00
kpodemski
2c3d0e7657 another utf-8 fix :( 2013-03-21 09:49:23 +01:00
kpodemski
3d7a303046 fix utf-8 2013-03-21 09:49:23 +01:00
kpodemski
1acc4439cc fix 2013-03-21 09:49:23 +01:00
fram
db58043fbe // some corrections in ru and pl installer 2013-03-21 09:49:23 +01:00
vAugagneur
149407f72d //added russian installer and changed english strings 2013-03-13 16:28:19 +01:00
Rémi Gaillard
5998face6b // Fix iPod nano fixture specific price 2013-03-12 18:11:20 +01:00
fram
f7c76f60fb // added russian installer 2013-03-12 16:05:54 +01:00
gRoussac
5859ec31cf [-] BO : Bug with genders icons 2013-03-06 18:56:24 +01:00
Rémi Gaillard
f024f14cb7 // Fix fixtures installer 2013-02-22 10:43:54 +01:00
Damien Metzger
78a5387a7e // Added references to demo products 2013-01-31 17:04:59 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur
2195f9bdcb [+] CORE : now you can choose the redirect option when your product is disable 2012-12-03 14:13:50 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
e0422e5e52 //small fix 2012-11-09 14:39:34 +00:00
lLefevre
946dd2caf7 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre
04fc63c2b6 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00