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

75 Commits

Author SHA1 Message Date
Jerome Nadaud d6df601d0e // Preferences identrifer names 2013-11-12 11:55:54 +01:00
Kevin Granger 889a2006ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customer_threads/message.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/favorites.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
	admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/combinations.tpl
	admin-dev/themes/default/template/controllers/products/images.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/referrers/helpers/view/view.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/ProductSale.php
	classes/helper/HelperList.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminCustomersController.php
	controllers/admin/AdminMetaController.php
	controllers/admin/AdminModulesController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminProductsController.php
	controllers/front/ParentOrderController.php
	install-dev/theme/views/welcome.phtml
	modules/blocknewproducts/blocknewproducts.php
	modules/blocktopmenu/blocktopmenu.php
	modules/importerosc/importerosc.php
	modules/mailalerts/mailalerts.php
	modules/shopimporter/shopimporter.php
	modules/statsstock/statsstock.php
	themes/default/css/product_list.css
 2013-11-04 14:43:01 +01:00
gRoussac 80c60be952 [-] BO : Do not enable rewrite url for index 2013-10-31 16:20:55 +01:00
Jerome Nadaud f336cc599b // Btn-primary replacement 2013-10-21 18:56:41 +02:00
gRoussac 50002ec714 [-] FO : Fix #PSCFV-10690 again, change just on directories 2013-10-14 14:23:26 +02:00
gRoussac c6e3e28894 [-] FO : Fix bug #PSCFV-10690 could not index a category beacause of robot.txt 2013-10-14 14:20:11 +02:00
Jerome Nadaud 38d565110f // List header fix 2013-09-18 17:23:22 +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
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
Damien Metzger 496db1d13e // Added automatic smarty cache clearing after catalog import (csv) 2013-08-20 10:45:55 +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 0bd04d9f3e [*] BO : Clear smarty cache when submitting SEO rules 2013-08-14 10:27:39 +02:00
Sarah Lorenzini ca253bcda2 // update preferences tab 2013-07-31 17:43:48 +02:00
Axome c8f3985347 [-] BO : remove "utm_*" rules preventing Google services from indexing the shop 
Google shopping refuses all products having their URL blocked by the robots.txt file
 2013-06-21 17:22:03 +02:00
Vincent Augagneur 12872fea65 [-] BO - fixed bug #PSCFV-9071 - PS_SHOP_DOMAIN and PS_SHOP_DOMAIN_SSL have not updated after updated Shop domain and SSL domain from Preferences > SEO & URLs 2013-06-10 10:47:57 +02:00
Damien Metzger 5fab6394ef // Added SEO warning for accented chars in URL 2013-04-05 09:55:18 +02:00
fram 77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Rémi Gaillard fd23b5e862 // typo fix 2013-03-12 11:03:30 +01:00
Damien Metzger 2890e439b5 [*] BO : the option for accented URLs is now available in the backend 2013-02-14 09:15:01 +01:00
Rémi Gaillard f5cf54ef3b [*] BO: Add an option to htaccess generator to disable mod_security (some rules reject ajax file upload) 2013-02-12 11:35:10 +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 be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur f94d51181c //added configuration to enable or disable accented char in URL 2012-11-09 12:56:15 +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 84508ccc41 // Fix #PSCFV-4566 2012-10-01 15:49:16 +00:00
dMetzger 204e7891e8 // Back office optimization begun (memory & SQL) and will resume tomorrow 2012-09-26 17:52:27 +00:00
vAugagneur 1990311d6b [-] BO : fixed bug #PSCFV-4355 2012-09-26 12:55:34 +00:00
rGaillard ae8ada069e // Small fix 2012-09-13 09:21:08 +00:00
rGaillard 7b8afaedb7 // Fix #PSCFV-4035 2012-09-13 09:20:27 +00:00
lLefevre 5e8d172728 [-] TR : #PSCFV-4027 : change string "tabs" by "Menus"... 2012-09-12 15:06:48 +00:00
rGaillard 3dd1222d18 // Small fixes 2012-09-11 14:01:50 +00:00
dMetzger 2bdf0af13c // Fixed AdminMeta in multishop 2012-08-28 14:35:15 +00:00
dMetzger c9628f45b2 // Pages excluded for GoogleBot must be for everyone #PSCFV-3674 2012-08-20 09:00:25 +00:00
fBrignoli ab1fa12f0e [-] FO : Bug Fixed #PSCFV-3407 - Only index page allows an empty url_rewrite 2012-07-31 08:40:16 +00:00
lLefevre 12c69a6dc6 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
lLefevre bb57f166af [-] BO : fix #PSCFV-3070 2012-07-05 15:40:40 +00:00
lLefevre 1d9c36eaac [-] BO : fix #PSCFV-2983 : add iso_code in URI's for robots.txt 2012-07-03 09:46:06 +00:00
aFolletete 0839cddc50 [-] BO : fixed bug on SEO & URLs page 2012-06-07 09:59:28 +00:00
vAugagneur 2b0e981ba2 [-] BO : fixed bug #PSCFV-2324 - Genertating roobots.txt in BO not working 2012-05-15 06:46:34 +00:00
lLefevre 9925bf30ad [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 2012-05-14 14:38:07 +00:00
vAugagneur d1e19ad464 [-] BO : fixed bug #PSCFV-2304 2012-05-14 12:56:33 +00:00
rMalie 522d7cc950 // Multishop interface reworked 2012-05-09 15:05:39 +00:00
rMalie f663275d27 [+] BO : Module controllers can now create custom rewrite in SEO page 2012-04-27 13:36:31 +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
mDeflotte 69afa5719d // Blocklayered: Add layered route rule customization 2012-03-29 16:10:41 +00:00