Commit Graph

2928 Commits

Author SHA1 Message Date
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
Alexandre Simonet
fdb6a5ddad Create mail template 2016-02-24 10:12:44 +01:00
Thibault GUILLAUME
0a6602a734 Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik 2016-02-23 18:13:47 +01:00
Marion Muszynski
09ee75be23 update AdminCustomerThread for module ant_support_form 2016-02-23 18:07:06 +01:00
Thibault GUILLAUME
ebfb7e2e63 Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik 2016-02-23 17:51:22 +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
Thibault GUILLAUME
a4640dd190 Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik 2016-02-23 17:10:52 +01:00
Thibault GUILLAUME
f3d4b4d8c6 push gitignore 2016-02-23 17:10:47 +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
Alexandre Simonet
54014fc0fc Create press controller 2016-02-23 15:38:51 +01:00
Alexandre Simonet
854bdca3fd Fix database insert 2016-02-23 15:00:13 +01:00
Alexandre Simonet
0e32796c24 Save provider in db 2016-02-23 13:25:19 +01:00
Alexandre Simonet
f2c49d87f7 Create module Contactform 2016-02-23 11:23:41 +01:00
Marion Muszynski
9794a92eae modif Fraud (same account names) 2016-02-22 15:28:33 +01:00
Marion Muszynski
720d27f595 update .gitignore (maj.php) 2016-02-22 12:49:31 +01:00
Marion Muszynski
8481dff77e adding labelgenerate 2016-02-22 12:33:51 +01:00
Marion Muszynski
58084aa3c7 adding module ant_support et ant_support_form 2016-02-19 15:30:29 +01:00
Marion Muszynski
c154535cec update gitignore (lang) 2016-02-19 14:47:35 +01:00
Srv Bebeboutik
241f738908 updateprod 2016-02-09 10:46:07 +01:00
Srv Bebeboutik
acb87d58e7 allow sav es refund paybox 2016-02-05 12:25:57 +01:00
Srv Bebeboutik
95ce768657 retire restriction paypal refund 2016-02-05 12:25:42 +01:00