Commit Graph

550 Commits

Author SHA1 Message Date
Marion Muszynski
7043f4b24a other fix 2016-06-22 17:23:34 +02:00
Marion Muszynski
a6c46f9077 petit fix before prod 2016-06-22 17:08:09 +02:00
Marion Muszynski
7af6d9ccd7 adding bg for sale 2016-06-10 16:49:43 +02:00
Marion Muszynski
6c3e87c85a Merge branch 'ticket-8251' 2016-06-10 14:53:46 +02:00
Marion Muszynski
2c07f5a0b2 good fix this time 2016-06-10 14:52:32 +02:00
Marion Muszynski
50eff4bc6c Merge branch 'ticket-8251' 2016-06-10 14:46:04 +02:00
Marion Muszynski
9f39cdffe4 petit fix 2016-06-10 14:45:46 +02:00
Marion Muszynski
7ea4968d08 fix 2016-06-10 14:44:45 +02:00
Marion Muszynski
ce9af872f7 Merge branch 'ticket-8251' 2016-06-10 14:39:59 +02:00
Marion Muszynski
e3bc588287 update function expe48hbis 2016-06-10 14:37:34 +02:00
Marion Muszynski
b276ca2f68 Merge branch 'ticket-8251' 2016-06-10 12:24:33 +02:00
Marion Muszynski
1386f8460f modif for prod 2016-06-10 12:19:45 +02:00
Marion Muszynski
bafeacf546 Merge branch 'ticket-9875' 2016-06-10 11:55:33 +02:00
Marion Muszynski
40ab87cd45 update request deb expe 2016-06-10 11:55:09 +02:00
Marion Muszynski
389356d129 suite update 2016-06-10 11:41:50 +02:00
Marion Muszynski
2d776eae51 Merge branch 'ticket-9875' 2016-06-10 10:22:49 +02:00
Marion Muszynski
182a608e3b little update in request 2016-06-10 10:22:26 +02:00
Marion Muszynski
dbe607dccc modif invoices for multi expe48h 2016-06-09 10:31:52 +02:00
Marion Muszynski
2611a2e1ca Merge branch 'ticket-10169' 2016-06-08 17:46:27 +02:00
Marion Muszynski
1615e9a452 adding fields in sale exports 2016-06-08 17:44:21 +02:00
Marion Muszynski
77023fdbcb invoice for multi 48h 2016-06-08 16:56:43 +02:00
Marion Muszynski
ba706ec6c9 Merge branch 'ticket-fidelite' 2016-06-08 16:33:40 +02:00
Marion Muszynski
d47310bc0a redirect for es version 2016-06-08 16:27:56 +02:00
Marion Muszynski
ab21f10643 Merge branch 'ticket-fidelite' 2016-06-08 12:53:58 +02:00
Marion Muszynski
dc85f8eca6 modif trad 2016-06-08 12:53:38 +02:00
Marion Muszynski
60996f7bcf Merge branch 'ticket-fidelite' 2016-06-08 12:26:28 +02:00
Marion Muszynski
c0836540bc delete some stuff about categories 2016-06-08 12:25:05 +02:00
Marion Muszynski
5c8e35adf2 Merge branch 'ticket-fidelite' 2016-06-08 12:16:37 +02:00
Marion Muszynski
e7ce0ecb86 opti request suite 2016-06-08 12:14:54 +02:00
Marion Muszynski
e9300ff725 opti request 2 2016-06-08 12:02:16 +02:00
Marion Muszynski
83c4acc83d opti request 2016-06-08 11:44:13 +02:00
Marion Muszynski
30b39b5776 fix conflicts 2016-06-08 10:53:07 +02:00
Marion Muszynski
b9f7b26a59 modif css shopping cart 2016-06-08 10:37:37 +02:00
Marion Muszynski
6196489224 Merge branch 'ticket-8041' 2016-06-07 17:47:45 +02:00
Marion Muszynski
563896bbcb rename import done 2016-06-07 17:42:59 +02:00
Marion Muszynski
577249435f Merge branch 'ticket-10122' 2016-06-07 17:00:06 +02:00
Marion Muszynski
5f21c6d3b2 update braderie 2016-06-07 16:40:19 +02:00
Srv Bebeboutik
3ba607554c modif end sale 2016-06-07 16:02:16 +02:00
Srv Bebeboutik
f96c85f584 trad 2016-06-07 16:01:57 +02:00
Marion Muszynski
fb26faeb8e suite update braderie 2016-06-07 14:42:40 +02:00
Marion Muszynski
7dfe697cb7 Merge branch 'ticket-10122' 2016-06-07 13:02:29 +02:00
Marion Muszynski
9212b8e84d petit fix sur la braderie 2016-06-07 13:02:03 +02:00
Srv Bebeboutik
7025bce024 add phrase frais de port popup 2016-06-07 12:52:15 +02:00
Srv Bebeboutik
0759a7b04f gitignore 2016-06-07 12:30:00 +02:00
Thibault UBUNTU
2cf5555949 Merge branch 'dylan_9894' 2016-06-07 12:16:21 +02:00
Dylan Travers
a542baf9b0 Add extrafield and date_end to newsletter. Ticket N°9894 2016-06-07 11:48:20 +02:00
Srv Bebeboutik
49e26669a9 modif from prod 2016-06-07 11:22:35 +02:00
Dylan Travers
49d2e67f39 fix 2016-06-07 10:55:19 +02:00
Dylan Travers
4fc9a8dd35 fix 2016-06-07 10:54:19 +02:00
Marion Muszynski
59efa679b3 Merge branch 'ticket-9893' 2016-06-06 17:50:54 +02:00