240 Commits

Author SHA1 Message Date
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
Srv Bebeboutik
8c1242b850 delte img from repo 2016-03-02 10:45:21 +01:00
Srv Bebeboutik
97ec6bff44 fix trad add to cart box 2016-03-02 10:39:36 +01:00
Srv Bebeboutik
adaecb5c9b hotfix sale stat subcategorie 2016-03-02 10:14:16 +01:00
Srv Bebeboutik
0918b1e26d push prod 2016-02-24 16:23:27 +01:00
Srv Bebeboutik
fc61e2ed3a fix truc de merdeeeeeeeeeeee 2016-02-24 16:11:24 +01:00
Srv Bebeboutik
9149acfb2f Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik 2016-02-24 16:10:17 +01:00
Srv Bebeboutik
361375f41f add config.inc.php in gitignore 2016-02-24 16:08:51 +01:00
Thibault UBUNTU
4d81184816 fix conflict 2016-02-24 16:03:29 +01:00
Thibault UBUNTU
d39e27d271 fix conflit 2016-02-24 16:02:43 +01:00
Thibault UBUNTU
89da45eaf4 Merge branch 'develop' 2016-02-24 15:55:24 +01:00
Alexandre Simonet
3b2edf1aba Fix config.inc 2016-02-24 15:44:20 +01:00
Alexandre Simonet
2c5e647715 Update margin fields on desktop 2016-02-24 15:40:57 +01:00
Alexandre Simonet
715132c7e6 Front mobile 2016-02-24 15:33:47 +01:00
Alexandre Simonet
72d8ef61b1 Edit front 2016-02-24 12:06:11 +01:00
Alexandre Simonet
805d11f2ea Change some translation 2016-02-24 11:07:18 +01:00
Alexandre Simonet
e3ce8e7869 Refactor 2016-02-24 11:03:00 +01:00
Alexandre Simonet
8efa9fb328 Add some style 2016-02-24 10:54:12 +01:00
Alexandre Simonet
33bd6c01c4 Error management 2016-02-24 10:35:05 +01:00
Alexandre Simonet
fdb6a5ddad Create mail template 2016-02-24 10:12:44 +01:00
Marion Muszynski
09ee75be23 update AdminCustomerThread for module ant_support_form 2016-02-23 18:07:06 +01:00
Alexandre Simonet
f778675389 sav 2016-02-23 17:33:08 +01:00
Marion Muszynski
85139226c1 update paiement paybox 2016-02-23 17:33:01 +01:00
Marion Muszynski
0e1092e8e3 update paiement paybox 2016-02-23 17:31:51 +01:00
Marion Muszynski
75fa44c434 update FraudCore 2016-02-23 17:05:11 +01:00
Marion Muszynski
14f6f2c49d update FraudCore 2016-02-23 16:37:04 +01:00
Marion Muszynski
b084af9b1e update FraudCore 2016-02-23 16:35:17 +01:00
Alexandre Simonet
52f4424a58 Fix table creation 2016-02-23 16:08:21 +01:00