Marion Muszynski
|
14a7368a90
|
fix conflict
|
2016-10-12 18:15:01 +02:00 |
|
Marion Muszynski
|
855d8ba529
|
Merge branch 'ticket-payboxAgreement'
|
2016-10-11 14:49:49 +02:00 |
|
Marion Muszynski
|
c0b23b26c3
|
fix number card
|
2016-10-11 14:49:32 +02:00 |
|
Marion Muszynski
|
b33b709bed
|
Merge branch 'ticket-payboxAgreement'
|
2016-10-11 11:56:05 +02:00 |
|
Marion Muszynski
|
8729c7a6aa
|
fix conflict
|
2016-10-11 11:49:33 +02:00 |
|
Marion Muszynski
|
2a524a6262
|
openning save card to everyone
|
2016-10-11 11:48:25 +02:00 |
|
Marion Muszynski
|
b50bcf4848
|
fix conflict
|
2016-10-07 15:05:20 +02:00 |
|
Marion Muszynski
|
46cae17534
|
fix conflict
|
2016-10-06 16:00:32 +02:00 |
|
Marion Muszynski
|
71a4bcdd52
|
fix name of payment type
|
2016-10-06 15:58:50 +02:00 |
|
Marion Muszynski
|
b2df0d740f
|
Merge branch 'ticket-payboxAgreement'
|
2016-10-06 15:15:10 +02:00 |
|
Marion Muszynski
|
bd80e2c3fa
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-10-06 14:53:53 +02:00 |
|
Marion Muszynski
|
9a20001d73
|
small fix
|
2016-10-06 14:53:29 +02:00 |
|
Marion Muszynski
|
3b9e7d45e9
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-10-06 14:47:16 +02:00 |
|
Marion Muszynski
|
cfc9e5cf3d
|
adjusting refabonne to allow multi saved cards for the same account
|
2016-10-06 14:46:50 +02:00 |
|
Marion Muszynski
|
541a0ed663
|
fix conflict
|
2016-10-05 11:27:50 +02:00 |
|
Marion Muszynski
|
09b85f428f
|
Merge branch 'ticket-payboxAgreement'
|
2016-09-28 13:03:12 +02:00 |
|
Marion Muszynski
|
7fff52b3b8
|
fix utf8
|
2016-09-28 13:02:55 +02:00 |
|
Marion Muszynski
|
2aad574498
|
Merge branch 'ticket-payboxAgreement'
|
2016-09-28 10:49:44 +02:00 |
|
Marion Muszynski
|
a96bc923d1
|
restrict mail sending to our ip
|
2016-09-28 10:49:22 +02:00 |
|
Marion Muszynski
|
8ff008b8bf
|
Merge branch 'ticket-payboxAgreement'
|
2016-09-27 12:07:51 +02:00 |
|
Marion Muszynski
|
f4ecfd644b
|
adjusting response data for paybox payment information
|
2016-09-27 12:07:24 +02:00 |
|
Marion Muszynski
|
7b294b493c
|
Merge branch 'ticket-payboxAgreement'
|
2016-09-27 11:37:56 +02:00 |
|
Marion Muszynski
|
829137c244
|
small fix
|
2016-09-27 11:37:17 +02:00 |
|
Marion Muszynski
|
7018bd81eb
|
save refabonne
|
2016-09-27 11:36:41 +02:00 |
|
Marion Muszynski
|
2f21284be4
|
fix conflict
|
2016-09-27 10:34:47 +02:00 |
|
Marion Muszynski
|
6f89c44d2c
|
prepare tests prod
|
2016-09-27 10:28:39 +02:00 |
|
Marion Muszynski
|
35700db205
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-26 17:51:35 +02:00 |
|
Marion Muszynski
|
0c5950b71d
|
addition of a teston group before open save cb to every customer
|
2016-09-26 17:51:14 +02:00 |
|
Marion Muszynski
|
6047e4607c
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-26 17:23:44 +02:00 |
|
Marion Muszynski
|
2d855a0071
|
remove tests for prod
|
2016-09-26 17:23:26 +02:00 |
|
Marion Muszynski
|
b9155ff9cb
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-26 15:52:57 +02:00 |
|
Marion Muszynski
|
edc56267ca
|
test on dev env
|
2016-09-26 15:52:37 +02:00 |
|
Marion Muszynski
|
a87bb60fc9
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-26 11:47:05 +02:00 |
|
Marion Muszynski
|
3615683240
|
enable link for prod
|
2016-09-26 11:46:37 +02:00 |
|
Marion Muszynski
|
1a3ce467c5
|
Merge branch 'ticket-printProductEan' into develop
|
2016-09-22 13:41:39 +02:00 |
|
Marion Muszynski
|
b26fefd0f3
|
fix conflict
|
2016-09-21 16:24:32 +02:00 |
|
Marion Muszynski
|
2cde4025ac
|
add loader for paybox direct payment
|
2016-09-21 16:21:32 +02:00 |
|
Marion Muszynski
|
4230758422
|
add refund and cancel permission to profile 14 braderie
|
2016-09-21 10:50:36 +02:00 |
|
Marion Muszynski
|
e77fe5a0dc
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-15 15:24:43 +02:00 |
|
Marion Muszynski
|
bb457294ea
|
fix mod translation
|
2016-09-15 15:24:10 +02:00 |
|
Marion Muszynski
|
66bfbed0ed
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-14 16:10:55 +02:00 |
|
Marion Muszynski
|
415c1ba7ad
|
text modification
|
2016-09-14 16:10:41 +02:00 |
|
Marion Muszynski
|
f5cf501cad
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-14 16:01:05 +02:00 |
|
Marion Muszynski
|
c8ecf874fe
|
stupid mistake
|
2016-09-14 16:00:50 +02:00 |
|
Marion Muszynski
|
e15272197d
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-14 15:54:43 +02:00 |
|
Marion Muszynski
|
75f702d132
|
right fix
|
2016-09-14 15:54:25 +02:00 |
|
Marion Muszynski
|
8fbc3de72e
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-14 15:26:28 +02:00 |
|
Marion Muszynski
|
fa7a20ab2e
|
fix price 3
|
2016-09-14 15:26:12 +02:00 |
|
Marion Muszynski
|
3ed6c2c33f
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-09-14 15:16:23 +02:00 |
|
Marion Muszynski
|
9ef597817e
|
fix price 2
|
2016-09-14 15:16:07 +02:00 |
|