1423 Commits

Author SHA1 Message Date
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 GUILLAUME
a83a78a462 fix contactform 2016-03-02 12:36:13 +01:00
Thibault GUILLAUME
2fa8a22864 Merge branch 'develop' of gitlab.antadis.fr:dev-antadis/bebeboutik into develop 2016-03-02 12:16:16 +01:00
Thibault UBUNTU
cd250e37b5 Merge branch 'alexandre-contactform' into develop 2016-03-02 12:15:13 +01:00
Thibault UBUNTU
0e7cf6413d fix contactform 2016-03-02 12:14:34 +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
Alexandre Simonet
a245a632ba Remove var_dump 2016-03-02 10:06:15 +01:00
Thibault GUILLAUME
6f6c61da9f Merge branch 'develop' of gitlab.antadis.fr:dev-antadis/bebeboutik into develop 2016-03-02 10:01:02 +01:00
Thibault UBUNTU
4960b181e4 Merge branch 'alexandre-contactform' into develop 2016-03-02 09:59:59 +01:00
Alexandre Simonet
9e1fea3a1f Change mails dir 2016-03-01 18:17:17 +01:00
Alexandre Simonet
85b4843d91 Fix mail folder 2016-03-01 18:11:07 +01:00
Thibault GUILLAUME
82aba1d0a7 Merge branch 'develop' of gitlab.antadis.fr:dev-antadis/bebeboutik into develop 2016-03-01 17:48:49 +01:00
Thibault UBUNTU
d90017e968 Merge branch 'alexandre-contactform' into develop 2016-03-01 17:47:58 +01:00
Alexandre Simonet
c772ed76eb Fix 2016-03-01 17:28:36 +01:00
Thibault GUILLAUME
d9ec061ada Merge branch 'develop' of gitlab.antadis.fr:dev-antadis/bebeboutik into develop 2016-03-01 16:34:17 +01:00
Thibault UBUNTU
5f714a6e3b Merge branch 'alexandre-contactform' into develop 2016-03-01 16:17:02 +01:00
Thibault GUILLAUME
15e0509230 Merge branch 'develop' of gitlab.antadis.fr:dev-antadis/bebeboutik into develop 2016-02-26 10:25:29 +01:00
Alexandre Simonet
836cdfec59 Fix 2016-02-25 16:18:37 +01:00
Alexandre Simonet
f4f1b00946 Fix var 2016-02-25 14:15:51 +01:00
Alexandre Simonet
13d92a6732 Fix injection 2016-02-25 12:43:33 +01:00
Alexandre Simonet
d74c4003ea Change subject mail 2016-02-25 12:32:31 +01:00
Alexandre Simonet
9943a42a9e Fix multi mail config 2016-02-25 12:30:06 +01:00
Alexandre Simonet
9c7c23d9fb Fix config multi form 2016-02-25 12:27:58 +01:00
Alexandre Simonet
11966aea9b Fix quote 2016-02-25 11:11:56 +01:00
Alexandre Simonet
e2806c9a6b Fix quote 2016-02-25 11:11:35 +01:00
Alexandre Simonet
0f07c1ab38 Fix email checking 2016-02-25 10:55:05 +01:00
Alexandre Simonet
451bb54c50 Validate form 2016-02-25 10:42:49 +01:00
Alexandre Simonet
24622917fe Front module configuration 2016-02-25 10:28:03 +01:00
Marion Muszynski
5bb7d037a9 fix conflit FrontController 2016-02-24 17:39:59 +01:00
Marion Muszynski
bd3c6cb40c merge frontController/config.inc 2016-02-24 17:23:16 +01:00
Alexandre Simonet
191ccd1005 Fix mail on sending mail 2016-02-24 17:20:15 +01:00
Alexandre Simonet
2c7333fd65 Done functional config module 2016-02-24 17:15:28 +01:00