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 |
|
Michael RICOIS
|
5980a64743
|
Merge branch 'ticket-14739-PackLogistic' into develop
|
2018-02-26 12:45:37 +01:00 |
|
Michael RICOIS
|
8288c15333
|
Enhance customer search for discount
|
2018-02-26 12:20:35 +01:00 |
|
Michael RICOIS
|
b9016d4131
|
Merge branch 'ticket/r15587-refund-paypal'
|
2018-02-26 11:50:28 +01:00 |
|
Michael RICOIS
|
197f4161d1
|
Add New Import
|
2018-02-26 11:46:03 +01:00 |
|
David
|
e10b13392d
|
Merge branch 'ticket-15629-new-landing' into develop
|
2018-02-23 18:48:15 +01:00 |
|
David
|
89f3aff521
|
image cache invalidation
breadcrumb visible on error
|
2018-02-23 18:46:48 +01:00 |
|
Michael RICOIS
|
094f382eb5
|
Enhance customer search for discount
|
2018-02-23 16:12:06 +01:00 |
|
Michael RICOIS
|
96352f3042
|
Merge branch 'ticket/r16159-customer-message' into develop
|
2018-02-23 12:36:35 +01:00 |
|
Michael RICOIS
|
d307e50f7f
|
Get back to date_upd
|
2018-02-23 12:19:46 +01:00 |
|
Michael RICOIS
|
71d44a1eb6
|
Merge branch 'ticket/r16159-customer-message' into develop
|
2018-02-23 12:11:05 +01:00 |
|
Michael RICOIS
|
a09de51ac2
|
Reset date_upd
|
2018-02-23 12:10:14 +01:00 |
|
Michael RICOIS
|
b87e937fbc
|
Merge branch 'ticket/r15587-refund-paypal' into develop
|
2018-02-23 11:38:11 +01:00 |
|
Michael RICOIS
|
78ec506d8b
|
Change detection of complete order refund, and change state of order
|
2018-02-23 11:22:14 +01:00 |
|
Michael RICOIS
|
2cdfbdb833
|
Date update only if it's a thread
|
2018-02-22 17:56:47 +01:00 |
|
Michael RICOIS
|
cf142b7071
|
CS
|
2018-02-22 17:54:49 +01:00 |
|
Michael RICOIS
|
d5b1691ebf
|
Merge branch 'fix/imageResize'
|
2018-02-22 16:28:11 +01:00 |
|
Michael RICOIS
|
9fd729310a
|
Merge branch 'fix/imageResize' into develop
|
2018-02-22 16:24:06 +01:00 |
|
Michael RICOIS
|
a4edf0dbc1
|
Image lib
|
2018-02-22 16:23:41 +01:00 |
|
Michael RICOIS
|
b98aad808b
|
Merge branch 'ticket/r15587-refund-paypal'
|
2018-02-22 16:05:43 +01:00 |
|
Michael RICOIS
|
f514096c98
|
Merge branch 'fix/imageResize'
|
2018-02-22 16:03:42 +01:00 |
|
Michael RICOIS
|
57d8bc52c6
|
Merge branch 'fix/imageResize' into develop
|
2018-02-22 15:55:42 +01:00 |
|
Michael RICOIS
|
b5307d448a
|
Merge branch 'ticket/r15587-refund-paypal' into develop
|
2018-02-22 15:54:47 +01:00 |
|
Michael RICOIS
|
06413abad5
|
Fix var
|
2018-02-22 15:54:25 +01:00 |
|
Michael RICOIS
|
834fbe9348
|
Merge branch 'ticket/r14647-welcome-mail'
Conflicts:
.gitignore
mails/es/account.html
mails/es/account.txt
|
2018-02-22 09:41:10 +01:00 |
|
Michael RICOIS
|
48f2940d2d
|
Merge branch 'ticket-14739-PackLogistic'
|
2018-02-22 09:35:41 +01:00 |
|
Michael RICOIS
|
d303a06b7e
|
Merge branch 'ticket/r15587-refund-paypal'
|
2018-02-21 17:21:32 +01:00 |
|
Michael RICOIS
|
3497ca7675
|
Merge branch 'ticket/r15587-refund-paypal' into develop
|
2018-02-21 17:12:36 +01:00 |
|
Michael RICOIS
|
c3b0dafacf
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2018-02-21 17:02:03 +01:00 |
|