dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,123 Commits 9 Branches 19 Tags
855c8a8de4fe07afcba50089feb997fe033dcf62
Commit Graph
5403 Commits
Author SHA1 Message Date
djfm 5faaef9f21 // fixed a few untranslatable strings in CarrierWizard 2013-08-21 14:33:22 +00:00
Rémi Gaillard 600b027efd // fix root categories addition 2013-08-21 14:37:39 +02:00
Damien Metzger 65c6d86e6e // Fixed simple multistore process 2013-08-21 10:23:53 +02:00
Damien Metzger 3287e1664c // Added target blank in a transverse link 2013-08-21 10:18:46 +02:00
Damien Metzger 65becc8550 // Fixed typo 2013-08-21 10:10:52 +02:00
Kevin Granger 3005ca39f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js
 2013-08-21 09:14:10 +02:00
Kevin Granger 17be1e7528 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-20 16:40:14 +02:00
Kevin Granger 44655ecdef // breaking things 2013-08-20 16:38:31 +02:00
Jerome Nadaud 57d8d9c232 [-] BO : FixBug Preview product url 2013-08-20 15:34:00 +02:00
Damien Metzger 496db1d13e // Added automatic smarty cache clearing after catalog import (csv) 2013-08-20 10:45:55 +02:00
Jerome Nadaud 787bf75304 [-] BO : FixBug missing rows and cols attributes for textareas 2013-08-20 09:52:50 +02:00
Vincent Augagneur 8a0745e8de [-] BO : fixed bug #PSCFV-9782 - live edit bug with multistore 2013-08-19 17:21:03 +02:00
Damien Metzger 415ca83b62 // Code cleaning 2013-08-19 15:23:43 +02:00
Jerome Nadaud 8cd8ede1a5 [+] BO : Add Highlighted class for default list row 2013-08-19 13:31:23 +02:00
Jerome Nadaud 0aa908bd25 [+] BO : Products add fileset for informations and prices tab 2013-08-19 11:59:27 +02:00
Jerome Nadaud dc4978ff57 [-] BO : FixBug valuation and real quantity sort 2013-08-19 10:28:02 +02:00
Jerome Nadaud 13c5450ca1 [-] BO : FixBug sort bug on values count column 2013-08-19 09:50:01 +02:00
Rémi Gaillard 24ac8582bf [*] BO: Warehouse name is now displayed on each product line orders 2013-08-14 15:02:30 +02:00
Jerome Nadaud 6cff684af1 [-] BO : FixBug update received quantity in suply order 2013-08-14 14:38:10 +02:00
Damien Metzger cecaee8e68 [-] BO : Added comprehensive error display when prestashop cannot write the .htaccess file 2013-08-14 11:18:19 +02:00
Damien Metzger 7f3652bea0 [-] BO : Added comprehensive error display when prestashop cannot write the .htaccess file 2013-08-14 11:16:50 +02:00
gRoussac b22c2b28ec Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-14 10:29:24 +02:00
gRoussac 0bd04d9f3e [*] BO : Clear smarty cache when submitting SEO rules 2013-08-14 10:27:39 +02:00
Damien Metzger 7d0e0a7f38 // Removed useless Tools::safeOutput before insertion in the database 2013-08-13 18:21:23 +02:00
Jerome Nadaud 5e2a3e3c13 [+] BO : Modal module list 2013-08-13 15:22:18 +02:00
gRoussac e8685b1430 [*] BO : Add clear smarty cache button 2013-08-13 15:11:00 +02:00
Damien Metzger b1b636a911 // Added helpbox and fixed translation 2013-08-13 14:16:40 +02:00
Jerome Nadaud 1af9fdd1b2 [-] BO : Module list new action buttons 2013-08-13 12:28:07 +02:00
Rémi Gaillard 9c523cf7eb // Log for product deletion was missing 2013-08-13 10:21:01 +02:00
Vincent Augagneur da02895432 //fix carrier wizard with multistore part2 2013-08-13 10:10:27 +02:00
Vincent Augagneur 6cfde246a2 //fix carrier wizard with multistore 2013-08-13 10:09:19 +02:00
Vincent Augagneur e2e5fbe33a //now you can delete all carriers 2013-08-12 15:25:26 +02:00
Vincent Augagneur 30c9156a41 [-] BO : fixed bug #PSCFV-10091 - you can now enable all zone in one clic 2013-08-12 14:56:49 +02:00
Vincent Augagneur 627e3d8a77 [-] BO : fixed multistore thumbnail on product list 2013-08-12 11:27:25 +02:00
Vincent Augagneur 3664f4c394 //reorganization of shipping menus & options 2013-08-12 11:02:28 +02:00
Jerome NadaudandgRoussac 501cbea5aa [-] BO : FixBug root category listed after list reset 2013-08-09 18:45:40 +02:00
Jerome Nadaud c35d846f60 [-] BO : FixBug root category listed after list reset 2013-08-09 12:16:05 +02:00
Jerome Nadaud 75f0b38ff1 // Syntax error 2013-08-09 11:38:59 +02:00
Vincent Augagneur 1571dd60c8 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-09 10:44:24 +02:00
Vincent Augagneur 13be8db639 //added checkbox for all zones 2013-08-09 10:44:20 +02:00
gRoussac 16fec55c6f // report of https://github.com/PrestaShop/PrestaShop/commit/0023950c72c136ef623f53f2618aa97d02525e99 2013-08-08 12:16:19 +02:00
Rémi Gaillard cbdea59753 // revert 1c80b5fdfe 2013-08-08 11:50:35 +02:00
PrestaEdit 0023950c72 [-] BO: correct link in Block Discover. 2013-08-08 11:44:24 +02:00
gRoussac 5b3dda1cfb Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-08 11:05:37 +02:00
gRoussac 1c80b5fdfe [-] BO : list of carriers should only contain the active one in AdminProducts 2013-08-08 11:05:09 +02:00
Damien Metzger 4709f4a3c0 [-] MO : fixed module upgrade with common version number 2013-08-08 11:03:22 +02:00
gRoussac 5df213f5ae Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-07 15:06:50 +02:00
Rémi Gaillard d916e65a14 // missing return 2013-08-07 13:56:12 +02:00
Rémi Gaillard 6ccf3e839d // change passwd in cookie after changed it 2013-08-07 13:51:18 +02:00
gRoussac e43f0619ca Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-07 11:53:23 +02:00