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

2706 Commits

Author SHA1 Message Date
Kevin Granger 92bd59fbea Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:43:10 +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
Vincent Augagneur e03a86ad05 //homeslider new use bootstrap design 2013-11-04 10:01:29 +01:00
gRoussac c7323c2bfe [-] CORE : Fix bug #PSCFV-10901 warnings on htmlentities 2013-11-03 22:59:04 +01:00
Rémi Gaillard 95b5036782 // addsharethis cache 2013-11-02 15:41:40 +01:00
Jerome Nadaud 9193a29a44 [+] MO : Blockcart - Add error handler on ajax function 2013-10-31 19:02:43 +01:00
Rémi Gaillard dc90450365 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-31 16:39:21 +01:00
Rémi Gaillard a7ed5ee869 // cleaning 2013-10-31 16:39:01 +01:00
Damien Metzger 3c1cdf4ef2 // Fixed new arrivals issue 2013-10-31 16:09:10 +01:00
Damien Metzger 9a1b45a8e6 // Fixed warning and prepared next commit 2013-10-31 15:09:14 +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
Rémi Gaillard b9ad576fb0 // -> mailsrc branch 2013-10-30 15:02:06 +01:00
Damien Metzger c7fe91a0a9 // Fixed traffic sources chart on dashboard 2013-10-29 16:38:40 +01:00
Damien Metzger 34aaeee0b5 // Fixed product images on the dashboard 2013-10-29 16:17:40 +01:00
djfm 0288696c90 // English 2013-10-29 14:37:55 +00:00
Damien Metzger 4fe4d71361 // Stats cleaning 2013-10-29 15:29:55 +01:00
Damien Metzger f06eb84d9f // Stats cleaning 2013-10-29 14:36:27 +01:00
Damien Metzger dabb23ac8d // Added KPIs to the category page and fixed dashboard data 2013-10-29 11:03:09 +01:00
Jerome Nadaud 9f2580f3bd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-29 10:31:12 +01:00
Jerome Nadaud d2e475dd3a // Removed line from merge 2013-10-29 10:30:59 +01:00
Gregory Roussac b885c63564 Merge pull request #900 from kpodemski/patch-10 
[*] MO: productcomments optimization
 2013-10-29 02:06:56 -07:00
Gregory Roussac d74291e5b5 Merge pull request #901 from kpodemski/patch-11 
[*] MO: blocksharefb optimization
 2013-10-29 02:06:25 -07:00
Jerome Nadaud 1d90218e0d // Update mailalert module version 2013-10-29 10:00:57 +01:00
Jerome Nadaud 9660cef0aa [-] MO : mailalert - Fix deprecated warning on displayDate 2013-10-29 09:58:42 +01:00
gRoussac 0aca1d4a67 [*] BO : AdminProducts find smallest images 2013-10-29 08:47:41 +01:00
Krystian Podemski 526f32b6a0 [*] MO: blocksharefb optimization 2013-10-28 23:24:32 +01:00
Krystian Podemski faa4a18a82 [*] MO: productcomments optimization 2013-10-28 23:21:35 +01:00
Gregory Roussac 12a257db7a Merge pull request #898 from Jacky75/blulab20131028-slider-virtualuri 
[-] MO : homeslider stores slider about multistore with virtual uri
 2013-10-28 06:53:41 -07:00
Daniele Giachino c84689ec71 homeslider stores slider about multistore with virtual uri 2013-10-28 14:09:35 +01:00
Damien Metzger 0aea146a4c // Code cleaning stats modules 2013-10-28 13:39:39 +01:00
djfm 4f8d153469 // fixed links in new English mails 2013-10-28 08:57:59 +00:00
djfm 38f45e3b2c Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-28 08:49:24 +00:00
gRoussac c5c861b59e [-] MO : Blockwishlist no product image when id_product_attribute is defined, thanks @Broceliande 2013-10-27 13:28:34 +01:00
gRoussac 4c484afda1 [-] MO : Fix bug #PSCFV-10841, blockcart hides on product page when last product is removed from cart 2013-10-25 17:37:32 +02:00
Sarah Lorenzini a49cc68b72 // news design sendtoafriend mails template 2013-10-25 15:01:05 +02:00
Sarah Lorenzini f73716f902 // new design for referralprogram mails template 2013-10-25 14:56:34 +02:00
djfm 3a749823bb // small fixes in English Email php templates 2013-10-25 12:29:39 +00:00
gRoussac 942d3c7151 [-] MO : Fixbug #PSCFV-10679 dateofdelivery PDF invoice array and array 2013-10-25 00:01:25 +02:00
gRoussac 1e094f4016 [-] FO: Fix bug #PSCFV-10623 blocknewproducts shows products when PS_NB_DAYS_NEW_PRODUCT == 0 2013-10-24 23:29:23 +02:00
gRoussac 4cd3e1b830 [-] FO: Fix bug #PSCFV-10230, Blockspecials still caching when files cache limit is 0 2013-10-24 21:59:32 +02:00
Damien Metzger cd5fa81025 // Fixed boulette 2013-10-24 19:29:22 +02:00
Jerome Nadaud 6f57093f50 [-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security 2013-10-24 18:36:36 +02:00
Rémi Gaillard cc3363011e // rewrited urls for feeder module 2013-10-24 17:54:44 +02:00
Damien Metzger f6dd4a9ee4 // Code review 2013-10-24 17:49:18 +02:00
Sarah Lorenzini 1a7f9e6c11 // new design for blockwishlist mails template 2013-10-24 17:35:37 +02:00
Sarah Lorenzini 005a57b077 // new design for blocknewsletter mails template 2013-10-24 17:28:37 +02:00
Vincent Augagneur 6a552be7dd //followup now use bootstrap design 2013-10-24 17:23:40 +02:00
Vincent Augagneur f82322e426 //typo 2013-10-24 16:51:55 +02:00
Damien Metzger 2931c20914 // Fixed rounding 2013-10-24 16:38:48 +02:00