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

65 Commits

Author SHA1 Message Date
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Jerome Nadaud
56f27ae2c1 // Some missing icons and multistore problems 2013-09-25 19:00:29 +02:00
Jerome Nadaud
64f1ba1e08 // Parameters fix 2013-09-18 16:36:33 +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
gRoussac
54f7c65165 [-] BO : Display the old image system migration tool if product images are in _PS_PROD_IMG_DIR_ 2013-09-09 12:20:38 +02:00
gRoussac
6b03af9ef9 [-] BO : ini_get('safe_mode') can return false 2013-09-08 22:26:21 +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
Damien Metzger
415ca83b62 // Code cleaning 2013-08-19 15:23:43 +02:00
Kevin Granger
9f11ecfd78 // Add label attributes for, refacto browse file 2013-08-02 18:46:37 +02:00
Sarah Lorenzini
680497f1e3 // update preferences tab 2013-08-01 16:40:48 +02:00
Kevin Granger
5defc39def [+] BO Images / Marketing / Spe. Prices Rules 2013-08-01 14:42:43 +02:00
Jérôme Nadaud
1199ad8cf2 [-] BO : FixBug #PSCFV-6365 Missing message confirmation for Images modification in Preferences > Images 2013-07-17 10:51:34 +02:00
Damien Metzger
ff876034b4 // Fixed display of the image option "legacy system" 2013-06-14 09:57:00 +02:00
Damien Metzger
7a76b8b6a0 // Removed deprecated block for new installs 2013-04-25 09:03:32 +02:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
vAugagneur
7e4897034d //BO more compliant with 1024x768 2013-01-14 14:24:05 +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
Damien Metzger
45bca9a189 [-] BO : fixed image settings form #PSCFV-5458 2012-12-26 10:07:56 +01:00
DamienMetzger
f973d2e3e4 [-] BO : image regeneration now gives a better reporting and crash less #PSCFV-5519 2012-11-22 15:15:43 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
6be1f6e618 [-] BO : added more details when fail to regenerate thumbnails 2012-11-08 13:55:33 +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
dMetzger
5752c49f5b // Added some informations in Image type listing 2012-09-25 08:38:17 +00:00
lLefevre
5e8d172728 [-] TR : #PSCFV-4027 : change string "tabs" by "Menus"... 2012-09-12 15:06:48 +00:00
fBrignoli
f93f913cfb [-] MO : Watermark - Bug Fixed #PSCFV-2770 - Watermark is not working 2012-07-25 09:30:56 +00:00
lLefevre
12c69a6dc6 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
lLefevre
0129e7314a [-] FO : #PSCFV-67 : Translation english updated and english keys update in all languages 2012-05-15 10:04:43 +00:00
lLefevre
83703dc4ee [-] FO : #PSCFV-2151 : Translations of errors are connected width sprintf() 2012-05-14 11:45:41 +00:00
rMalie
e580832934 // Use protected instead of private for classes we can override #PSCFV-1976 2012-04-26 08:55:55 +00:00
tDidierjean
ba2abcd990 // Rename fieldsDisplay to fields_list part2 (timeout) 2012-03-29 16:29:31 +00:00
tDidierjean
e0664df6f8 // Renaming options to fields_options 2012-03-29 16:14:14 +00:00
lLefevre
4f86c0d0ac // Fix replace \\" by " in english keys and change french keys for errors files 2012-03-15 08:31:12 +00:00
lLefevre
74cd81a66c // Fix replace //" by " in english keys and change french keys 2012-03-14 17:25:41 +00:00
lLefevre
05c2b696ce // revert to revision 14160 2012-03-14 15:05:13 +00:00
lLefevre
6608328a2a // Fix replace \\" by " in english keys 2012-03-14 14:58:48 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
rMalie
ec80336fda [*] BO : reorganization of admin tabs 2012-03-02 14:44:07 +00:00
tDidierjean
f7abe1e885 [-] BO : fix image option form not saving 2012-02-28 09:55:57 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mMarinetti
677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00
rMalie
2ca3b2b029 // Normalize 2012-01-25 16:48:14 +00:00
rMalie
f08ce5cb8b [*] Classes : images.inc.php functions are now all deprecated, use the new class ImageManager instead 2012-01-23 10:21:51 +00:00
rMalie
eee9b353c1 [-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376 2012-01-19 10:14:10 +00:00
tDidierjean
88b3c8f9e7 // Refactor AdminController::_errors to errors 2012-01-11 08:58:12 +00:00
lLefevre
431a99334b [-] BO : delete id_theme in Image Type 2012-01-09 16:04:34 +00:00
vKham
8116086ff6 // fix form extensible page preference 2011-12-30 16:09:03 +00:00
rGaillard
98cd53f43b //Little fix 2011-12-22 23:03:13 +00:00
rGaillard
d4b090972a //Small change 2011-12-22 22:41:21 +00:00