Marion Muszynski
|
385561fc7c
|
fix conflcit
|
2016-10-12 12:42:41 +02:00 |
|
Marion Muszynski
|
7c0839eea5
|
addition of module to change delivery address
|
2016-10-12 12:40:33 +02:00 |
|
Marion Muszynski
|
2769bf42fd
|
addition of delivery modifier link
|
2016-10-11 14:47:30 +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
|
a93a5b14f2
|
modif css
|
2016-10-11 11:40:18 +02:00 |
|
Marion Muszynski
|
da8f9e0c1f
|
Merge branch 'ticket-GAnalytics'
|
2016-10-10 10:38:46 +02:00 |
|
Marion Muszynski
|
5cf27fac91
|
adjusting carrier name sent to GA
|
2016-10-10 10:38:22 +02:00 |
|
Marion Muszynski
|
401db0a5b2
|
Merge branch 'ticket-GAnalytics'
|
2016-10-10 10:19:57 +02:00 |
|
Marion Muszynski
|
ba150d8ed9
|
adjusting payment type sent to GA
|
2016-10-10 10:19:40 +02:00 |
|
Marion Muszynski
|
46deb152f6
|
Merge branch 'ticket-GAnalytics'
|
2016-10-07 15:14:07 +02:00 |
|
Marion Muszynski
|
7fb403426b
|
Merge branch 'ticket-GAnalytics' into develop
|
2016-10-07 15:11:45 +02:00 |
|
Marion Muszynski
|
88e42535a7
|
fix redirect
|
2016-10-07 15:11:25 +02:00 |
|
Marion Muszynski
|
b50bcf4848
|
fix conflict
|
2016-10-07 15:05:20 +02:00 |
|
Marion Muszynski
|
0f666b08fc
|
fix when ga is blocked
|
2016-10-07 15:03:45 +02:00 |
|
Marion Muszynski
|
797b0e499f
|
Merge branch 'ticket-GAnalytics'
|
2016-10-07 13:57:15 +02:00 |
|
Marion Muszynski
|
2b7ee09f88
|
fix
|
2016-10-07 13:57:01 +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
|
31bea61242
|
fix conflict
|
2016-10-06 15:29:09 +02:00 |
|
Marion Muszynski
|
973fb9bdf1
|
Merge branch 'ticket-GAnalytics' into develop
|
2016-10-06 15:25:44 +02:00 |
|
Marion Muszynski
|
016fbd8353
|
small fix
|
2016-10-06 15:25:25 +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
|
79b0ca62cd
|
fix conflict
|
2016-10-06 11:56:59 +02:00 |
|
Marion Muszynski
|
4f446ca296
|
continuation of ant_support and sav
|
2016-10-06 11:55:13 +02:00 |
|
Marion Muszynski
|
677863a9da
|
Merge branch 'ticket-AssociateProducts' into develop
|
2016-10-05 18:18:08 +02:00 |
|
Marion Muszynski
|
42d4e5ed89
|
modif img
|
2016-10-05 18:17:50 +02:00 |
|
Marion Muszynski
|
ead50a26c4
|
Merge branch 'ticket-AssociateProducts' into develop
|
2016-10-05 18:12:19 +02:00 |
|
Marion Muszynski
|
4a19fa9288
|
modif css accessories
|
2016-10-05 18:12:04 +02:00 |
|
Marion Muszynski
|
6e515c5207
|
Merge branch 'ticket-AssociateProducts' into develop
|
2016-10-05 17:51:08 +02:00 |
|
Marion Muszynski
|
6a415ac50f
|
modif css
|
2016-10-05 17:50:45 +02:00 |
|
Marion Muszynski
|
e0ed73f324
|
Merge branch 'ticket-AssociateProducts'
|
2016-10-05 16:22:11 +02:00 |
|
Marion Muszynski
|
e1a3654411
|
Merge branch 'ticket-AssociateProducts' into develop
|
2016-10-05 16:19:10 +02:00 |
|
Marion Muszynski
|
047f419b8e
|
addition of img to recognize the product
|
2016-10-05 16:18:52 +02:00 |
|
Marion Muszynski
|
77222b5026
|
Merge branch 'ticket-AssociateProducts' into develop
|
2016-10-05 14:36:33 +02:00 |
|
Marion Muszynski
|
6475f2140c
|
modification of product autocomplete with only enabled products
|
2016-10-05 14:36:15 +02:00 |
|
Marion Muszynski
|
a81410ea2b
|
Merge branch 'ticket-AssociateProducts'
|
2016-10-05 12:31:06 +02:00 |
|
Marion Muszynski
|
283b924690
|
Merge branch 'ticket-AssociateProducts' into develop
|
2016-10-05 12:29:34 +02:00 |
|
Marion Muszynski
|
cb5cd4f1b4
|
adjust lenght of slider
|
2016-10-05 12:29:10 +02:00 |
|
Marion Muszynski
|
5c359e8cd3
|
Merge branch 'ticket-10662'
|
2016-10-05 11:28:18 +02:00 |
|
Marion Muszynski
|
541a0ed663
|
fix conflict
|
2016-10-05 11:27:50 +02:00 |
|
Marion Muszynski
|
6c927d2266
|
addition of id category of sale in sale management
|
2016-10-05 11:25:43 +02:00 |
|
Marion Muszynski
|
13385c964d
|
Merge branch 'ticket-philea'
|
2016-09-30 13:08:22 +02:00 |
|
Marion Muszynski
|
c0110a6618
|
modif css and fix alert missing quantity in orders
|
2016-09-30 13:06:24 +02:00 |
|
Marion Muszynski
|
8369aa187f
|
Merge branch 'ticket-philea'
|
2016-09-29 18:08:48 +02:00 |
|
Marion Muszynski
|
d9fd7547d1
|
addition of preparation report
|
2016-09-29 18:08:23 +02:00 |
|