453 Commits

Author SHA1 Message Date
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
Marion Muszynski
ce7462c19e labelgenerate 2016-02-24 17:12:23 +01:00
Alexandre Simonet
9724451d95 last push 2016-02-24 16:45:42 +01:00
Alexandre Simonet
dbd82073f5 Fix module name 2016-02-24 16:38:11 +01:00
Thibault GUILLAUME
56f10467f8 Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik 2016-02-24 16:28:25 +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
3580bdef15 Fix margin on mobile 2016-02-24 15:49:21 +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