Marion Muszynski
|
d47310bc0a
|
redirect for es version
|
2016-06-08 16:27:56 +02:00 |
|
Marion Muszynski
|
2b2ae3fa8a
|
modif zoomdiv
|
2016-06-08 14:29:19 +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 |
|
Marion Muszynski
|
7ad38029da
|
adding filter
|
2016-06-06 17:27:09 +02:00 |
|
Marion Muszynski
|
768c3dea8b
|
petit fix
|
2016-06-06 15:56:25 +02:00 |
|
Marion Muszynski
|
cd3761a104
|
modif for site_mobile
|
2016-06-06 15:53:23 +02:00 |
|
Srv Bebeboutik
|
bec4b56f27
|
modif from prod to get real numbers for export
|
2016-06-06 15:32:42 +02:00 |
|
Marion Muszynski
|
c0e5759f2d
|
Merge branch 'ticket-adminProduct'
|
2016-06-06 14:35:48 +02:00 |
|
Marion Muszynski
|
b332800b77
|
new fields in product db
|
2016-06-06 14:35:07 +02:00 |
|
Srv Bebeboutik
|
7085c1b80a
|
update from prod
|
2016-06-06 12:35:00 +02:00 |
|
Srv Bebeboutik
|
aed5599765
|
redelte config
|
2016-06-06 12:03:36 +02:00 |
|
Srv Bebeboutik
|
3ec698aa01
|
Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik
|
2016-06-06 12:03:14 +02:00 |
|
Srv Bebeboutik
|
e671934026
|
fix
|
2016-06-06 12:03:10 +02:00 |
|
Srv Bebeboutik
|
07e93d921d
|
fix
|
2016-06-06 12:03:00 +02:00 |
|
Srv Bebeboutik
|
2860eb56fc
|
delte config
|
2016-06-06 12:02:13 +02:00 |
|
Srv Bebeboutik
|
5b39f81419
|
add config
|
2016-06-06 12:01:39 +02:00 |
|
Thibault UBUNTU
|
5e382e94be
|
fix config
|
2016-06-06 12:00:09 +02:00 |
|
Srv Bebeboutik
|
1fab58c2d6
|
trad fr
|
2016-06-06 11:36:03 +02:00 |
|
Marion Muszynski
|
72545630a3
|
fix conflicts
|
2016-06-06 11:32:25 +02:00 |
|
Srv Bebeboutik
|
a4a5f4850d
|
petite modif from prod
|
2016-06-06 10:24:06 +02:00 |
|
Srv Bebeboutik
|
e26cefa86a
|
modif prod
|
2016-06-06 10:14:02 +02:00 |
|
Srv Bebeboutik
|
368307c6e2
|
modif from prod
|
2016-06-03 17:04:45 +02:00 |
|
Marion Muszynski
|
2dc90dc0c6
|
update to get Cart loyalty credit value without considering discount in total cart
|
2016-06-03 16:34:30 +02:00 |
|
Marion Muszynski
|
a426df2d86
|
Merge branch 'ticket-updateAttributeGroup'
|
2016-06-03 13:06:28 +02:00 |
|