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

35 Commits

Author SHA1 Message Date
Damien Metzger
9c54dcce66 // Fixed default stats graph engine 2013-10-28 12:15:35 +01:00
Kevin Granger
67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	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/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
 2013-10-14 12:21:29 +02:00
Rémi Gaillard
3b677092bf [*] FO: You can now choose the anchor separator for attributes 2013-10-09 11:01:18 +02:00
Damien Metzger
c51fe5b22d // Changelog 1.5.6.0 2013-10-07 18:07:25 +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
Vincent Augagneur
1481dc0f5f //added PS_DASHBOARD_USE_PUSH in install 2013-09-05 16:03:14 +02:00
Damien Metzger
7a429cd3ea // Version number 2013-08-28 10:00:29 +02:00
gRoussac
a69d1c6d05 Merge branch 'smarty_debug' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-smarty_debug 
Conflicts:
	controllers/admin/AdminPerformanceController.php
	install-dev/data/xml/configuration.xml
 2013-08-06 10:42:44 +02:00
Rémi Gaillard
63993a425b [-] BO: You can now disable the email sent after account creation 2013-05-03 17:01:12 +02:00
Damien Metzger
9dd5bd4098 [-] MO : fixed bugs on RSS modules 2012-12-26 11:32:59 +01:00
Rémi Gaillard
87798d1193 // small fix 2012-12-12 16:18:48 +01:00
Jonathan Danse
edd6bf7b7e [+] Project: add the possibility to change the default color (#db3484) 
Let the user set the default color in the mail with a color picker (configuration set in Back Office, Themes)
 2012-12-03 16:11:43 +01:00
dMetzger
7f4097a4bd [-] FO : fixed geolocation issue (which caused some unexpected cart reset) 2012-11-13 15:25:29 +00:00
dMetzger
43d3af7246 [-] FO : removed deprecated configuration var "PS_VOUCHERS" #PSCFV-5240 
// Removed useless DOS protection
 2012-11-13 13:56:21 +00:00
dMetzger
a488d9f4f2 // Changed default address 2012-10-02 07:22:28 +00:00
dMetzger
84b0aa79b2 // Changed image system to new default + #PSCFV-4068 2012-09-24 09:08:57 +00:00
vAugagneur
48be553d25 [+] FO : now you can choose if at least on phone number is required 2012-09-21 09:25:17 +00:00
dMetzger
6817e7ff7c // And wrapping and recyclable package (too much feature at the install is not good) 2012-09-13 15:24:54 +00:00
dMetzger
0551c30b9f // Changed default value for guest checkout and one page checkout 2012-09-13 15:23:54 +00:00
lLefevre
91b20bb9b8 [-] BO : theme mobile : #PSCFV-3880 : Now you have 4 options for enable the theme mobile 2012-09-06 15:57:20 +00:00
vAugagneur
1f73e725c8 [-] BO : fixed bug #PSCFV-2958 2012-08-08 09:57:47 +00:00
dMetzger
1d28a143e7 // Changed default limit of file upload 2012-06-07 07:43:30 +00:00
vAugagneur
c50d04ad41 //small fix on advertising module link 2012-05-22 07:17:08 +00:00
rMalie
009e190263 // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
rMalie
54399f9602 // Fix duplicate entries in configuration during install process #PSTEST-916 #PSTEST-917 2012-03-06 13:29:20 +00:00
aFolletete
b493988a3c // Update installer version 2012-03-06 09:48:03 +00:00
vChabot
41e19149c7 [-] MO : BugFix : max level-depth is now set to 4 (instead of 3 before, as the new root category has come) 2012-03-05 14:25:08 +00:00
vChabot
c4572c9921 // id_category_default is now for multishop 2012-02-27 13:53:52 +00:00
aFolletete
7ac8bf9385 // Update installer 2012-02-22 17:25:04 +00:00
aFolletete
de7ab865aa // update installer for 1.5.0.6 version 2012-02-15 13:27:06 +00:00
mDeflotte
375bb8eaac // Fix bug with new logo working 2012-02-07 15:30:23 +00:00
mDeflotte
a7726c4cda // Add missing install/upgrade configuration values 2012-02-07 10:19:20 +00:00
mDeflotte
74c779f3ae [-] BO : #PSTEST-667 - Fix bug with logo and multishop 2012-02-07 09:20:01 +00:00
dMetzger
ba689d2b6d // Updated version in the installer 2012-02-06 14:19:58 +00:00
mMarinetti
c6376aa861 // install-new renamed to install-dev 2012-01-26 17:35:54 +00:00