363 Commits

Author SHA1 Message Date
Marion Muszynski
999faa694c Merge branch 'ticket-9791' 2016-04-08 16:12:15 +02:00
Marion Muszynski
b0a0abaf03 add ref to bdc log 2016-04-08 16:09:49 +02:00
Marion Muszynski
786c055787 add trad 2016-04-08 15:37:53 +02:00
Marion Muszynski
1d26459616 update landing page for connect button 2016-04-08 15:31:40 +02:00
Marion Muszynski
ace3f99035 Merge branch 'ticket-9791' 2016-04-08 11:30:43 +02:00
Marion Muszynski
447362a0d7 optimisation excel bdc 2016-04-08 11:26:48 +02:00
Marion Muszynski
fe03a17200 add generate rack in labelgenerate 2016-04-08 10:27:46 +02:00
Marion Muszynski
8c7dc01d73 suite opti bdc 2016-04-08 10:11:11 +02:00
Marion Muszynski
a9ad96ad98 opti excel style to all bdc 2016-04-07 11:47:02 +02:00
Marion Muszynski
613c58245f optimization excel style bdc 2016-04-07 10:53:27 +02:00
Marion Muszynski
d02a74938b opti bdc 2016-04-06 18:16:18 +02:00
Marion Muszynski
2c7864cd89 Merge branch 'ticket-9791' 2016-04-06 17:34:01 +02:00
Marion Muszynski
5ce6d92b75 correction bug 2016-04-06 17:32:04 +02:00
Thibault UBUNTU
3e3d3a0e58 fix paypal order save 2016-04-06 16:32:50 +02:00
Thibault UBUNTU
552b46347e v0.1 paypal billing 2016-04-06 15:52:14 +02:00
Marion Muszynski
60cf70493a Merge branch 'ticket-9791' 2016-04-06 15:08:35 +02:00
Marion Muszynski
91efe4469e fix conflict adminProduct 2016-04-06 14:46:47 +02:00
Marion Muszynski
bf619d7173 update trad in export bdc 2016-04-06 13:21:04 +02:00
Marion Muszynski
42704a03c7 creation bdc logistique 2016-04-06 13:09:54 +02:00
Marion Muszynski
c35bcc893a avancées dans le bdc log 2016-04-05 18:15:35 +02:00
Marion Muszynski
c6887b7b84 suite ticket 9791 2016-04-05 16:14:32 +02:00
Marion Muszynski
12d18ea080 Merge branch 'ticket-9643' 2016-04-05 14:43:37 +02:00
Marion Muszynski
c9023ddb9a fix ref problem 2016-04-05 14:20:50 +02:00
Marion Muszynski
e94b10553d begin bdc logistique 2016-04-04 17:23:15 +02:00
Marion Muszynski
d658b0eab2 update message confirm for deletion ean 2016-04-04 15:54:18 +02:00
Marion Muszynski
7fbf095387 update for delete ean in sale 2016-04-04 15:20:32 +02:00
Marion Muszynski
e76af013f5 Merge branch 'alexandre-braderie' into develop 2016-04-04 14:18:42 +02:00
Marion Muszynski
aa10c07dd6 update categories pb 2016-04-04 14:18:12 +02:00
Marion Muszynski
e8a15b1e19 Merge branch 'alexandre-braderie' into develop 2016-04-04 13:35:04 +02:00
Marion Muszynski
11a07506c0 update product name 2016-04-04 13:34:26 +02:00
Thibault UBUNTU
8471702ff7 fix 2016-04-04 13:25:38 +02:00
Thibault UBUNTU
39f9ff27e5 skin page payment 2016-04-04 13:24:07 +02:00
Thibault GUILLAUME
5beaf8e77e fix conflict 2016-04-04 11:49:45 +02:00
Thibault GUILLAUME
3d0ebede08 test 2016-04-04 11:47:52 +02:00
Marion Muszynski
6279c24199 adding privatesale country 2016-04-04 10:49:37 +02:00
Marion Muszynski
7500debda5 Merge branch 'alexandre-braderie' into develop 2016-04-01 11:52:23 +02:00
Marion Muszynski
f1223a3289 update to add product in parent category 2016-04-01 11:51:58 +02:00
Marion Muszynski
17fed79f4f Merge branch 'alexandre-braderie' into develop 2016-03-31 12:48:18 +02:00
Marion Muszynski
bfa1328547 update for bip ean 2016-03-31 12:47:51 +02:00
Srv Bebeboutik
7512ebbe4b modif pour le flux partenaire familydeal 2016-03-31 12:08:00 +02:00
Srv Bebeboutik
ba20deb904 add lang to emarsys rss img 2016-03-31 12:07:30 +02:00
Srv Bebeboutik
bcdb91f1e3 prepare ssl 2016-03-31 12:06:08 +02:00
Marion Muszynski
33c3bc741a Merge branch 'alexandre-braderie' into develop 2016-03-31 11:52:20 +02:00
Marion Muszynski
4905fc1e86 update braderie with category 2016-03-31 11:51:37 +02:00
Marion Muszynski
3ab5a75a06 update for prod with good email addresses 2016-03-29 17:42:28 +02:00
Marion Muszynski
053876e6d2 Merge branch 'ticket-9759' into develop 2016-03-29 17:39:01 +02:00
Marion Muszynski
3284953789 update logo adminAlert 2016-03-29 17:38:35 +02:00
Marion Muszynski
65a43a991c Merge branch 'ticket-9759' into develop 2016-03-29 17:33:44 +02:00
Marion Muszynski
e1e40f0458 update mail template and module 2016-03-29 17:33:15 +02:00
Marion Muszynski
c27c0fc1aa Merge branch 'ticket-9759' into develop 2016-03-29 17:10:05 +02:00