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

2093 Commits

Author SHA1 Message Date
gRoussac
99fe216413 [*] FO : Move both sliders module on new hook 2013-12-06 17:05:39 +01:00
gRoussac
e505588688 [-] IN : Merge of https://github.com/PrestaShop/PrestaShop/pull/1095 2013-12-04 11:47:14 +01:00
Damien Metzger
703d790910 // Changed hook in update 2013-12-02 17:40:01 +01:00
Damien Metzger
c8ca67eef5 // Fixed upgrade to 1.6.0.1 2013-12-02 15:28:02 +01:00
gRoussac
8370c18fe8 [-] CORE : Remove notices on ob clean 2013-11-28 11:11:49 +01:00
Gregory Roussac
b6a41fca69 Merge pull request #1015 from indesign47/patch-14 
[-] BO : AdminImages manufacturers/suppliers/stores image
 2013-11-26 02:34:25 -08:00
Vincent Augagneur
33b7c554f7 //small fix #PSCSX-39 2013-11-26 10:59:03 +01:00
Damien Metzger
553568a72d // Change message for permissions in the installer 2013-11-25 17:06:25 +01:00
indesign47
79791d0159 [-] BO : AdminImages manufacturers/suppliers/stores image 
• Missing logo Fashion_Manufacturer.jpg (small/medium/large)
install-dev/fixtures/fashion/img/m
• Missing logo Fashion_Supplier.jpg (small/medium/large)
install-dev/fixtures/fashion/img/su
 2013-11-22 12:22:41 +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
9c5303df1d // Deactivate customer groups in the install (automatically reactivated if you add a group or set a reduction) 2013-11-21 14:57:55 +01:00
Damien Metzger
33b8703d24 // Changelog 1.5.6.1 2013-11-20 09:43:06 +01:00
Jérôme Nadaud
29e7169a92 // Change logo size 2013-11-19 08:43:17 +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
Damien Metzger
dec5ef7469 // Install 2013-11-18 23:26:41 +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
Jerome Nadaud
f2b5e6de51 // Themeconfigurator and homeslider 2013-11-18 20:49:52 +01:00
Lucas CERDAN
c451ee1bd8 // Fixtures 2013-11-18 20:46:22 +01:00
Damien Metzger
f4560d0899 // Install 2013-11-18 20:35:42 +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
Jerome Nadaud
3dd7a17f6f // Some fixtures 2013-11-18 19:53:44 +01:00
Lucas CERDAN
72b6b3d482 Fixtures (en) 2013-11-18 19:27:10 +01:00
Damien Metzger
a3e1fdb690 // Install 2013-11-18 19:22: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
fram
1dd0064cb2 // fixed typo in Russian installer 2013-11-18 15:34:46 +01:00
fram
0889ab4eec // fixed typo in Russian installer 2013-11-18 15:30:05 +01:00
Damien Metzger
b4385c346f [+] Installer : new demo products (part 1) 2013-11-18 14:53:39 +01:00
Damien Metzger
89c65536d7 // Added missing configuration vars in the installer 2013-11-18 12:23:50 +01:00
Damien Metzger
5ef4b8eddc // Installer optimization 2013-11-18 12:12:14 +01:00
gRoussac
1cbc765a8f [-] IN : Bad flag in add_module_to_hook 2013-11-17 20:42:29 +01:00
Damien Metzger
b62952accf [*] BO : Added simulation mode to the dashboard 2013-11-15 18:07:23 +01:00
Jerome Nadaud
29f65da5ca // Add wish list button to blockwishlist module 2013-11-14 19:54:28 +01:00
gRoussac
19d975a0b4 // typo 2013-11-14 14:48:14 +01:00
gRoussac
5e4382eb08 [-] BO : Fix bug #PSCFV-10982 reduction group truncated 2013-11-12 17:55:07 +01:00
Rémi Gaillard
b5eb7c5c28 // typo 2013-11-12 16:25:13 +01:00
fram
ab730dc3da // do not use sprintf when it is useless 2013-11-12 09:21:05 +01:00
Jerome Nadaud
01d8376ee7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-07 16:48:56 +01:00
Jerome Nadaud
b51b388eaa // Blockcategories thumnail uploader fix 2013-11-07 16:44:55 +01:00
gRoussac
fc4a660f76 [-] BO : Fix bug #PSCFV-10666 product_supllier currency set to 0 2013-11-07 11:24:32 +01:00