1722 Commits

Author SHA1 Message Date
Marion Muszynski
c90126baa8 addition of styled select 2016-10-21 15:54:52 +02:00
Marion Muszynski
dadaaa9c7b Merge branch 'ticket-philea2' 2016-10-21 15:40:14 +02:00
Marion Muszynski
a8efd305e4 modif css 2016-10-21 15:39:59 +02:00
Marion Muszynski
ebe3f193c7 Merge branch 'add-customCss' 2016-10-21 14:27:42 +02:00
Marion Muszynski
360fab6774 addition of css to admin part 2016-10-21 14:27:19 +02:00
Marion Muszynski
630c05310d Merge branch 'ticket-philea' 2016-10-21 14:06:46 +02:00
Marion Muszynski
e63bb8b2d3 fix report request 2016-10-21 14:06:32 +02:00
Marion Muszynski
5beb5233c6 Merge branch 'ticket-philea' 2016-10-21 13:40:27 +02:00
Marion Muszynski
3b42caa07c save sending in syncreport 2016-10-21 13:39:56 +02:00
Marion Muszynski
8856ec3818 Merge branch 'ticket-ChangeDeliveryAddress' into develop 2016-10-21 11:57:38 +02:00
Marion Muszynski
6f00da4000 addition of success message 2016-10-21 11:57:17 +02:00
Marion Muszynski
49aeb076ac Merge branch 'ticket-11056' into develop 2016-10-20 14:03:30 +02:00
Marion Muszynski
37d7422d08 fix js 2016-10-20 14:03:15 +02:00
Marion Muszynski
593166c883 Merge branch 'ticket-11056' into develop 2016-10-20 13:49:19 +02:00
Marion Muszynski
302ba040d1 modif expedition 2016-10-20 13:48:55 +02:00
Marion Muszynski
2292e0da7a Merge branch 'ticket-philea' 2016-10-20 11:30:38 +02:00
Marion Muszynski
7b599a0f08 fix show reports 2016-10-20 11:30:23 +02:00
Marion Muszynski
af298a194d Merge branch 'ticket-philea' 2016-10-20 09:53:01 +02:00
Marion Muszynski
fcd5f537f6 active cron 2016-10-20 09:52:42 +02:00
Marion Muszynski
513dd624b3 Merge branch 'ticket-philea' 2016-10-20 09:43:57 +02:00
Marion Muszynski
4c8f727932 fix 2016-10-20 09:43:37 +02:00
Marion Muszynski
22663f53b5 Merge branch 'ticket-ChangeDeliveryAddress' into develop 2016-10-19 18:31:35 +02:00
Marion Muszynski
e2a4385a5e fix change address socol for DOM 2016-10-19 18:31:19 +02:00
Marion Muszynski
a6fbef7cde Merge branch 'ticket-GAnalytics-mobile' 2016-10-19 16:29:36 +02:00
Marion Muszynski
c7579d79aa Merge branch 'ticket-GAnalytics-mobile' into develop 2016-10-19 16:23:35 +02:00
Marion Muszynski
ab39335846 integration of enhanced ecommerce on mobile version 2016-10-19 16:23:01 +02:00
Marion Muszynski
f04d4c2b38 Merge branch 'ticket-AideContact-SAV' into develop 2016-10-19 12:51:48 +02:00
Marion Muszynski
a598bb04f4 modif css 2016-10-19 12:51:28 +02:00
Marion Muszynski
85ea947a11 Merge branch 'ticket-AideContact-SAV' into develop 2016-10-19 12:44:51 +02:00
Marion Muszynski
47b180afb1 continuation of modif 2016-10-19 12:44:12 +02:00
Marion Muszynski
3db72e00f4 Merge branch 'ticket-AideContact-SAV' into develop 2016-10-18 17:07:37 +02:00
Marion Muszynski
1d4435a4ef continuing 2016-10-18 17:02:58 +02:00
Marion Muszynski
6c51d23463 Merge branch 'ticket-AideContact-SAV' into develop 2016-10-18 16:12:31 +02:00
Marion Muszynski
85650ffaba fix 2016-10-18 16:12:13 +02:00
Marion Muszynski
b7b982305f continuation 2016-10-18 15:25:52 +02:00
Marion Muszynski
d99443e20e Merge branch 'fix-paypal' 2016-10-18 14:45:00 +02:00
Marion Muszynski
3550b68bc5 add custom message 2016-10-18 14:43:12 +02:00
Marion Muszynski
607d4d0628 Merge branch 'fix-paypal' into develop 2016-10-18 13:11:54 +02:00
Marion Muszynski
3b2eec3adc fix 2016-10-18 13:11:32 +02:00
Marion Muszynski
179771c5df Merge branch 'fix-paypal' into develop 2016-10-18 13:02:52 +02:00
Marion Muszynski
5f8d23c3b1 open save paypal 2016-10-18 13:02:35 +02:00
Marion Muszynski
d9c8a37f64 fix conflict 2016-10-18 13:00:30 +02:00
Marion Muszynski
55129786ec open paypal account 2016-10-18 12:59:37 +02:00
Marion Muszynski
1f5d683f4b fix conflict 2016-10-18 12:58:26 +02:00
Marion Muszynski
9aac4ea22a comment address creation and recuperation address info after doExpressCheckout 2016-10-18 12:54:53 +02:00
Marion Muszynski
b5916c5a74 Merge branch 'ticket-AideContact-SAV' into develop 2016-10-18 12:12:27 +02:00
Marion Muszynski
84f2643e53 continuation sav 2016-10-18 12:12:06 +02:00
Marion Muszynski
6062c42108 Merge branch 'fix-paypal' 2016-10-17 17:37:40 +02:00
Marion Muszynski
1abe8d0fbd hide paypal billing 2016-10-17 17:37:23 +02:00
Marion Muszynski
6e0cfd7635 modif 2016-10-17 17:29:37 +02:00