Commit Graph

246 Commits

Author SHA1 Message Date
Marion Muszynski
acc8ded407 adapte carrier for dev 2016-05-13 14:19:35 +02:00
Marion Muszynski
7e7feb5a52 ajust css and opti restrict addresses 2016-05-13 13:31:50 +02:00
Srv Bebeboutik
1fef6beb19 modif css site et mobile 2016-05-13 11:41:40 +02:00
Srv Bebeboutik
5a7c3a0241 modif cart 2016-05-13 10:37:05 +02:00
Srv Bebeboutik
3a4f5414d8 fix conflict 2016-05-12 12:12:42 +02:00
Srv Bebeboutik
34b34929ef push la modif de cart 2016-05-12 12:10:50 +02:00
Marion Muszynski
19ed76d6ba Merge branch 'ticket-flexibilite' 2016-05-12 12:06:43 +02:00
Marion Muszynski
ebdd485182 modif id carrier in cart 2016-05-12 10:18:15 +02:00
Marion Muszynski
5fcccda0ee Merge branch 'ticket-parrainageMobile' 2016-05-10 16:30:25 +02:00
Marion Muszynski
f8e85b7a41 hotfix trim email 2016-05-10 16:28:32 +02:00
Marion Muszynski
f0d183580a modif cart 2016-05-09 18:02:20 +02:00
Marion Muszynski
ffbb3232b9 modif soflex 2016-05-09 17:43:57 +02:00
Alexandre Simonet
cc86b7849d add rss fluxcatalogue 2016-05-03 12:20:54 +02:00
Marion Muszynski
e82357544c Merge branch 'ticket-newExtract' 2016-04-27 18:07:18 +02:00
Marion Muszynski
397a73d037 modif product price for DEB exp 2016-04-27 18:04:42 +02:00
Marion Muszynski
caa68a4c2f Merge branch 'ticket-newExtract' 2016-04-27 12:10:03 +02:00
Marion Muszynski
9e2c4c5c39 adding origin product to DEB exp 2016-04-27 12:08:22 +02:00
Marion Muszynski
ae1687a105 Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik 2016-04-27 11:35:03 +02:00
Marion Muszynski
cd3d9b43af Merge branch 'ticket-newExtract' 2016-04-27 11:33:58 +02:00
Srv Bebeboutik
6a1fd27e32 optimize stat 2016-04-27 11:31:43 +02:00
Marion Muszynski
5f96303fe9 modif for multi generation of csv in same time 2016-04-27 11:11:23 +02:00
Marion Muszynski
54bbfd5248 modif extract 2016-04-25 17:16:29 +02:00
Marion Muszynski
dde198080d modif extract custom 2016-04-25 16:50:51 +02:00
Marion Muszynski
e8f0026211 Merge branch 'ticket-updBraderie' 2016-04-25 10:48:17 +02:00
Marion Muszynski
72a3792897 fix bug double adding 2016-04-25 10:43:24 +02:00
Marion Muszynski
811ba9b3a9 Merge branch 'ticket-newExtracts' 2016-04-20 16:40:37 +02:00
Marion Muszynski
4b80f9f7a6 correction 2016-04-20 16:40:12 +02:00
Marion Muszynski
ef33e2cbc7 Merge branch 'ticket-newExtracts' 2016-04-20 16:05:20 +02:00
Marion Muszynski
753b17fcba petite rectification quantity_sold 2016-04-20 15:58:47 +02:00
Marion Muszynski
21f1ada2d1 Merge branch 'ticket-landingpage' 2016-04-20 15:35:16 +02:00
Marion Muszynski
4c4c069588 modif width button 2016-04-20 12:35:20 +02:00
Marion Muszynski
ecf913626f update extract names 2016-04-20 11:59:02 +02:00
Marion Muszynski
c63769824e add 2 new extracts for deb 2016-04-20 11:37:50 +02:00
Marion Muszynski
219b6dabb3 Merge branch 'ticket-consumable' 2016-04-18 16:17:30 +02:00
Marion Muszynski
ca6587052b change id consumable for prod 2016-04-18 16:17:04 +02:00
Marion Muszynski
cbbaf9c8e0 modif left_img.tpl 2016-04-18 16:14:19 +02:00
Marion Muszynski
1c0d70688c modif categoryimg 2016-04-18 16:03:17 +02:00
Marion Muszynski
d7b7e7abc6 modif connect button in landing page 2016-04-18 15:22:00 +02:00
Marion Muszynski
e2cc8ff3fd Merge branch 'ticket-extract' 2016-04-15 16:48:37 +02:00
Marion Muszynski
f0e2a7481a fix to order image by position 2016-04-15 12:38:31 +02:00
Marion Muszynski
cdd8b21bfe add nc8 id_country into export sales 2016-04-15 12:05:25 +02:00
Marion Muszynski
e56cf154f7 Merge branch 'ticket-consumable' 2016-04-15 11:44:09 +02:00
Marion Muszynski
d0a702380f update css 2016-04-15 11:43:42 +02:00
Marion Muszynski
5521eeba23 Merge branch 'ticket-consumable' 2016-04-15 11:37:26 +02:00
Marion Muszynski
0073cb8dde fix css 2016-04-15 11:37:01 +02:00
Marion Muszynski
ab9546027d Merge branch 'ticket-consumable' 2016-04-15 11:33:28 +02:00
Marion Muszynski
f7f7a15339 update css site mobile 2016-04-15 11:33:00 +02:00
Marion Muszynski
8dcdd78eb1 Merge branch 'ticket-consumable' 2016-04-15 11:28:24 +02:00
Marion Muszynski
7f2cf9cd16 add tpl and css for site mobile 2016-04-15 11:26:00 +02:00
Marion Muszynski
e8f56f54d5 Merge branch 'ticket-triSearch' 2016-04-15 10:09:34 +02:00