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
1863 Commits
Author SHA1 Message Date
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 NadaudandFrancois Gaillard 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
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
Jerome Nadaud 3f3dc0feb9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-05 16:39:12 +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
Rémi Gaillard 6ef7f258ea // small fix 2013-11-04 10:34:58 +01:00
Jerome Nadaud 2be72f50d1 [-] FO : FixBug Categories description 2013-11-04 10:29:44 +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