117 Commits

Author SHA1 Message Date
Srv Bebeboutik
85c9a39043 https on facebook 2016-04-04 11:44:49 +02:00
Srv Bebeboutik
0ec932fb7f add quote import 2016-04-04 11:44:16 +02:00
Srv Bebeboutik
56f1489fbc petite trad 2016-03-31 12:08:39 +02:00
Srv Bebeboutik
7512ebbe4b modif pour le flux partenaire familydeal 2016-03-31 12:08:00 +02:00
Srv Bebeboutik
ba20deb904 add lang to emarsys rss img 2016-03-31 12:07:30 +02:00
Srv Bebeboutik
c3c53223ca remove ie6 info 2016-03-31 12:06:40 +02:00
Srv Bebeboutik
bcdb91f1e3 prepare ssl 2016-03-31 12:06:08 +02:00
Srv Bebeboutik
e4a9771a82 change int country to varchar 2016-03-31 12:05:30 +02:00
Marion Muszynski
5e01b9492e Merge branch 'ticket-9759' 2016-03-29 17:42:58 +02:00
Marion Muszynski
3ab5a75a06 update for prod with good email addresses 2016-03-29 17:42:28 +02:00
Marion Muszynski
3284953789 update logo adminAlert 2016-03-29 17:38:35 +02:00
Marion Muszynski
e1e40f0458 update mail template and module 2016-03-29 17:33:15 +02:00
Marion Muszynski
ba8fa44d2f fix hook 2016-03-29 17:20:28 +02:00
Marion Muszynski
975c490261 update for tests in dev 2016-03-29 17:08:52 +02:00
Marion Muszynski
b763543244 adding ant_alert module 2016-03-29 17:01:26 +02:00
Srv Bebeboutik
84b337ab99 add logo to payment page paypal 2016-03-24 10:29:55 +01:00
Marion Muszynski
058aae7d32 Merge branch 'ticket-7748' 2016-03-23 13:25:33 +01:00
Marion Muszynski
74ee8fd6e1 fix sort products 2016-03-23 13:23:33 +01:00
Marion Muszynski
0974e32f3c fix labelgenerate 2016-03-22 17:31:19 +01:00
Srv Bebeboutik
bf20d2be17 fix labelgenerate 2016-03-22 17:23:04 +01:00
Marion Muszynski
380f5dbd85 Merge branch 'ticket-9598' 2016-03-16 12:19:10 +01:00
Marion Muszynski
4a4d6d63d2 update trad 2016-03-16 12:18:41 +01:00
Marion Muszynski
df1836083c Merge branch 'ticket-9598' 2016-03-16 11:58:53 +01:00
Thibault UBUNTU
6cd4ea114f Merge branch 'braderie' 2016-03-14 11:00:11 +01:00
Thibault UBUNTU
477aaf257f add braderie select in VP 2016-03-14 10:59:58 +01:00
Marion Muszynski
825bebdeb5 Merge branch 'ticket-9517' 2016-03-11 01:01:31 +01:00
Marion Muszynski
e152929f34 trim email update 2016-03-11 01:00:52 +01:00
Marion Muszynski
c3f361b04d Merge branch 'ticket-9517' 2016-03-10 18:37:21 +01:00
Marion Muszynski
a9b942ecf6 trim email 2016-03-10 18:19:41 +01:00
Marion Muszynski
f1129c1b0b adding total quantity ticket#9598 2016-03-10 11:04:39 +01:00
Srv Bebeboutik
56da5a1b8f fix labelgenerate 2016-03-10 09:53:45 +01:00
Thibault UBUNTU
133c8769cd Merge branch 'cart' 2016-03-09 16:45:32 +01:00
Thibault UBUNTU
4a6ce8b8c1 add delete delivery delay on shopping cart if no product 2016-03-09 16:44:00 +01:00
Srv Bebeboutik
f43730525b add pid on query 2016-03-09 16:38:21 +01:00
Srv Bebeboutik
392892f3d2 update labelgenerate 2016-03-09 16:33:48 +01:00
Srv Bebeboutik
1426efaff2 change gitignore + class product 2016-03-09 16:33:05 +01:00
Thibault UBUNTU
06d5d227c8 add limit economy test 2016-03-07 16:04:34 +01:00
Thibault UBUNTU
66467587a9 add limit economy test 2016-03-07 16:02:27 +01:00
Thibault UBUNTU
40798cf1c1 Merge branch 'canaries' 2016-03-07 15:58:43 +01:00
Thibault UBUNTU
5ee28563f1 block canaries delivery 2016-03-07 15:58:26 +01:00
Srv Bebeboutik
f5e8d0d1dc trad 2016-03-07 15:18:56 +01:00
Thibault UBUNTU
04052b1ce7 addreassurance text on es version 2016-03-07 13:01:56 +01:00
Thibault UBUNTU
f904640f44 change payment img 2016-03-07 12:52:42 +01:00
Thibault UBUNTU
172d6fd767 change payment logo on mobile 2016-03-07 11:18:00 +01:00
Thibault UBUNTU
f2b34f988a modif logo footer 2016-03-07 11:03:22 +01:00
Thibault UBUNTU
1ef9b58eb7 Merge branch 'urles' 2016-03-07 10:49:59 +01:00
Thibault UBUNTU
a4fefbca48 voici ma modification 2016-03-07 10:49:36 +01:00
Thibault UBUNTU
212ec48412 Merge branch 'hotfix-imgcarrier' 2016-03-02 11:14:28 +01:00
Thibault UBUNTU
2d660b2c2a change img transporteur es 2016-03-02 11:14:09 +01:00
Srv Bebeboutik
20e38fa1be fix trad ES box add to cart 2016-03-02 10:52:30 +01:00