Thibault UBUNTU
|
6512b4aaaa
|
Merge branch 'develop' of gitlab.antadis.fr:dev-antadis/bebeboutik into develop
|
2016-04-20 14:20:40 +02:00 |
|
Thibault UBUNTU
|
639d2402e6
|
Merge branch 'paypal_billing' into develop
|
2016-04-20 14:20:15 +02:00 |
|
Thibault UBUNTU
|
848dbdedc0
|
load payment paypal
|
2016-04-20 14:20:07 +02:00 |
|
Marion Muszynski
|
f2e0e80149
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-20 12:35:50 +02:00 |
|
Marion Muszynski
|
4c4c069588
|
modif width button
|
2016-04-20 12:35:20 +02:00 |
|
Marion Muszynski
|
789b011f7f
|
Merge branch 'ticket-newExtracts' into develop
|
2016-04-20 11:59:27 +02:00 |
|
Marion Muszynski
|
ecf913626f
|
update extract names
|
2016-04-20 11:59:02 +02:00 |
|
Marion Muszynski
|
7ff21f8a76
|
Merge branch 'ticket-newExtracts' into develop
|
2016-04-20 11:38:26 +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
|
ffb8f1f3c2
|
Merge branch 'ticket-consumable' into develop
|
2016-04-18 16:14:40 +02:00 |
|
Marion Muszynski
|
cbbaf9c8e0
|
modif left_img.tpl
|
2016-04-18 16:14:19 +02:00 |
|
Marion Muszynski
|
e15f382530
|
Merge branch 'ticket-consumable' into develop
|
2016-04-18 16:03:42 +02:00 |
|
Marion Muszynski
|
1c0d70688c
|
modif categoryimg
|
2016-04-18 16:03:17 +02:00 |
|
Marion Muszynski
|
f288f1ce8d
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-18 15:22:50 +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
|
ef01566b17
|
Merge branch 'ticket-extract' into develop
|
2016-04-15 12:39:14 +02:00 |
|
Marion Muszynski
|
f0e2a7481a
|
fix to order image by position
|
2016-04-15 12:38:31 +02:00 |
|
Marion Muszynski
|
c1e1f78057
|
Merge branch 'ticket-extract' into develop
|
2016-04-15 12:05:53 +02:00 |
|
Marion Muszynski
|
cdd8b21bfe
|
add nc8 id_country into export sales
|
2016-04-15 12:05:25 +02:00 |
|
Marion Muszynski
|
92e77117f8
|
Merge branch 'ticket-consumable' into develop
|
2016-04-15 11:46:36 +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
|
d1ef6a27c2
|
Merge branch 'ticket-consumable' into develop
|
2016-04-15 11:27:16 +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 |
|
Marion Muszynski
|
2795e42b3b
|
Merge branch 'ticket-triSearch' into develop
|
2016-04-14 13:07:52 +02:00 |
|
Marion Muszynski
|
d4722a7e81
|
order in search product
|
2016-04-14 13:06:06 +02:00 |
|
Marion Muszynski
|
89aa68b911
|
Merge branch 'ticket-landingpage' into develop
|
2016-04-13 13:06:52 +02:00 |
|
Marion Muszynski
|
0a0859d9dd
|
add hook for site_mobile
|
2016-04-13 13:06:28 +02:00 |
|
Marion Muszynski
|
7496b8fb5d
|
Merge branch 'ticket-extract' into develop
|
2016-04-13 12:23:22 +02:00 |
|
Marion Muszynski
|
2d1d12c07e
|
update extract
|
2016-04-13 12:22:55 +02:00 |
|
Marion Muszynski
|
6c6b3472e5
|
Merge branch 'ticket-braderie'
|
2016-04-13 10:45:18 +02:00 |
|
Marion Muszynski
|
39451cb3c6
|
fix conflict
|
2016-04-13 10:41:45 +02:00 |
|
Marion Muszynski
|
d326f1bb59
|
update adminProducts order
|
2016-04-13 10:39:29 +02:00 |
|
Marion Muszynski
|
f38db51e45
|
fix conflict
|
2016-04-12 18:07:38 +02:00 |
|
Marion Muszynski
|
616055dce2
|
Merge branch 'ticket-braderie'
|
2016-04-12 17:40:11 +02:00 |
|
Marion Muszynski
|
7a131e2bef
|
correction ordre AdminProduct
|
2016-04-12 17:39:47 +02:00 |
|
Marion Muszynski
|
dd6970444f
|
Merge branch 'ticket-braderie'
|
2016-04-12 16:17:41 +02:00 |
|
Marion Muszynski
|
9a576cd82d
|
fix conflict braderie
|
2016-04-12 16:15:40 +02:00 |
|
Marion Muszynski
|
43a24d1c7a
|
update braderie and rack
|
2016-04-12 16:11:08 +02:00 |
|
Marion Muszynski
|
0b0ebcb26f
|
fix conflict consommables
|
2016-04-12 15:17:45 +02:00 |
|
Marion Muszynski
|
09299f983e
|
add id_sale and id_cat to define for consumable
|
2016-04-12 15:07:24 +02:00 |
|