Commit Graph

4269 Commits

Author SHA1 Message Date
Michael RICOIS
688adfedb4 Merge branch 'ticket/r16108-test-sponsor' into develop 2018-02-14 12:25:46 +01:00
Michael RICOIS
8ff1af50df Test 2018-02-14 12:16:16 +01:00
Michael RICOIS
bb7d8d133d Merge branch 'ticket-14739-PackLogistic' 2018-02-13 17:42:41 +01:00
Michael RICOIS
f512725399 Merge branch 'ticket-14739-PackLogistic' into develop 2018-02-13 17:42:16 +01:00
Michael RICOIS
ee76fb5feb Display action 2018-02-13 17:35:12 +01:00
Michael RICOIS
4e88bd364a Merge branch 'ticket-14739-PackLogistic' 2018-02-13 16:46:08 +01:00
Michael RICOIS
fb61d8b1ad id_order 2018-02-13 16:45:38 +01:00
Michael RICOIS
31047b7014 Merge branch 'ticket-14739-PackLogistic' into develop 2018-02-13 12:44:55 +01:00
Michael RICOIS
7a207b2010 CS 2018-02-13 12:42:39 +01:00
Michael RICOIS
5d8b7ba155 Oups 2018-02-13 10:41:59 +01:00
Michael RICOIS
c4de0d3e8e Oups 2018-02-13 09:56:36 +01:00
Michael RICOIS
3851c2e70f Merge branch 'ticket-14739-PackLogistic' 2018-02-12 17:06:59 +01:00
Michael RICOIS
3f1d411ce6 Merge branch 'ticket-14739-PackLogistic' into develop 2018-02-12 17:05:19 +01:00
Michael RICOIS
6aebf9206a Merge remote-tracking branch 'origin/ticket/r15587-refund-paypal' into develop 2018-02-12 11:58:09 +01:00
Michael RICOIS
dbbb5a7817 Merge remote-tracking branch 'origin/ticket/r15670-email' 2018-02-12 09:57:24 +01:00
Michael RICOIS
4baf6925ed Merge remote-tracking branch 'origin/ticket/r15225-redirect-mobile' 2018-02-12 09:41:58 +01:00
Michael RICOIS
1f546c17f9 Merge remote-tracking branch 'origin/ticket/r15670-email' into develop 2018-02-09 11:59:51 +01:00
Michael RICOIS
e2a9475ec7 Vérification modification du compte, erreur si un compte existe déjà 2018-02-09 11:49:12 +01:00
Michael RICOIS
60c7fc9a07 Merge branch 'ticket/r15670-email' into develop 2018-02-09 10:14:01 +01:00
Michael RICOIS
f53dee8581 CS 2018-02-09 10:10:22 +01:00
Michael RICOIS
0d6e609448 CS 2018-02-09 10:03:42 +01:00
Michael RICOIS
b67de1c311 CS 2018-02-09 09:30:13 +01:00
Michael RICOIS
20fd85c5fb email strtolower 2018-02-08 17:39:33 +01:00
Michael RICOIS
ca461979c4 Var email 2018-02-08 17:31:49 +01:00
Michael RICOIS
54781041ee Merge branch 'ticket/r15782-stats' 2018-02-06 16:48:32 +01:00
Michael RICOIS
e22919778d Merge branch 'ticket/r15782-stats' into develop 2018-02-06 16:48:04 +01:00
Michael RICOIS
3cc9394547 Form name 2018-02-06 16:47:39 +01:00
Michael RICOIS
8208894b2d Merge branch 'ticket/r15225-redirect-mobile' into develop 2018-02-06 16:25:16 +01:00
Michael RICOIS
a3c2e56824 Merge branch 'ticket/r15782-stats' 2018-02-06 15:50:33 +01:00
Michael RICOIS
de3d84758a Merge branch 'ticket/r15782-stats' into develop 2018-02-06 15:42:35 +01:00
Michael RICOIS
1097c2111e Fix ajax / https 2018-02-06 15:41:39 +01:00
Michael RICOIS
cd1d3caeb6 Merge branch 'ticket/r15782-stats' 2018-02-06 15:23:05 +01:00
Michael RICOIS
b59f0e70b1 Merge remote-tracking branch 'origin/ticket/r15782-stats' into develop 2018-02-06 15:21:35 +01:00
Michael RICOIS
75633bb6e2 Domain + https 2018-02-06 15:21:12 +01:00
Michael RICOIS
d3077cf244 Merge remote-tracking branch 'origin/ticket/r15782-stats' 2018-02-06 14:49:48 +01:00
Michael RICOIS
e02ddd8dee Merge branch 'ticket/r15782-stats' into develop 2018-02-06 14:48:36 +01:00
Michael RICOIS
1e0baff8cd https 2018-02-06 14:47:52 +01:00
Michael RICOIS
dc5beb562c Remove debug 2018-02-06 14:36:25 +01:00
Michael RICOIS
11f40df725 Merge branch 'ticket/r15975-contact-spam' into develop 2018-02-06 11:19:36 +01:00
Michael RICOIS
3768576288 Add fix for spam 2018-02-06 10:48:30 +01:00
Michael RICOIS
42b5f95c1f Update from logistics module 2018-02-06 09:31:12 +01:00
Michael RICOIS
4280d4960b Keep params when redirect on mobile 2018-02-05 16:23:46 +01:00
Michael RICOIS
99c9fad462 Merge remote-tracking branch 'origin/ticket/r14810-dropshipping-tracking' into develop 2018-02-05 12:51:25 +01:00
Michael RICOIS
e01ffd309f CS 2018-02-05 12:50:19 +01:00
Michael RICOIS
b0cafcbe70 Email for dropshipping without carrier info 2018-02-05 12:26:27 +01:00
Michael RICOIS
a12ab8132a Merge remote-tracking branch 'origin/ticket/r15782-stats' 2018-02-05 12:00:56 +01:00
Michael RICOIS
d728c55633 Merge remote-tracking branch 'origin/ticket/r15931-contacts' into develop 2018-02-05 11:26:36 +01:00
Michael RICOIS
3769c8fc5c Remove condition 2018-02-05 11:26:14 +01:00
Michael RICOIS
325c56ad1b Merge branch 'ticket/r15931-contacts' into develop 2018-02-05 11:19:21 +01:00
David
dd923fa2d7 Merge branch 'ticket-14436-excel-format' 2018-02-02 22:01:19 +01:00