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

93 Commits

Author SHA1 Message Date
Francois Gaillard
77b2b4b6ca // Manual merge PS 1.5.6.0 2013-10-07 18:22:55 +02:00
Damien Metzger
c51fe5b22d // Changelog 1.5.6.0 2013-10-07 18:07:25 +02:00
djfm
b6bba0c787 [*] LO : Removed 'Miss' from the default genders because too country specific 2013-10-07 07:53:19 +00:00
thoma202
eb7655e318 [+] Added hook in maintenance page 2013-10-02 11:58:35 +02:00
Damien Metzger
ae8c8218fd // Fixed ISO code of japanese todōfuken 2013-09-25 15:30:16 +02:00
Damien Metzger
7a429cd3ea // Version number 2013-08-28 10:00:29 +02:00
Vincent Augagneur
bae9df61dc //revert reorganization of shipping menus & options 2013-08-12 15:15:17 +02:00
Vincent Augagneur
6befd831c9 //small install fix 2013-08-12 11:10:12 +02:00
Vincent Augagneur
3664f4c394 //reorganization of shipping menus & options 2013-08-12 11:02:28 +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
c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
Jérôme Nadaud
abf874d576 [-] BO : FixBug #PSCFV-9049 Bad actionOrderSlipAdd hook description 2013-07-19 16:30:04 +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
Francois Gaillard
9b74349f71 // Default carrier groups updated 2013-03-25 12:13:53 +01:00
vAugagneur
ecfb24dad4 [+] CORE : added new hook actionModuleInstallBefore and actionModuleInstallAfter 2013-03-20 17:28:51 +01:00
Gregory Roussac
d758801752 [-] INSTALLER : Fix crash from genders jpg copy 2013-03-06 21:16:24 +01:00
Francois Gaillard
c8c218a6a6 // Order confirmation meta data installation fixed 2013-02-25 10:05:40 +01:00
vAugagneur
d6f5566e65 [+] BO : added new marketing tab 2013-02-13 09:57:30 +01:00
vAugagneur
973c8d8d4f [-] CORE : order state preparation now generate delivery slip 2013-02-05 10:15:53 +01:00
Damien Metzger
bf9b1de873 // Fixed hook names 2013-01-30 16:03:37 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01: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
Vincent Augagneur
ebff913250 Merge pull request #69 from PrestaEdit/mails 
[+] Project: add the possibility to change the default color (#db3484)
 2012-12-12 06:59:04 -08:00
vAugagneur
bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Rémi Gaillard
131f99eb69 [-] Core: send email when payment is remotly accepted #PSCFV-6064 2012-12-10 15:57:59 +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
vAugagneur
72464dc9b7 [-] BO : fixed bug #PSCFV-5743 - modify status Preparation in progress and remove the delivery flag 2012-11-28 18:52:01 +01:00
DamienMetzger
5dfa888b6f [-] Installer : name of the supplier page fixed #PSCFV-5571 2012-11-22 15:28:00 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +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
lLefevre
ece74e27c2 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre
07ca3c5258 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +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
lLefevre
f6297b081d [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
lLefevre
35143844a7 // Added state on the address format for more countries (JP, AR, ID, MX) 2012-10-03 07:32:38 +00:00
dMetzger
a488d9f4f2 // Changed default address 2012-10-02 07:22:28 +00:00
dMetzger
00e659c4f2 // Browsers and OS updated 2012-09-28 15:09:10 +00:00
dMetzger
84b0aa79b2 // Changed image system to new default + #PSCFV-4068 2012-09-24 09:08:57 +00:00
sLorenzini
4896b787f3 // Renamed images types for the default theme (in order to avoid conflicts) #PSCFV-4242 2012-09-21 14:59:51 +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
5e8d172728 [-] TR : #PSCFV-4027 : change string "tabs" by "Menus"... 2012-09-12 15:06:48 +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
rGaillard
05305ab821 // Fix addresses format 2012-08-23 08:49:33 +00:00
vAugagneur
1f73e725c8 [-] BO : fixed bug #PSCFV-2958 2012-08-08 09:57:47 +00:00
rGaillard
193aa5602d [*] Core: you can now associate modules to order states in order to add extra mail vars 2012-07-31 09:18:41 +00:00