Michael RICOIS
|
1a5416cd30
|
Merge branch 'fix/cookie-dev' into develop
|
2018-03-14 12:03:27 +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
|
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
|
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 |
|
Michael RICOIS
|
62139fe9fd
|
Merge remote-tracking branch 'origin/ticket/r15862-label_refbbb'
|
2018-03-08 17:36:23 +01:00 |
|
Michael RICOIS
|
ba7f3d2223
|
Test
|
2018-03-08 17:35:26 +01:00 |
|
Michael RICOIS
|
887c687dd1
|
Change dimension
|
2018-03-08 17:30:25 +01:00 |
|
Michael RICOIS
|
9e386209d7
|
Fix
|
2018-03-08 17:24:53 +01:00 |
|
Michael RICOIS
|
87387701c3
|
Remove ajax cache
|
2018-03-08 17:14:38 +01:00 |
|
Michael RICOIS
|
eed8873dc5
|
Merge remote-tracking branch 'origin/ticket/r15862-label_refbbb'
|
2018-03-08 16:42:47 +01:00 |
|
Michael RICOIS
|
3941697c78
|
Merge remote-tracking branch 'origin/ticket/r15862-label_refbbb' into develop
|
2018-03-08 16:36:09 +01:00 |
|
Michael RICOIS
|
cab5635c8f
|
Test format image
|
2018-03-08 16:29:11 +01:00 |
|
Michael RICOIS
|
fc107f5d6d
|
Merge branch 'ticket/r16348-credit-expired'
|
2018-03-08 14:59:05 +01:00 |
|
Michael RICOIS
|
490baf50f4
|
Clean
|
2018-03-08 14:57:54 +01:00 |
|
Michael RICOIS
|
1d5eb5ec97
|
New label
|
2018-03-08 14:54:52 +01:00 |
|
Michael RICOIS
|
c86f90f0eb
|
Clean
|
2018-03-08 11:44:37 +01:00 |
|
Michael RICOIS
|
bd8981af81
|
Merge branch 'ticket/r15109-math-captcha' into develop
|
2018-03-06 17:28:18 +01:00 |
|
Michael RICOIS
|
9edb325f22
|
Error message
|
2018-03-06 17:09:30 +01:00 |
|
Michael RICOIS
|
0b835a3af5
|
New button
|
2018-03-06 14:34:46 +01:00 |
|
Michael RICOIS
|
240d6e1dee
|
Merge branch 'ticket/r15109-math-captcha' into develop
|
2018-03-06 10:47:09 +01:00 |
|
Michael RICOIS
|
db740966f1
|
Merge branch 'fix/sensefuel-description' into develop
|
2018-03-06 10:46:07 +01:00 |
|
Michael RICOIS
|
c658d0ec75
|
Use description_short as description
|
2018-03-06 10:42:58 +01:00 |
|
Michael RICOIS
|
e7551ef018
|
session_start
|
2018-03-06 10:33:14 +01:00 |
|
Michael RICOIS
|
4a63488b51
|
Style
|
2018-03-05 17:28:11 +01:00 |
|
Michael RICOIS
|
2c870b56f4
|
Add captcha
|
2018-03-05 17:05:47 +01:00 |
|
Michael RICOIS
|
bec5a21522
|
CS
|
2018-03-05 17:04:58 +01:00 |
|