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

1886 Commits

Author SHA1 Message Date
indesign47 799b31d1ac [-] FO : Contact-form add translation for fields 2013-11-22 10:55:56 +01:00
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
TMMeilleur f58018b6e4 fixes for compatibility 2013-11-20 19:31:17 +02:00
TMMeilleur 01428f9a31 added all themes for themeconfigurator 2013-11-20 19:25:12 +02:00
Rémi Gaillard df4cc9d876 Merge pull request #1002 from TMMeilleur/bootstrap 
//fixed banners style
 2013-11-20 07:28:51 -08:00
Damien Metzger a10c8a3874 [-] FO : Fixed meta title entities #PSCFV-10312 2013-11-20 16:21:37 +01:00
gRoussac 914f613e7b [-] FO : Fix bug #PSCFV-11052 no carrier fess whne tax display to false 2013-11-20 15:32:33 +01:00
TMMeilleur db081111a6 fixed banners style 2013-11-20 16:24:05 +02:00
gRoussac 5ef392aaeb [-] FO : Fix #PSCFV-11069 remove unused file 2013-11-20 14:44:56 +01:00
Damien Metzger 61b1dd338e // Update blockbestsellers 2013-11-20 10:28:39 +01:00
Jerome Nadaud 639a56421a // Themeconfigurator 2013-11-18 22:16:26 +01:00
Alexander Grosul b6c5cd7c63 replace new css files location to modules/themeconfigurator/css 2013-11-18 20:07:24 +02:00
TMMeilleur 95b9710eda fixed add to wishlist/compare buttons and added product review 2013-11-18 15:52:39 +02:00
gRoussac cef406aef2 [*] FO : DNI can be not required 2013-11-17 23:35:56 +01:00
gRoussac 7e841c4448 [-] FO : Missing sup for DNI field 2013-11-17 22:36:51 +01:00
Jérôme Nadaud de9e6d72c8 // Typo 2013-11-16 08:04:59 +01:00
PrestaEdit 9b787c454f //typo 2013-11-16 01:21:56 +01:00
TMMeilleur a5d9daff13 added responsive rich menu and small fix in blockbanner 2013-11-15 18:40:17 +02:00
gRoussac 9aa656c9d7 // typo 2013-11-15 15:10:12 +01:00
gRoussac 1140b5e8b5 [*] FO : Fix #PSCFV-8715 add product.attributes in carrier tpl 2013-11-15 15:06:30 +01:00
Jerome Nadaud d7de507f42 // Product comments 2013-11-15 11:49:40 +01:00
Jerome Nadaud 50eee795ed // Add truncate category description preserving html tags 2013-11-15 11:03:06 +01:00
gRoussac 97be96ede8 [-] MO : Missinag closing href 2013-11-15 10:54:50 +01:00
gRoussac 47d58ff930 [*] FO : set at least a class to body 2013-11-14 19:03:12 +01:00
TMMeilleur 0d1c113be1 updates and fixes 14.11.2013 2013-11-14 18:08:05 +02:00
Jerome Nadaud 87faae9717 // Add top menu to blockcategories 2013-11-14 11:52:24 +01:00
Alexander Grosul ae596ebcd4 added transforming for mobile view and other small fixes 2013-11-13 18:34:34 +02:00
gRoussac 947f9bb21c // small isset in productcomments 2013-11-13 16:39:33 +01:00
Jerome Nadaud c4837e65ec [-] FO : FixBug #PSCFV-9291 - Ecotax increment display price in product combination 2013-11-13 11:24:25 +01:00
Jerome Nadaud 9f10a851e5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-13 10:58:01 +01:00
Mikael Blotin 26d1ad0668 [-] FO : fix contact-form id_order input when customer is not logged 2013-11-13 10:12:31 +01:00
Jerome Nadaud 6a99b84452 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-13 10:02:28 +01:00
alexey-svistunov a7aea1d018 Updating styles 2013-11-13 10:01:04 +02:00
gRoussac c8dfe1c174 [-] FO : Wordwrap on prices in history 2013-11-12 19:17:12 +01:00
gRoussac f0f630fb50 [-] FO : #PSCFV-10978 firstname displayed instead of lastname in invoice address 2013-11-12 12:32:21 +01:00
Alexey Svistunov 97d14e5b08 Added changes from commit 88aa49e TMMeilleur 2013-11-11 11:30:24 +02:00
alexey-svistunov 6f5c9044d3 Added changes from eb94b51 TMMeilleur/PrestaShop 2013-11-08 21:00:00 +02:00
Jérôme Nadaud 64c166c311 Merge pull request #947 from PhpMadman/Boot-UpTo 
// made a working You Save column for Volume Discounts
 2013-11-08 02:57:23 -08:00
fram be38a438e2 // sprintf & English 2013-11-08 11:39:59 +01:00
PhpMadman 1782bc082f // made a working You Save column for Volume Discounts 2013-11-08 10:27:36 +01:00
Rémi Gaillard 855c8a8de4 // add 2 useful hooks 2013-11-07 18:33:49 +01:00
djfm 8cb761078b // English 2013-11-07 12:26:55 +00:00
djfm f83c50b264 // one is one 2013-11-07 11:08:15 +00:00
Jerome Nadaud f3147b4e57 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-07 09:47:47 +01:00
Rémi Gaillard ef5779f63f // d321b9a5bc 2013-11-06 17:11:31 +01:00
Jérôme Nadaud d0522417eb Merge pull request #937 from PhpMadman/DiscountPrice 
[*] FO : Added possibility to display new price instead of quantity discount
 2013-11-06 08:06:16 -08:00
jeckyl d321b9a5bc Update cart-summary.js 
Just add this space to separate this classes. It's to display or not carrier option when we select one or another carrier during order finalisation.
 2013-11-06 14:42:00 +01:00
PhpMadman d95885caae [*] FO : Added posibilty to display new price instead of quantity discount 2013-11-06 14:41:42 +01:00
TMMeilleur 211c36c7a3 improved scss variables 2013-11-06 15:41:00 +02:00