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
|
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
|
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
|
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 |
|
Michael RICOIS
|
d7cce43d8f
|
Merge branch 'ticket/r14810-dropshipping-tracking'
|
2018-03-05 12:59:56 +01:00 |
|
Michael RICOIS
|
633c8e77e4
|
Merge remote-tracking branch 'origin/fix/mobile_detect'
|
2018-03-05 12:59:15 +01:00 |
|
Michael RICOIS
|
d86175e93f
|
Merge branch 'ticket/r16455-exclude_bot' into develop
|
2018-03-05 10:34:16 +01:00 |
|
Michael RICOIS
|
322c019c5c
|
Merge remote-tracking branch 'origin/ticket/r16159-customer-message'
|
2018-03-05 09:49:15 +01:00 |
|
Michael RICOIS
|
3f22601be3
|
Merge branch 'fix/mobile_detect' into develop
|
2018-03-02 16:45:18 +01:00 |
|
Michael RICOIS
|
97f8d56b5e
|
Update Mobile_Detect to version 2.8.31
|
2018-03-02 16:44:00 +01:00 |
|
Michael RICOIS
|
d931f7f081
|
Exclude Sensefuel bot
|
2018-03-02 16:27:52 +01:00 |
|
Michael RICOIS
|
22bef2c9db
|
Merge branch 'ticket/r16450-mr_country' into develop
|
2018-03-02 11:39:13 +01:00 |
|
Michael RICOIS
|
c09fe7c1fb
|
Fix switch
|
2018-03-02 11:38:32 +01:00 |
|
Michael RICOIS
|
05d11e97fa
|
Merge branch 'ticket/r16450-mr_country' into develop
|
2018-03-02 11:04:57 +01:00 |
|
Michael RICOIS
|
056d5a9f3f
|
Country display
|
2018-03-02 10:44:07 +01:00 |
|
Michael RICOIS
|
4f729d9b2b
|
Merge branch 'ticket/r16159-customer-message' into develop
|
2018-03-01 16:30:19 +01:00 |
|
Michael RICOIS
|
7208390679
|
Typo
|
2018-03-01 16:29:55 +01:00 |
|
Michael RICOIS
|
9e010d63d6
|
Typo
|
2018-03-01 16:27:27 +01:00 |
|
Michael RICOIS
|
63e4c4385e
|
Merge branch 'ticket/r16348-credit-expired' into develop
|
2018-03-01 16:09:17 +01:00 |
|
Michael RICOIS
|
75176c652f
|
Merge remote-tracking branch 'origin/ticket/r16347-mail-lang' into develop
|
2018-02-28 17:50:20 +01:00 |
|
Michael RICOIS
|
45d340ac64
|
Reset global value
|
2018-02-28 17:37:15 +01:00 |
|
Michael RICOIS
|
92415523d0
|
Merge branch 'ticket/r16112-display-credit'
|
2018-02-28 11:27:53 +01:00 |
|
Michael RICOIS
|
a5578a75c1
|
Merge branch 'ticket/r16112-display-credit' into develop
|
2018-02-28 11:24:27 +01:00 |
|
Michael RICOIS
|
af201001f1
|
Display credit on standard customer
|
2018-02-28 11:14:09 +01:00 |
|
Michael RICOIS
|
5a6ff9c962
|
Remove credit expired
|
2018-02-27 17:48:02 +01:00 |
|
Michael RICOIS
|
95ff7a4323
|
Merge branch 'ticket/r16345-lang'
|
2018-02-27 16:18:11 +01:00 |
|
Michael RICOIS
|
63e1e1eae5
|
Merge branch 'ticket/r16112-display-credit'
|
2018-02-27 16:17:18 +01:00 |
|
Michael RICOIS
|
9c8f93faa9
|
Merge branch 'ticket/r16345-lang' into develop
Conflicts:
.gitignore
|
2018-02-27 15:12:12 +01:00 |
|
Michael RICOIS
|
4f0dab9452
|
Merge remote-tracking branch 'origin/ticket/r16112-display-credit' into develop
|
2018-02-27 14:46:12 +01:00 |
|
Michael RICOIS
|
427258606c
|
CS
|
2018-02-27 14:36:05 +01:00 |
|
Michael RICOIS
|
563bd0c7df
|
Change display
|
2018-02-27 10:44:27 +01:00 |
|
Michael RICOIS
|
9450f9f0de
|
Clean mail translation
|
2018-02-26 17:08:23 +01:00 |
|
Michael RICOIS
|
7cea4e23ba
|
Language
|
2018-02-26 16:13:35 +01:00 |
|
Michael RICOIS
|
613411ea4a
|
Encode
|
2018-02-26 15:50:21 +01:00 |
|
Michael RICOIS
|
73563b0ca8
|
Remove .hg
|
2018-02-26 15:30:58 +01:00 |
|