dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,966 Commits 9 Branches 19 Tags
3cfe76ec0c6ba5bdea4fe9e974dde46331cc712d
Commit Graph

123 Commits

Author SHA1 Message Date
Jerome Nadaud
202c6fe463 // Carrier list size 2013-09-23 18:04:18 +02:00
Jerome Nadaud
7b06758e22 // Fix carrier header and button link 2013-09-16 17:23:01 +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
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
Vincent Augagneur
e2e5fbe33a //now you can delete all carriers 2013-08-12 15:25:26 +02:00
Vincent Augagneur
3664f4c394 //reorganization of shipping menus & options 2013-08-12 11:02:28 +02:00
jeromenadaud
550aa01faf [-] BO : FixBug #PSCFV-9859 Carriers free shipping inline edit 2013-08-01 15:14:14 +02:00
Vincent Augagneur
3814a8c735 [-] BO : fixed bug #PSCFV-9809 - carrier wizard tab access fix 2013-07-30 10:40:13 +02:00
Kevin Granger
613c9b66e5 // fix carriers 2013-07-29 16:51:03 +02:00
sLorenzini
243834ee17 // update shipping tab 2013-07-29 14:14:00 +02:00
Rémi Gaillard
c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
fram
ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
djfm
385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
DamienMetzger
e40d8616f8 [-] BO : improved error display on admincarriers #PSCFV-5660 2012-11-27 12:01:27 +01:00
DamienMetzger
ded3b0cd5e [-] BO : improved error display on admincarriers #PSCFV-5660 2012-11-27 12:01:27 +01:00
Rémi Gaillard
e3457836d8 [-] BO: Fix #PSCFV-5207 update of some fields on multishop with deleted property 2012-11-22 19:02:55 +01:00
Rémi Gaillard
a717e79a07 [-] BO: Fix #PSCFV-5207 update of some fields on multishop with deleted property 2012-11-22 19:02:55 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
rGaillard
3d6d183ee7 [-] BO: delete the carrier on the warehouse from the id_reference 2012-11-06 15:09:00 +00:00
rGaillard
5be92db59e [-] BO: delete the carrier on the warehouse from the id_reference 2012-11-06 15:09:00 +00:00
vAugagneur
065b2bc263 [-] BO : fixed bug #PSCFV-5355 - issue in Carrier::delete() and Carrier::cleanPositions() 2012-11-02 10:21:57 +00:00
vAugagneur
940ae7de5e [-] BO : fixed bug #PSCFV-5355 - issue in Carrier::delete() and Carrier::cleanPositions() 2012-11-02 10:21:57 +00:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
06e88dcdb7 [-] TR : #PSCFV-4027 : change string "tabs" by "Menus"... 2012-09-12 15:06:48 +00:00
lLefevre
5e8d172728 [-] TR : #PSCFV-4027 : change string "tabs" by "Menus"... 2012-09-12 15:06:48 +00:00
lLefevre
1da5ce07d4 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
lLefevre
12c69a6dc6 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
mDeflotte
23fe50a4cf [-] FO : #PSCFV-2993 #PSCFV-2811 - Default carriers and carrier sorting where ignored 2012-07-04 14:29:14 +00:00
mDeflotte
434c9b7398 [-] FO : #PSCFV-2993 #PSCFV-2811 - Default carriers and carrier sorting where ignored 2012-07-04 14:29:14 +00:00
mDeflotte
abf35f7839 [-] FO : #PSCFV-2993 #PSCFV-2811 - Default carriers and carrier sorting where ignored 2012-07-04 14:24:56 +00:00
mDeflotte
d3a4ceca1f [-] FO : #PSCFV-2993 #PSCFV-2811 - Default carriers and carrier sorting where ignored 2012-07-04 14:24:56 +00:00
vAugagneur
7661ea3869 //remove unused variable 2012-06-05 09:24:15 +00:00
vAugagneur
85a3e89dd8 //remove unused variable 2012-06-05 09:24:15 +00:00
vAugagneur
f65dd294db //added bulk action for enable or disable item 2012-06-04 12:00:09 +00:00
vAugagneur
b9e27705df //added bulk action for enable or disable item 2012-06-04 12:00:09 +00:00
vAugagneur
9909a8d075 [-] BO : fixed bug #PSCFV-2608 - carrier creation fail redirect 2012-05-29 12:24:09 +00:00
vAugagneur
7f19fcc91a [-] BO : fixed bug #PSCFV-2608 - carrier creation fail redirect 2012-05-29 12:24:09 +00:00
rMalie
b46daf1cae // Fix admin carriers multishop bug #PSCFV-2380 2012-05-18 15:44:46 +00:00
rMalie
c9e891e0a2 // Fix admin carriers multishop bug #PSCFV-2380 2012-05-18 15:44:46 +00:00
lLefevre
3ddf7259a2 [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 2012-05-14 14:38:07 +00:00
lLefevre
9925bf30ad [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 2012-05-14 14:38:07 +00:00
vAugagneur
53f35dcadc //fixed bug #PSCFV-642 2012-04-26 09:35:50 +00:00