Commit Graph

2896 Commits

Author SHA1 Message Date
Michael RICOIS
a3c2e56824 Merge branch 'ticket/r15782-stats' 2018-02-06 15:50:33 +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
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
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
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
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
3769c8fc5c Remove condition 2018-02-05 11:26:14 +01:00
David
dd923fa2d7 Merge branch 'ticket-14436-excel-format' 2018-02-02 22:01:19 +01:00
David
7c218242be Added doubled ean recovery options 2018-02-02 21:59:26 +01:00
Michael RICOIS
134af30198 Harmonisation 2018-02-02 17:46:57 +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
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
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
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
a6cf9bd87f Replace BETWEEN instruction 2018-01-31 09:39:24 +01:00
Michael RICOIS
40468043c9 CS 2018-01-30 18:00:48 +01:00
Michael RICOIS
db36c1026b fix js errors 2018-01-30 17:49:53 +01:00
Michael RICOIS
84a1b37f50 Check quantity 2018-01-30 17:47:03 +01:00
Michael RICOIS
8b15ef46a6 Rework for dropshipping 2018-01-30 17:15:33 +01:00
Michael RICOIS
4fd935962e Merge branch 'ticket-14739-PackLogistic' 2018-01-30 12:30:01 +01:00
Michael RICOIS
60cef82038 Get file from server 2018-01-30 12:17:53 +01:00
Michael RICOIS
12507d60c3 Not an ajax admin 2018-01-30 11:57:37 +01:00
Michael RICOIS
04399b0f6b Add cookie as global 2018-01-30 10:53:00 +01:00
Michael RICOIS
3aca7c4e2e Add hookCancelShipping 2018-01-29 16:47:51 +01:00
Michael RICOIS
82b4072df7 Trad 2018-01-29 15:26:30 +01:00
Michael RICOIS
7a7cc4d7fe Merge remote-tracking branch 'origin/ticket/r11982-ganalytics' 2018-01-29 14:36:38 +01:00
Michael RICOIS
807fc023f3 Test 2018-01-29 14:34:59 +01:00
Michael RICOIS
02def68974 Rewrite 2018-01-26 16:24:00 +01:00
Michael RICOIS
6b8472979c Merge branch 'ticket-14739-PackLogistic' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into ticket-14739-PackLogistic 2018-01-26 15:25:49 +01:00
Marion Muszynski
a24ebc48d9 deleting useless files 2018-01-26 15:24:11 +01:00
Marion Muszynski
c978c25373 add module ant logistic for test 2018-01-26 15:24:10 +01:00
Michael RICOIS
b907ac0e66 CS 2018-01-26 11:56:03 +01:00
Michael RICOIS
67b9dd85be CS 2018-01-26 10:50:02 +01:00
Michael RICOIS
063ce25d01 CS and comment 2018-01-26 10:06:48 +01:00
Michael RICOIS
0b787dd69b Comment 2018-01-25 17:21:15 +01:00
David
c13496d8e1 Merge branch 'ticket-14436-excel-format' 2018-01-24 17:25:00 +01:00
David
daa9f31bc0 Major rework 2018-01-24 16:50:32 +01:00
Michael RICOIS
9723cc3e20 Add align=left 2018-01-24 11:09:32 +01:00