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 |
|
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 |
|
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
|
5b2fb71241
|
Merge branch 'ticket-14739-PackLogistic' into develop
Conflicts:
modules/ant_logistic/script.js
|
2018-01-30 12:27:52 +01:00 |
|
Michael RICOIS
|
60cef82038
|
Get file from server
|
2018-01-30 12:17:53 +01:00 |
|
Christophe Latour
|
96a27def01
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2018-01-30 12:07:15 +01:00 |
|
Christophe Latour
|
ef01e6515d
|
Residu server
|
2018-01-30 12:06:44 +01:00 |
|
Michael RICOIS
|
1b5f1efbc0
|
Merge branch 'ticket-14739-PackLogistic' into develop
|
2018-01-30 11:59:02 +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
|
54dcf852c2
|
Merge branch 'ticket/r15717-trad' into develop
|
2018-01-29 15:27:14 +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
|
0b787dd69b
|
Comment
|
2018-01-25 17:21:15 +01:00 |
|
Michael RICOIS
|
411c795497
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2018-01-25 10:23:11 +01:00 |
|
Michael RICOIS
|
53eb8c1006
|
Merge branch 'ticket/r11982-ganalytics' into develop
Conflicts:
modules/ganalytics/header.tpl
|
2018-01-25 10:22:02 +01:00 |
|
David
|
c13496d8e1
|
Merge branch 'ticket-14436-excel-format'
|
2018-01-24 17:25:00 +01:00 |
|
David
|
bbe237f64e
|
Merge branch 'ticket-14436-excel-format' into develop
|
2018-01-24 16:52:07 +01:00 |
|
David
|
daa9f31bc0
|
Major rework
|
2018-01-24 16:50:32 +01:00 |
|
Michael RICOIS
|
f1006491e7
|
CS
|
2018-01-23 17:38:42 +01:00 |
|
Michael RICOIS
|
cb32e313c0
|
CS
|
2018-01-23 17:36:59 +01:00 |
|
Michael RICOIS
|
588898123a
|
Add cookie reset if id_transaction is different
|
2018-01-23 17:36:17 +01:00 |
|
Michael RICOIS
|
85f4874ac8
|
Validation
|
2018-01-23 17:10:17 +01:00 |
|
Michael RICOIS
|
361b1bfa5b
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2018-01-23 16:42:22 +01:00 |
|
Michael RICOIS
|
9b3f4d087b
|
Add counter for purchase transaction
|
2018-01-23 16:38:06 +01:00 |
|
Michael RICOIS
|
c4a59c0dcd
|
Merge remote-tracking branch 'origin/ticket/r14647-welcome-mail' into develop
|
2018-01-23 15:57:34 +01:00 |
|
Michael RICOIS
|
d0c9e8f59b
|
Timestamp set at 10 minutes
|
2018-01-23 15:56:33 +01:00 |
|
Michael RICOIS
|
8424843068
|
Remove password
|
2018-01-23 15:05:56 +01:00 |
|
Michael RICOIS
|
853c9dc5ea
|
Update
|
2018-01-23 15:05:03 +01:00 |
|
Michael RICOIS
|
5c22897bf0
|
Update
|
2018-01-23 14:49:31 +01:00 |
|
Michael RICOIS
|
b32329e321
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2018-01-23 11:36:53 +01:00 |
|
Michael RICOIS
|
42a0fdfda5
|
Update account.html
|
2018-01-23 11:35:54 +01:00 |
|
Michael RICOIS
|
3897a4304d
|
Get back original mail template
|
2018-01-23 10:55:50 +01:00 |
|
Michael RICOIS
|
71c6adc38a
|
Update ES account.html
|
2018-01-23 10:08:31 +01:00 |
|