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

47 Commits

Author SHA1 Message Date
Jerome Nadaud b9ccfe858b // Localization Bootstrap design 2013-09-26 11:36:28 +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
Jerome Nadaud c502c9766f [-] BO : FixBug PSCFV-10331 - Tax rules Pagination 2013-09-09 15:04:14 +02:00
Rémi Gaillard 6059b4301a // states list 2013-09-02 17:10:20 +02:00
Rémi Gaillard 51083e17af // 2013-08-29 17:18:05 +02:00
Rémi Gaillard c736c28ab5 // small ajax.php clean 2013-08-29 11:47:11 +02:00
Kevin Granger ff16de05de // fix, design and fun ! 2013-08-06 19:06:56 +02:00
Sarah Lorenzini 816153687c // update localization tab 2013-07-30 12:25:20 +02:00
Kevin Granger 40f03d0ba1 [+] BO: Form components 2013-06-18 21:03:43 +02:00
Rémi Gaillard 679b45b5bd [-] BO: pagination was missing on tax rules listing 2013-02-25 14:50:23 +01:00
Rémi Gaillard 31e3882d82 [-] BO: pagination was missing on tax rules listing 2013-02-25 14:50:23 +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
vAugagneur 768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +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
lLefevre 946dd2caf7 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre ece74e27c2 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre 04fc63c2b6 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00:00
lLefevre 07ca3c5258 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +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 9239de5dac [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
lLefevre f6297b081d [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
lLefevre 2c129a8db1 [-] BO : #PSCFV-731 : change type int by string for zipcode_from and zipcode_to 
&& check this zip codes
 && display errors
 && normalize
 2012-05-10 15:50:44 +00:00
lLefevre aff0019b48 [-] BO : #PSCFV-731 : change type int by string for zipcode_from and zipcode_to 
&& check this zip codes
 && display errors
 && normalize
 2012-05-10 15:50:44 +00:00
tDidierjean b2e056ec8b [*] BO : #PSFV-481 - Refactor HelperList position management 2012-03-13 16:22:23 +00:00
tDidierjean eb8447eb2a [*] BO : #PSFV-481 - Refactor HelperList position management 2012-03-13 16:22:23 +00:00
tDidierjean b89bf6c8d7 // AdminTaxRules tpl refactoring 2012-03-08 17:43:49 +00:00
tDidierjean 1ce0d6243a // AdminTaxRules tpl refactoring 2012-03-08 17:43:49 +00:00
rMalie 14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie 1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mMarinetti 1c288bf01d // Welcome 2012 2012-02-22 09:28:22 +00:00
mMarinetti 677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00
fBrignoli 1e1082d2b9 [-] BO : Bug Fixed #PSTEST-546 - Tax Rules Creation 2012-02-21 08:48:52 +00:00
fBrignoli f78483a8e0 [-] BO : Bug Fixed #PSTEST-546 - Tax Rules Creation 2012-02-21 08:48:52 +00:00
fBrignoli 4bf2700d78 [-] BO : Bug Fixed #PSTEST-543 - Unable to bulk delete a tax rule 2012-02-16 15:06:34 +00:00
fBrignoli 94d45049d0 [-] BO : Bug Fixed #PSTEST-543 - Unable to bulk delete a tax rule 2012-02-16 15:06:34 +00:00
tDidierjean 3a30f788ac // Move all helper override templates for controllers to subfolders 2012-02-06 18:12:15 +00:00
tDidierjean 597e921d96 // Move all helper override templates for controllers to subfolders 2012-02-06 18:12:15 +00:00
tDidierjean a94c3b98d8 // Rename template/helper to template/helpers 2012-02-06 16:35:49 +00:00
tDidierjean e73990a61c // Rename template/helper to template/helpers 2012-02-06 16:35:49 +00:00
tDidierjean e2dbac517f // Move controller templates to subfolder controllers/ 2012-01-09 17:23:42 +00:00
tDidierjean b1e9cedf42 // Move controller templates to subfolder controllers/ 2012-01-09 17:23:42 +00:00