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 |
|
David
|
cbf9b268ce
|
new duplicates management
fix in formula
|
2018-02-02 15:37:43 +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
|
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
|
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
|
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 |
|
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
|
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
|
9b3f4d087b
|
Add counter for purchase transaction
|
2018-01-23 16:38:06 +01:00 |
|
Michael RICOIS
|
d0c9e8f59b
|
Timestamp set at 10 minutes
|
2018-01-23 15:56:33 +01:00 |
|
Michael RICOIS
|
bac9e3a694
|
Fix id_state undefined
|
2018-01-22 11:59:57 +01:00 |
|
Michael RICOIS
|
645d3bd0a1
|
Check time
|
2018-01-22 10:43:01 +01:00 |
|
Michael RICOIS
|
6915872212
|
CS
|
2018-01-22 10:40:55 +01:00 |
|
Michael RICOIS
|
a7f38bf474
|
Merge branch 'ticket/15099-facebookpixel'
|
2018-01-22 10:28:29 +01:00 |
|
Michael RICOIS
|
64d33eafb7
|
Fix currency with facebook pixel
|
2018-01-22 10:24:57 +01:00 |
|
Michael RICOIS
|
10ce2852e6
|
Merge remote-tracking branch 'origin/ticket/r15334-return-article-form'
|
2018-01-22 09:32:50 +01:00 |
|
Michael RICOIS
|
fd00430307
|
Reduce z-index
|
2018-01-19 15:34:53 +01:00 |
|
Michael RICOIS
|
8e2a1ba4a3
|
Fix conflict
|
2018-01-19 11:23:42 +01:00 |
|
Michael RICOIS
|
f010de6d2d
|
Merge branch 'ticket-14904-achatexpressmobile' of
git@gitlab.antadis.net:dev-antadis/bebeboutik.git into
ticket-14904-achatexpressmobile
Conflicts:
themes/site_mobile/css/style.css
|
2018-01-19 11:23:26 +01:00 |
|
Michael RICOIS
|
3f98533689
|
Rebase and fix
|
2018-01-19 11:22:07 +01:00 |
|
Michael RICOIS
|
a367324847
|
Change image - better quality
|
2018-01-19 11:13:31 +01:00 |
|
Michael RICOIS
|
dfbb1407eb
|
z-index on expresscart
|
2018-01-19 11:12:55 +01:00 |
|
Michael RICOIS
|
1f24d1b88b
|
Add a select for mobile
|
2018-01-19 11:08:12 +01:00 |
|
David
|
17cb1fdc7c
|
Added conditionnal formatting
|
2018-01-18 18:29:59 +01:00 |
|
David
|
f52f89ad64
|
Code cleanup
Background format
Bold format
Conditionnal in comments
|
2018-01-18 17:49:10 +01:00 |
|
Michael RICOIS
|
ab90b9214c
|
Change image - better quality
|
2018-01-18 14:34:22 +01:00 |
|
Michael RICOIS
|
3a5aed3c7f
|
Merge remote-tracking branch 'origin/ticket/r15224-balises'
|
2018-01-17 17:49:30 +01:00 |
|
Michael RICOIS
|
e9b0ef0dae
|
Fix
|
2018-01-17 17:48:37 +01:00 |
|