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

2744 Commits

Author SHA1 Message Date
Vincent Augagneur 52abf62ae1 //dashactivity config 2013-11-12 17:33:54 +01:00
Vincent Augagneur c6e34ee229 //dashproducts added section in tpl 2013-11-12 14:43:08 +01:00
Vincent Augagneur 249bd5437d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-12 14:41:11 +01:00
Vincent Augagneur cf9da09f98 //remove unused smarty variable 2013-11-12 14:40:58 +01:00
alexey-svistunov 6f5c9044d3 Added changes from eb94b51 TMMeilleur/PrestaShop 2013-11-08 21:00:00 +02: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
djfm 1aadb10fb2 // English emails 2013-11-06 16:20:19 +00:00
Kevin Granger 05c71145c2 // dashboard 2013-11-06 12:14:49 +01:00
Rémi Gaillard 9fa4296a06 Merge pull request #929 from djfm/bootstrap 
// updated English emails: now responsive
 2013-11-06 01:38:44 -08:00
djfm f742e817da // updated English emails: now responsive 2013-11-05 18:10:31 +00:00
Rémi Gaillard 3edaee1313 // themeconfigurator 2013-11-05 19:07:42 +01:00
Rémi Gaillard 65a41a9f7a // theme configurator 2013-11-05 18:49:21 +01:00
Vincent Augagneur 871ebe77b6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 18:08:22 +01:00
Vincent Augagneur d27fe93daa //modules added ->bootstrap = true; 2013-11-05 18:08:01 +01:00
Damien Metzger a31dbeb68e // Fixed bootstrap mode for modules 2013-11-05 17:29:51 +01:00
Kevin Granger 332101614a // moved nv.d3.css to vendor directory 2013-11-05 17:15:36 +01:00
Vincent Augagneur f0e1b9b2b8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 16:32:12 +01:00
Vincent Augagneur 7e872aa581 //small fix 2013-11-05 16:32:05 +01:00
Damien Metzger 0bd6b940d2 // Fixed logoq 2013-11-05 16:17:14 +01:00
Damien Metzger 0e4a900d3d // Fixed group display 2013-11-05 16:13:52 +01:00
Damien Metzger 9a86f2c32b // And now it works! 2013-11-05 15:02:36 +01:00
Damien Metzger a5552f3f85 // Improved dashgoals configuration (tmp) 2013-11-05 14:44:42 +01:00
Vincent Augagneur 1a7aa020f6 //added new configuration on dashproduct 2013-11-05 10:23:26 +01:00
Jerome Nadaud de8bd97831 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 19:50:48 +01:00
Damien Metzger 8dc29b20f0 // Code cleaning and dashgoals improvements (part 1 - not finished yet) 2013-11-04 18:52:27 +01:00
Jerome Nadaud fa68e015b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 18:34:51 +01:00
Jerome Nadaud bf2d54e286 // Add new uploader helper to blockcategories 2013-11-04 18:32:59 +01:00
djfm 71e3a8a937 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 16:58:17 +00:00
djfm 5372f31b4c // updated English emails 2013-11-04 16:57:50 +00:00
Kevin Granger 68cda947ed // removed login.css 2013-11-04 16:53:43 +01:00
Damien Metzger d4a6148b64 // Anything but a 404 image 2013-11-04 16:09:55 +01:00
Damien Metzger 2e80ed8de5 // Cleaned conflict 2013-11-04 14:58:17 +01:00
Vincent Augagneur 5386a4547b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:57:50 +01:00
Damien Metzger 27273334e3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:47:16 +01:00
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
Damien Metzger cfeeda7d9b // Assigned compared products to smarty 2013-11-04 11:00:50 +01:00
Vincent Augagneur 02367e5396 //missing file for blockwishlist module 2013-11-04 10:42:37 +01:00
Vincent Augagneur 3de663f9a1 //missing files for module followup 2013-11-04 10:20:17 +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