dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,325 Commits 9 Branches 19 Tags
6ec8e4e70ec85d2ce26e0ed32eb4b7c07802fbf6
Commit Graph
1757 Commits
Author SHA1 Message Date
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
TMMeilleur db081111a6 fixed banners style 2013-11-20 16:24:05 +02: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
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
Jerome Nadaud d7de507f42 // Product comments 2013-11-15 11:49:40 +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
alexey-svistunov a7aea1d018 Updating styles 2013-11-13 10:01:04 +02: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
TMMeilleur 211c36c7a3 improved scss variables 2013-11-06 15:41:00 +02:00
Rémi Gaillard 1dd919addf // no need mobile version with responsive :) 2013-11-05 19:15:24 +01:00
Damien Metzger 9f1911eeca // Fixed shopping cart line reduction 2013-11-05 16:41:50 +01:00
Rémi Gaillard 4a6cb5075e Merge pull request #924 from TMMeilleur/bootstrap 
// Update default theme
 2013-11-05 07:36:14 -08:00
TMMeilleur 0ffa6ab059 update 5.11.13 2013-11-05 17:27:57 +02:00
TMMeilleur 21209d799f update 5.11.13 2013-11-05 17:17:26 +02:00
Damien Metzger 9bc5a52925 Merge pull request #916 from PrestaEdit/patch-58 
[-] FO: use 4 images in thumbnails, not 3
 2013-11-05 06:20:59 -08:00
TMMeilleur 55cd7c4c34 update 05.11.13 2013-11-05 11:35:24 +02:00
Rémi Gaillard 569455a7ff // fix on front validators 2013-11-04 19:26:51 +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
gRoussac c7323c2bfe [-] CORE : Fix bug #PSCFV-10901 warnings on htmlentities 2013-11-03 22:59:04 +01:00
Rémi Gaillard 930c9f3ff5 // validators 2013-11-02 10:50:02 +01:00
Rémi Gaillard 5db9c5cdd5 // small fix 2013-11-02 09:54:37 +01:00
PrestaEdit d4075f1267 [-] FO: use 4 images in thumbnails, not 3 2013-10-31 23:06:19 +01:00
Rémi Gaillard a1696efe63 // small fix 2013-10-31 18:40:29 +01:00
Damien Metzger 8670db2316 // Image sizes 2013-10-31 17:41:02 +01:00
Damien Metzger 343c9578da // Better 2013-10-31 17:15:30 +01:00
Damien Metzger 23e4e1badb // I forgot the link 2013-10-31 17:10:15 +01:00
Damien Metzger 6c8e70f780 [*] FO : added "back to search results" the the product page 2013-10-31 15:32:52 +01:00
Damien Metzger f565b273d8 // Reverting the revert 2013-10-31 15:13:46 +01:00
TMMeilleur 68a98b29a6 tm theme 2013-10-31 15:51:25 +02:00
Damien Metzger ff2954b1d2 [*] FO : Changed category block behavior inside categories 2013-10-31 12:20:59 +01:00
gRoussac 036fa7cba6 [-] FO : Fix bug #PSCFV-10889 wrong color when oos product 2013-10-31 10:18:28 +01:00
PhpMadman 7c1623c7fa [-] BO : Order-follow displayed order id instead of order reference 2013-10-29 14:53:50 +01:00
cedricfontaine 0ba8fbc39a Update stores.js 
Phone number is already in the address field
 2013-10-28 13:46:42 -04:00
Sarah Lorenzini 63141a9c4d [-] FO: fixed bug #PSCFV-10654 - TinyMCE editor: List of products by manufacturer, products by supplier - Long description is not hidden. 2013-10-28 14:48:48 +01:00
gRoussac e1d1479f22 [*] FO : Fix bug #PSCFV-10689 handle image legend 2013-10-27 23:31:36 +01:00