Michael RICOIS
|
c788138241
|
Merge branch 'ticket-14739-PackLogistic' into develop
|
2018-03-22 11:14:49 +01:00 |
|
Michael RICOIS
|
922de8200a
|
Fix quantity
|
2018-03-22 11:08:49 +01:00 |
|
Michael RICOIS
|
ac1d708f5f
|
Merge remote-tracking branch 'ticket/r16761-queue_name' into develop
|
2018-03-21 10:35:07 +01:00 |
|
Michael RICOIS
|
7699f86acd
|
Save logisitic queue name in configuration
|
2018-03-21 10:32:59 +01:00 |
|
Michael RICOIS
|
76b26ac6b4
|
CS
|
2018-03-21 10:27:58 +01:00 |
|
Michael RICOIS
|
6b863fe940
|
Fix
|
2018-03-19 12:27:57 +01:00 |
|
Michael RICOIS
|
34e2bdc553
|
Merge remote-tracking branch 'origin/ticket/r16490-email_error'
|
2018-03-19 12:19:16 +01:00 |
|
Michael RICOIS
|
2207ae3cb8
|
CS
|
2018-03-19 10:28:19 +01:00 |
|
Michael RICOIS
|
893da877e8
|
Merge remote-tracking branch 'origin/ticket/r16686-filter_back'
|
2018-03-19 10:19:01 +01:00 |
|
Michael RICOIS
|
efbcf6327f
|
Remove opening title (not working)
|
2018-03-19 10:15:54 +01:00 |
|
Michael RICOIS
|
5a605ad905
|
Fix url : typo
|
2018-03-19 09:45:28 +01:00 |
|
Michael RICOIS
|
bbec1c0ef4
|
Merge branch 'ticket/r16686-filter_back' into develop
Conflicts:
modules/filtervp/filter.tpl
modules/filtervp/filtervp.php
|
2018-03-16 10:34:08 +01:00 |
|
Michael RICOIS
|
e057c88351
|
CSS open if values in cookie
|
2018-03-16 10:12:24 +01:00 |
|
Michael RICOIS
|
93fe8b597a
|
CS
|
2018-03-16 10:11:38 +01:00 |
|
Michael RICOIS
|
4a85441bbf
|
Merge branch 'ticket/r16686-filter_back' into develop
|
2018-03-15 17:38:51 +01:00 |
|
Michael RICOIS
|
9803b2424c
|
Add filter value in cookie
|
2018-03-15 17:37:01 +01:00 |
|
Michael RICOIS
|
4691d8bb0f
|
Remove .hg
|
2018-03-15 15:25:12 +01:00 |
|
Michael RICOIS
|
2a37cdfc54
|
Merge remote-tracking branch 'origin/ticket/r16490-email_error' into develop
|
2018-03-15 11:22:30 +01:00 |
|
Michael RICOIS
|
a4625499c0
|
Override email value
|
2018-03-15 11:21:41 +01:00 |
|
Michael RICOIS
|
1a5416cd30
|
Merge branch 'fix/cookie-dev' into develop
|
2018-03-14 12:03:27 +01:00 |
|
Michael RICOIS
|
b5053e443a
|
Merge remote-tracking branch 'origin/ticket/r15862-label_refbbb'
|
2018-03-14 11:57:07 +01:00 |
|
Michael RICOIS
|
ffcd78f1fd
|
Merge remote-tracking branch 'origin/ticket/r15862-label_refbbb' into develop
|
2018-03-14 11:56:37 +01:00 |
|
Michael RICOIS
|
34c962b75e
|
Fix regexp
|
2018-03-14 11:51:28 +01:00 |
|
Michael RICOIS
|
588fa7e334
|
Merge branch 'ticket/r15862-label_refbbb'
|
2018-03-14 11:48:10 +01:00 |
|
Michael RICOIS
|
9ec259fa38
|
Merge branch 'ticket/r15862-label_refbbb' into develop
|
2018-03-14 11:47:40 +01:00 |
|
Michael RICOIS
|
03cd386f70
|
New regexp
|
2018-03-14 11:47:16 +01:00 |
|
Michael RICOIS
|
6d0beefa1c
|
Merge branch 'ticket/r15862-label_refbbb'
|
2018-03-14 11:29:50 +01:00 |
|
Michael RICOIS
|
2bafc760de
|
Merge branch 'ticket/r15862-label_refbbb' into develop
|
2018-03-14 11:28:40 +01:00 |
|
Michael RICOIS
|
2a3e8ebddd
|
Change regexp to detect first -
|
2018-03-14 11:28:11 +01:00 |
|
Michael RICOIS
|
b04dcfea06
|
Merge branch 'ticket/r16490-email_error' into develop
|
2018-03-14 11:21:22 +01:00 |
|
Michael RICOIS
|
eea2e769d1
|
Remove break point
|
2018-03-14 11:17:26 +01:00 |
|
Michael RICOIS
|
b2c8ce4248
|
Isolate env
|
2018-03-14 11:14:54 +01:00 |
|
Michael RICOIS
|
1858378454
|
Merge remote-tracking branch 'origin/ticket/r16627-mail_return_link' into develop
|
2018-03-14 09:48:56 +01:00 |
|
Michael RICOIS
|
aca4357353
|
Fix return link
|
2018-03-14 09:48:02 +01:00 |
|
Michael RICOIS
|
f2462e6bc3
|
Merge remote-tracking branch 'origin/ticket/r15862-label_refbbb'
|
2018-03-13 15:21:51 +01:00 |
|
Michael RICOIS
|
12db38b21d
|
Merge branch 'ticket/r15862-label_refbbb' into develop
|
2018-03-13 15:20:37 +01:00 |
|
Michael RICOIS
|
d6dbc5f479
|
New label format
|
2018-03-13 15:18:14 +01:00 |
|
Michael RICOIS
|
e54395e5d1
|
Include file from server
|
2018-03-13 12:02:24 +01:00 |
|
Michael RICOIS
|
5f44b1c9fa
|
Merge branch 'ticket/r16490-email_error' into develop
|
2018-03-12 16:41:53 +01:00 |
|
Michael RICOIS
|
2619b26347
|
Merge branch 'ticket-14739-PackLogistic' into develop
|
2018-03-12 15:00:32 +01:00 |
|
Michael RICOIS
|
305234f74f
|
CS
|
2018-03-12 12:58:54 +01:00 |
|
Michael RICOIS
|
1920a84634
|
Add rules
|
2018-03-12 11:52:00 +01:00 |
|
Michael RICOIS
|
37b955667f
|
Merge remote-tracking branch 'origin/ticket/r16455-exclude_bot'
|
2018-03-12 10:11:36 +01:00 |
|
Michael RICOIS
|
9115434424
|
Merge remote-tracking branch 'origin/tickets/customer_date_upd'
|
2018-03-12 10:05:44 +01:00 |
|
Michael RICOIS
|
2343304d25
|
Merge remote-tracking branch 'origin/ticket/r15109-math-captcha'
|
2018-03-12 09:50:53 +01:00 |
|
Michael RICOIS
|
ffe8c187e8
|
Merge remote-tracking branch 'origin/ticket/r16492-bulkupdate'
|
2018-03-12 09:48:05 +01:00 |
|
Michael RICOIS
|
d1d0642f91
|
Add a better way to correct email - to test
|
2018-03-09 17:54:36 +01:00 |
|
Michael RICOIS
|
d3d2c06831
|
Merge branch 'ticket/r16492-bulkupdate' into develop
|
2018-03-09 12:41:51 +01:00 |
|
Michael RICOIS
|
2985b1ed4f
|
Find tax when update
|
2018-03-09 12:41:14 +01:00 |
|
Michael RICOIS
|
76eb16036b
|
update date_upd to customer
|
2018-03-09 11:21:41 +01:00 |
|