Commit Graph

4245 Commits

Author SHA1 Message Date
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
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
David
a3f1529659 Merge branch 'ticket-14436-excel-format' into develop 2018-02-02 22:00:23 +01:00
David
7c218242be Added doubled ean recovery options 2018-02-02 21:59:26 +01:00
David
17061a6371 Merge branch 'ticket-14436-excel-format' into develop 2018-02-02 15:38:27 +01:00
David
cbf9b268ce new duplicates management
fix in formula
2018-02-02 15:37:43 +01:00
Michael RICOIS
d7ea10a2bb Mails 2018-02-02 12:28:49 +01:00
Michael RICOIS
c972fdf000 Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop 2018-02-02 10:36:42 +01:00
Michael RICOIS
b152917951 Merge remote-tracking branch 'origin/ticket/r15782-stats' into develop 2018-02-02 10:36:20 +01:00
Michael RICOIS
e73277ec38 Export in ajax 2018-02-01 17:39:33 +01:00
Michael RICOIS
1ae7e28abe Async export 2018-02-01 09:34:23 +01:00
David
539d777960 Merge branch 'ticket-14811-title-not-clickable' into develop 2018-01-31 18:18:40 +01:00
David
ac6a5c1667 banner not clickable 2018-01-31 18:17:56 +01:00
Michael RICOIS
2c91058ece Text 2018-01-31 12:36:51 +01:00
Michael RICOIS
84472fbb03 Merge branch 'ticket/r14810-dropshipping-tracking' into develop 2018-01-31 12:22:44 +01:00
Michael RICOIS
9cadd3e8af Don't save shipping number in dropshipping 2018-01-31 12:05:57 +01:00
Michael RICOIS
70afb97e26 Column name 2018-01-31 11:34:17 +01:00
Michael RICOIS
a71a5c9eac Remove glob 2018-01-31 10:50:00 +01:00
Michael RICOIS
8b49b143ac Merge branch 'ticket/r15788-discount-use' into develop 2018-01-31 09:43:14 +01:00
Michael RICOIS
a6cf9bd87f Replace BETWEEN instruction 2018-01-31 09:39:24 +01:00
Michael RICOIS
40468043c9 CS 2018-01-30 18:00:48 +01:00