Marion Muszynski
|
4b20be7481
|
Merge branch 'ticket-criteo' into develop
|
2016-07-28 12:06:42 +02:00 |
|
Marion Muszynski
|
de5ea0a04a
|
fix price quantity
|
2016-07-28 12:06:25 +02:00 |
|
Marion Muszynski
|
d7f16471db
|
Merge branch 'ticket-criteo' into develop
|
2016-07-28 11:53:32 +02:00 |
|
Marion Muszynski
|
7985bf0b78
|
small fix
|
2016-07-28 11:53:17 +02:00 |
|
Marion Muszynski
|
8993c8e126
|
Merge branch 'ticket-criteo' into develop
|
2016-07-28 11:49:12 +02:00 |
|
Marion Muszynski
|
6ed911b9d5
|
fix
|
2016-07-28 11:48:51 +02:00 |
|
Marion Muszynski
|
08d7951206
|
Merge branch 'ticket-criteo' into develop
|
2016-07-28 11:38:28 +02:00 |
|
Marion Muszynski
|
01cc230757
|
test for fix
|
2016-07-28 11:38:11 +02:00 |
|
Marion Muszynski
|
606e4ef980
|
Merge branch 'ticket-criteo' into develop
|
2016-07-28 10:50:31 +02:00 |
|
Marion Muszynski
|
25075ae187
|
small modif
|
2016-07-28 10:50:05 +02:00 |
|
Marion Muszynski
|
da4ba93d2f
|
Merge branch 'ticket-criteo' into develop
|
2016-07-27 20:32:46 +02:00 |
|
Marion Muszynski
|
bf18b4925e
|
fix
|
2016-07-27 20:32:27 +02:00 |
|
Marion Muszynski
|
e0ceaff8b9
|
Merge branch 'ticket-criteo' into develop
|
2016-07-27 20:25:24 +02:00 |
|
Marion Muszynski
|
5c90af9bee
|
little fix
|
2016-07-27 20:25:04 +02:00 |
|
Marion Muszynski
|
01417c4859
|
Merge branch 'ticket-criteo' into develop
|
2016-07-27 20:10:46 +02:00 |
|
Marion Muszynski
|
b481e60b11
|
fix site version
|
2016-07-27 20:10:25 +02:00 |
|
Marion Muszynski
|
a6532f7848
|
Merge branch 'ticket-criteo' into develop
|
2016-07-27 19:52:52 +02:00 |
|
Marion Muszynski
|
0571982b45
|
ajust js tag
|
2016-07-27 19:52:24 +02:00 |
|
Marion Muszynski
|
269e97a295
|
Merge branch 'ticket-criteo' into develop
|
2016-07-27 19:32:38 +02:00 |
|
Marion Muszynski
|
dd941581b7
|
fix url
|
2016-07-27 19:32:15 +02:00 |
|
Marion Muszynski
|
aa81282b02
|
Merge branch 'ticket-criteo' into develop
|
2016-07-27 19:29:32 +02:00 |
|
Marion Muszynski
|
c7f9b261c3
|
modif url in cron
|
2016-07-27 19:29:09 +02:00 |
|
Marion Muszynski
|
0c40f60da5
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-07-27 19:17:40 +02:00 |
|
Marion Muszynski
|
c678be4b21
|
small fix
|
2016-07-27 18:56:17 +02:00 |
|
Marion Muszynski
|
53c3eb2a12
|
Merge branch 'ticket-criteo' into develop
|
2016-07-27 17:49:56 +02:00 |
|
Marion Muszynski
|
9fabb9b7af
|
fix
|
2016-07-27 17:49:29 +02:00 |
|
Marion Muszynski
|
c21b4b906c
|
Merge branch 'ticket-criteo' into develop
|
2016-07-27 17:46:04 +02:00 |
|
Marion Muszynski
|
d2452448fc
|
fix label in config module
|
2016-07-27 17:45:44 +02:00 |
|
Marion Muszynski
|
2210cf508e
|
Merge branch 'ticket-criteo' into develop
|
2016-07-27 17:43:09 +02:00 |
|
Marion Muszynski
|
fbd9dafcac
|
modif url product
|
2016-07-27 17:42:44 +02:00 |
|
Marion Muszynski
|
90b790bcab
|
Merge branch 'ticket-criteo' into develop
|
2016-07-25 16:40:58 +02:00 |
|
Marion Muszynski
|
fe32da2f12
|
add module criteo_bbb
|
2016-07-25 16:40:22 +02:00 |
|
Marion Muszynski
|
02f21d3b21
|
Merge branch 'ticket-deliveryDelay_product' into develop
|
2016-07-25 14:31:54 +02:00 |
|
Marion Muszynski
|
1694bf54d1
|
standardization date estimation part 2
|
2016-07-25 14:31:22 +02:00 |
|
Marion Muszynski
|
2b47a5c932
|
Merge branch 'ticket-deliveryDelay_product' into develop
|
2016-07-25 12:48:41 +02:00 |
|
Marion Muszynski
|
8ca7d2b05b
|
standardization date estimation
|
2016-07-25 12:48:21 +02:00 |
|
Marion Muszynski
|
2ca8f150ca
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-25 12:23:11 +02:00 |
|
Marion Muszynski
|
bb0cd59d0b
|
adjusting date delivery
|
2016-07-25 12:22:50 +02:00 |
|
Marion Muszynski
|
0ccf7667a6
|
Merge branch 'ticket-deliveryDelay_cart' into develop
|
2016-07-25 12:20:03 +02:00 |
|
Marion Muszynski
|
e69073572e
|
modif date
|
2016-07-25 12:19:36 +02:00 |
|
Marion Muszynski
|
c809342939
|
Merge branch 'ticket-deliveryDelay_product' into develop
|
2016-07-25 12:06:23 +02:00 |
|
Marion Muszynski
|
f4f144057d
|
modif date calcul method to include we and check if the last day is a business day
|
2016-07-25 12:05:57 +02:00 |
|
Marion Muszynski
|
50ddbe95b3
|
comment date estimation, waiting for good calcul method
|
2016-07-25 11:23:29 +02:00 |
|
Marion Muszynski
|
f1769755de
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-25 11:18:16 +02:00 |
|
Marion Muszynski
|
dd6a758e32
|
modif css
|
2016-07-25 11:17:40 +02:00 |
|
Marion Muszynski
|
1c1485e4d7
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-25 10:52:06 +02:00 |
|
Marion Muszynski
|
b1ecd00e3e
|
modif for delivery delay
|
2016-07-25 10:51:39 +02:00 |
|
Marion Muszynski
|
a7fdab4e49
|
Merge branch 'ticket-cartValidate' into develop
|
2016-07-21 17:29:40 +02:00 |
|
Marion Muszynski
|
850222794c
|
adding validatecart with paypal method
|
2016-07-21 17:29:17 +02:00 |
|
Marion Muszynski
|
97aa768b07
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-07-18 12:58:48 +02:00 |
|