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

89 Commits

Author SHA1 Message Date
Jerome Nadaud
8d1765f2df Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	controllers/admin/AdminCategoriesController.php
 2013-10-25 14:29:02 +02:00
Jerome Nadaud
bff1ad8833 // Some changes to integrate uploader helper 2013-10-25 14:20:42 +02:00
Damien Metzger
087d0d8206 // Fields resizing 2013-10-25 11:25:13 +02:00
Jerome Nadaud
6275e7bcad // Remove translations on icon class 2013-10-21 09:57:13 +02:00
Jerome Nadaud
964f546b0b // Update image when updated 2013-10-18 17:41:36 +02:00
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Jerome Nadaud
6f2358a0da // Manufacturer view bootstraped 2013-10-07 14:16:41 +02:00
Jerome Nadaud
dd79b3c702 // Manufacturer bootstraping 2013-10-02 09:43:46 +02:00
Kevin Granger
8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.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/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
 2013-09-30 11:01:23 +02:00
Jerome Nadaud
f44ecb9fc8 // Products section list adjustment 2013-09-20 16:19:50 +02:00
gRoussac
f293562ea4 [-] BO : Fix bug #PSCFV-8214 import entity pre selected 2013-09-18 15:03:16 +02:00
Jerome Nadaud
5e2aa392da // Some fix 2013-09-13 15:40:51 +02:00
Jerome Nadaud
97ec6341e8 [-] BO ; Fix bug #PSCFV-10393 manufacturer filter 2013-09-13 15:39:30 +02:00
Kevin Granger
c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
 2013-09-13 11:41:14 +02:00
gr4devel
805e80e54c [+] BO : add TinyMCE editor for short and long descrpition in AdminManufacturerController 2013-08-30 21:24:21 +02:00
Jerome Nadaud
62b4a3cd5e [+] BO : Page header toolbar 2013-08-27 18:42:24 +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
Jerome Nadaud
787bf75304 [-] BO : FixBug missing rows and cols attributes for textareas 2013-08-20 09:52:50 +02:00
Jerome Nadaud
95f775daa1 [+] BO : Catalog Bulk actions 2013-08-07 10:52:23 +02:00
jeromenadaud
114eb3b78b [-] BO : FixBug Manufacturer multilist pagination, filter, order problems and manufacturer address filter exception 2013-08-05 16:32:39 +02:00
Damien Metzger
e80364984a // Fixed manufacturers addresses export 2013-07-26 10:36:41 +02:00
Kevin Granger
72b046d5f0 [+] BO Manufacturers 2013-07-26 10:21:23 +02:00
Kevin Granger
9308c5c527 no message 2013-07-25 19:18:54 +02:00
Kevin Granger
77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
 2013-07-24 17:01:23 +02:00
Kevin Granger
9d16eb1d1b // BO fix + work on helpers + compass/codekit config 2013-07-22 16:43:16 +02:00
Jérôme Nadaud
421c199e1f [-] BO : FixBug #PSCFV-8229 Default country value set to manufacturer country 
Default country value set to manufacturer country
Click on manufacturer address line now redirect to manufacturer address
edition
 2013-07-17 15:13:34 +02:00
Rémi Gaillard
ec3095ac32 [-] BO: Fix manufacturer addresses duplication #PSCFV-9601 2013-06-28 10:18:49 +02:00
Damien Metzger
5493010e67 [-] BO : postcode required in manufacturer address 2013-06-14 10:25:37 +02:00
vAugagneur
3d6d97af5f [*] BO : added new button on manufacturers view 2013-04-22 14:56:59 +02:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Rémi Gaillard
e3e38b19e1 [*] BO: you can now export listing of some tabs in CSV 2013-02-13 16:15:37 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
ae7569bde3 [-] BO : added import button on listing 2012-12-10 10:14:03 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
b2d0101bf3 [-] BO : fixed bug #PSCFV-5155 2012-10-30 15:10:17 +00:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
rGaillard
d9b2fabd5b // Fix #PSCFV-4452 2012-09-27 14:30:35 +00:00
vAugagneur
65f811916a [-] BO : fixed bug #PSCFV-3437 2012-08-03 08:30:04 +00:00
lLefevre
12c69a6dc6 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
vAugagneur
85a3e89dd8 //remove unused variable 2012-06-05 09:24:15 +00:00
lLefevre
daa263cd1f [-] BO : fix #PSCFV-2544 : delete selected manufacturers 2012-05-24 15:25:05 +00:00
fBrignoli
ea5858f755 [-] BO : Bug fixed #PSCFV-2474 - Missing shop association when creating a manufacturer with a logo 2012-05-21 13:23:49 +00:00
vAugagneur
d1e19ad464 [-] BO : fixed bug #PSCFV-2304 2012-05-14 12:56:33 +00:00
rMalie
e580832934 // Use protected instead of private for classes we can override #PSCFV-1976 2012-04-26 08:55:55 +00:00
rMalie
009e190263 // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
tDidierjean
ba2abcd990 // Rename fieldsDisplay to fields_list part2 (timeout) 2012-03-29 16:29:31 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
tDidierjean
e462d968f0 // rename $toolbar_fix to $toolbar_scroll part2 2012-02-28 17:39:40 +00:00