Marion Muszynski
|
63fcc839e3
|
Merge branch 'ticket-10657-PhileaMulti' into develop
|
2016-11-21 12:56:37 +01:00 |
|
Marion Muszynski
|
c2b5077efe
|
fix
|
2016-11-21 12:56:12 +01:00 |
|
Marion Muszynski
|
894de500bc
|
Merge branch 'ticket-10657-PhileaMulti' into develop
|
2016-11-21 12:45:36 +01:00 |
|
Marion Muszynski
|
66bdae1aef
|
prevent combination of sale exp classic and sale exp before noel
|
2016-11-21 12:45:20 +01:00 |
|
Marion Muszynski
|
a10aceb571
|
Merge branch 'ticket-10657-PhileaMulti' into develop
|
2016-11-18 17:27:12 +01:00 |
|
Marion Muszynski
|
f5a841a2f1
|
adjust for exp Noel
|
2016-11-18 17:26:53 +01:00 |
|
Marion Muszynski
|
218aac655a
|
Merge branch 'ticket-10657-PhileaMulti' into develop
|
2016-11-18 12:24:54 +01:00 |
|
Marion Muszynski
|
d9fbfc438a
|
small fix
|
2016-11-18 12:24:37 +01:00 |
|
Marion Muszynski
|
bafe19b48c
|
Merge branch 'ticket-10657-PhileaMulti' into develop
|
2016-11-18 12:11:58 +01:00 |
|
Marion Muszynski
|
9836172e29
|
addition of privatesales_shipping module
|
2016-11-18 12:11:41 +01:00 |
|
Marion Muszynski
|
3f7d969371
|
Merge branch 'ticket-10657-PhileaMulti' into develop
|
2016-11-18 12:09:17 +01:00 |
|
Marion Muszynski
|
58dbc97845
|
adjusting in adminPhilea
|
2016-11-18 12:09:00 +01:00 |
|
Marion Muszynski
|
03c169aca4
|
Merge branch 'ticket-11210-imageVP' into develop
|
2016-11-18 10:55:05 +01:00 |
|
Marion Muszynski
|
d91720a2d4
|
adapt the modif to thumb img
|
2016-11-18 10:54:38 +01:00 |
|
Marion Muszynski
|
4ac4753900
|
begining of updatings
|
2016-11-18 09:50:04 +01:00 |
|
Marion Muszynski
|
c6ef2d7e5b
|
Merge branch 'ticket-11247-MailParrainage'
|
2016-11-17 10:28:11 +01:00 |
|
Marion Muszynski
|
99a30df8b2
|
remove mail sending
|
2016-11-17 10:27:53 +01:00 |
|
Marion Muszynski
|
10fb451e5f
|
Merge branch 'ticket-11247-MailParrainage'
|
2016-11-16 17:39:32 +01:00 |
|
Marion Muszynski
|
4abd6f0d5c
|
fix id_lang
|
2016-11-16 17:39:18 +01:00 |
|
Marion Muszynski
|
e4921746e4
|
Merge branch 'ticket-11247-MailParrainage'
|
2016-11-16 16:33:26 +01:00 |
|
Marion Muszynski
|
3a0ba4c19e
|
addition of email checking
|
2016-11-16 16:33:07 +01:00 |
|
Marion Muszynski
|
fce88331a3
|
fix conflict
|
2016-11-16 15:55:07 +01:00 |
|
Marion Muszynski
|
31ea35e160
|
selection only a specific category_family
|
2016-11-16 15:50:39 +01:00 |
|
Marion Muszynski
|
4fa3f2cc1a
|
Merge branch 'ticket-10580-LaPosteWSU' into develop
|
2016-11-16 12:28:59 +01:00 |
|
Marion Muszynski
|
e29e86cf42
|
addition of wsu for LaPoste webservices
|
2016-11-16 12:28:39 +01:00 |
|
Marion Muszynski
|
fc86cfd982
|
Merge branch 'fix-AideContact'
|
2016-11-15 11:51:43 +01:00 |
|
Marion Muszynski
|
94cbb73027
|
Merge branch 'fix-AideContact' into develop
|
2016-11-15 11:49:19 +01:00 |
|
Marion Muszynski
|
4f9add049e
|
addition redirect to all forms
|
2016-11-15 11:48:52 +01:00 |
|
Marion Muszynski
|
e52b90f790
|
Merge branch 'fix-AideContact'
|
2016-11-15 10:44:05 +01:00 |
|
Marion Muszynski
|
a839bafd66
|
addition of redirection to the good form
|
2016-11-15 10:43:45 +01:00 |
|
Marion Muszynski
|
05d15188b6
|
Merge branch 'fix-AideContact'
|
2016-11-15 10:31:48 +01:00 |
|
Marion Muszynski
|
40960bf54e
|
Merge branch 'fix-AideContact' into develop
|
2016-11-15 10:29:12 +01:00 |
|
Marion Muszynski
|
684d096c48
|
modif css and redirection to the good form
|
2016-11-15 10:28:52 +01:00 |
|
Marion Muszynski
|
2e8468df7e
|
Merge branch 'fix-AideContact'
|
2016-11-14 14:38:43 +01:00 |
|
Marion Muszynski
|
2645434803
|
openning to customers
|
2016-11-14 14:38:23 +01:00 |
|
Marion Muszynski
|
af0f6ca700
|
Merge branch 'fix-AideContact'
|
2016-11-14 14:22:22 +01:00 |
|
Marion Muszynski
|
40497ffb14
|
fix conflict
|
2016-11-14 14:20:50 +01:00 |
|
Marion Muszynski
|
a5629eb2c7
|
adjusting mobile version
|
2016-11-14 14:19:28 +01:00 |
|
Marion Muszynski
|
708f800f48
|
Merge branch 'fix-AideContact'
|
2016-11-14 10:58:47 +01:00 |
|
Marion Muszynski
|
492740d02d
|
fix the name of forms
|
2016-11-14 10:58:28 +01:00 |
|
Marion Muszynski
|
7cee5d97c4
|
Merge branch 'ticket-11557-FixLinkSaleCategory'
|
2016-11-10 16:26:13 +01:00 |
|
Marion Muszynski
|
a13a8813ea
|
comment sending mail
|
2016-11-10 16:25:56 +01:00 |
|
Marion Muszynski
|
d8d9dcf9af
|
Merge branch 'ticket-11210-imageVP' into develop
|
2016-11-10 16:09:28 +01:00 |
|
Marion Muszynski
|
e34bef4bd2
|
small fix
|
2016-11-10 16:09:09 +01:00 |
|
Marion Muszynski
|
bf529276dd
|
Merge branch 'ticket-11211-MultiDeleteImg' into develop
|
2016-11-10 13:21:35 +01:00 |
|
Marion Muszynski
|
e7413fd51e
|
add of multi delete option
|
2016-11-10 13:21:20 +01:00 |
|
Marion Muszynski
|
2daa5010f6
|
Merge branch 'ticket-11621-fixLogoMobile'
|
2016-11-10 12:31:18 +01:00 |
|
Marion Muszynski
|
04b5314a96
|
change logo width on mobile version
|
2016-11-10 12:30:51 +01:00 |
|
Marion Muszynski
|
fe03ca4ed1
|
Merge branch 'ticket-11210-imageVP' into develop
|
2016-11-10 10:36:37 +01:00 |
|
Marion Muszynski
|
ca38824e83
|
restriction on liston and listoff
|
2016-11-10 10:36:14 +01:00 |
|