Commit Graph

1223 Commits

Author SHA1 Message Date
Marion Muszynski
51e726856d Merge branch 'ticket-modifNameCarrierEs' 2016-07-29 13:45:01 +02:00
Marion Muszynski
78c68346c6 Merge branch 'ticket-modifNameCarrierEs' into develop 2016-07-29 13:42:16 +02:00
Marion Muszynski
39fa6390f7 modif name in order summary 2016-07-29 13:41:55 +02:00
Marion Muszynski
8053859bf4 fix 2016-07-29 13:32:38 +02:00
Marion Muszynski
9d3083eb23 update carrier name when es 2016-07-29 13:31:12 +02:00
Marion Muszynski
0904afd11c Merge branch 'ticket-criteo' 2016-07-28 13:36:06 +02:00
Marion Muszynski
8c01db6073 Merge branch 'ticket-criteo' into develop 2016-07-28 13:35:41 +02:00
Marion Muszynski
854d8fe6f0 fix price 2016-07-28 13:35:24 +02:00
Marion Muszynski
141dbfda94 Merge branch 'ticket-criteo' 2016-07-28 13:27:45 +02:00
Marion Muszynski
14640d4601 Merge branch 'ticket-criteo' into develop 2016-07-28 13:27:19 +02:00
Marion Muszynski
2fe135dbce little mod 2016-07-28 13:26:58 +02:00
Marion Muszynski
794c5e7844 Merge branch 'ticket-criteo' 2016-07-28 12:31:10 +02:00
Marion Muszynski
fe85712667 Merge branch 'ticket-criteo' into develop 2016-07-28 12:30:04 +02:00
Marion Muszynski
285c610784 fix order 2016-07-28 12:29:45 +02:00
Marion Muszynski
08ab57a1f1 Merge branch 'ticket-criteo' 2016-07-28 12:12:10 +02:00
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
d9c89a94cc Merge branch 'ticket-criteo' 2016-07-28 11:54:34 +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
b0cce26e9f Merge branch 'ticket-criteo' 2016-07-28 10:51:01 +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
cc08a0f084 Merge branch 'ticket-criteo' 2016-07-27 20:33:12 +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
5097cb50ad Merge branch 'ticket-criteo' 2016-07-27 20:25:55 +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
9f2d22164b Merge branch 'ticket-criteo' 2016-07-27 20:15:06 +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
dea3180ba6 Merge branch 'ticket-criteo' 2016-07-27 19:33:17 +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
36352f9187 Merge branch 'ticket-criteo' 2016-07-27 19:29:58 +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
94ac58ae4b Merge branch 'ticket-criteo' 2016-07-27 17:50:16 +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
32d3923948 Merge branch 'ticket-criteo' 2016-07-27 17:47:48 +02:00