Marion Muszynski
|
4bb62e4ee7
|
fix carriers in report query
|
2017-07-21 12:06:48 +02:00 |
|
Marion Muszynski
|
b990aee5f2
|
refont stock log
|
2017-07-21 11:52:28 +02:00 |
|
Marion Muszynski
|
27d0e4666d
|
Merge branch 'fix-mondialRealy'
|
2017-07-20 12:06:09 +02:00 |
|
Marion Muszynski
|
738757a276
|
fix css MR fancy box
|
2017-07-20 12:05:54 +02:00 |
|
root
|
7be76ed1f1
|
trad from prod
|
2017-07-19 15:56:38 +02:00 |
|
root
|
1a975aea61
|
fix MR from prod
|
2017-07-19 14:34:05 +02:00 |
|
Marion Muszynski
|
246121bc14
|
Merge branch 'ticket-13351-EdTag'
|
2017-07-18 10:38:35 +02:00 |
|
Marion Muszynski
|
3f3b5a0023
|
modif include to require
|
2017-07-18 10:38:23 +02:00 |
|
Marion Muszynski
|
bcbab8adbb
|
Merge branch 'ticket-13351-EdTag'
|
2017-07-18 10:36:19 +02:00 |
|
Marion Muszynski
|
0bd93ed4b2
|
add module tracking tag
|
2017-07-18 10:28:05 +02:00 |
|
Marion Muszynski
|
d868d563f5
|
start of tracking tag
|
2017-07-18 09:56:24 +02:00 |
|
Marion Muszynski
|
ab2858cb9a
|
Merge branch 'ticket-13679-AntCustomGroup'
|
2017-07-17 11:01:15 +02:00 |
|
Marion Muszynski
|
adf8bc8185
|
add module custom group
|
2017-07-12 17:14:30 +02:00 |
|
Marion Muszynski
|
655b0e4236
|
Merge branch 'ticket-10648-fileUploadOnMobile'
|
2017-07-11 16:31:11 +02:00 |
|
Marion Muszynski
|
e2533c3033
|
add file upload on mobile contact form
|
2017-07-11 16:19:20 +02:00 |
|
Marion Muszynski
|
c94d2c4431
|
fix conflicts
|
2017-07-11 10:04:00 +02:00 |
|
Marion Muszynski
|
3a2438d01d
|
Merge branch 'ticket-trustedBadge'
|
2017-07-10 15:55:40 +02:00 |
|
Marion Muszynski
|
ac862f6d92
|
fix trusted badge
|
2017-07-10 15:54:46 +02:00 |
|
Marion Muszynski
|
0ac95d23a5
|
Merge branch 'ticket-13695-BugBraderie'
|
2017-07-10 15:29:57 +02:00 |
|
Marion Muszynski
|
ea25a41e2e
|
Merge branch 'ticket-trustedBadge'
|
2017-07-10 15:04:05 +02:00 |
|
Marion Muszynski
|
3869781a1f
|
remove trusted badge on mobile
|
2017-07-10 15:03:49 +02:00 |
|
Marion Muszynski
|
deef10a0b2
|
update and fix braderie
|
2017-07-10 14:11:35 +02:00 |
|
Marion Muszynski
|
ee1f66436c
|
Merge branch 'ticket-11985-MRDeliveryAddress'
|
2017-07-07 12:39:00 +02:00 |
|
Marion Muszynski
|
55d3cd475f
|
add posibility to change mr address
|
2017-07-07 12:38:21 +02:00 |
|
Marion Muszynski
|
84d7e1f715
|
Merge branch 'ticket-11985-MRDeliveryAddress'
|
2017-07-07 12:15:35 +02:00 |
|
Marion Muszynski
|
dfe25a8005
|
show mr delivery address on invoice pdf
|
2017-07-07 12:15:20 +02:00 |
|
Marion Muszynski
|
71936e370d
|
Merge branch 'ticket-13661-mobileReturn'
|
2017-07-07 11:05:33 +02:00 |
|
Marion Muszynski
|
d775d69d33
|
fix mobile back from product
|
2017-07-07 11:03:51 +02:00 |
|
Marion Muszynski
|
04ceecce9f
|
Merge branch 'ticket-13521-ExtractProducts'
|
2017-07-06 16:42:54 +02:00 |
|
Marion Muszynski
|
471b9a77e7
|
add link to download product base
|
2017-07-06 16:42:39 +02:00 |
|
Marion Muszynski
|
fd18fd3421
|
Merge branch 'ticket11985-invoiceMR'
|
2017-07-05 12:19:31 +02:00 |
|
Marion Muszynski
|
c4193b7119
|
hide error message after 4s
|
2017-07-05 12:19:14 +02:00 |
|
Marion Muszynski
|
4df600b0cc
|
add error message
|
2017-07-05 12:13:40 +02:00 |
|
Marion Muszynski
|
2b6528ad72
|
fix module id and name
|
2017-07-05 11:24:53 +02:00 |
|
Marion Muszynski
|
900848524b
|
add hash and time to paybox call
|
2017-07-05 11:18:09 +02:00 |
|
Marion Muszynski
|
e3b75ce760
|
fix pbx langue
|
2017-07-05 11:00:45 +02:00 |
|
Marion Muszynski
|
ec2f428160
|
Merge branch 'ticket11985-invoiceMR'
|
2017-07-04 17:51:54 +02:00 |
|
Marion Muszynski
|
a0e0aa7d71
|
change redirect
|
2017-07-04 17:51:34 +02:00 |
|
Marion Muszynski
|
91536bdb4d
|
Merge branch 'ticket11985-invoiceMR'
|
2017-07-04 16:23:26 +02:00 |
|
Marion Muszynski
|
a38cc1a255
|
remove var dump
|
2017-07-04 15:54:02 +02:00 |
|
root
|
c0c836cfe1
|
fix mr fron prod
|
2017-07-04 15:46:45 +02:00 |
|
root
|
c23288a05b
|
push from prod for trad
|
2017-07-04 15:43:19 +02:00 |
|
root
|
383d48726c
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik
|
2017-07-04 15:32:36 +02:00 |
|
root
|
dd218bb37a
|
push from prod
|
2017-07-04 15:32:17 +02:00 |
|
Marion Muszynski
|
0e9d19a20f
|
Merge branch 'ticket-11985-CarrierSelection'
|
2017-07-04 15:29:42 +02:00 |
|
Marion Muszynski
|
72965b110b
|
add auto carrier selection
|
2017-07-04 15:29:26 +02:00 |
|
Marion Muszynski
|
84e306d811
|
Merge branch 'ticket-12803-ModifSimilarProduct'
|
2017-07-04 15:02:39 +02:00 |
|
Marion Muszynski
|
18da9c8c75
|
change image size
|
2017-07-04 10:57:31 +02:00 |
|
Marion Muszynski
|
d726131b76
|
css modification of similar product
|
2017-07-04 10:46:06 +02:00 |
|
Marion Muszynski
|
967eac2c06
|
Merge branch 'ticket-13505-retourMobile'
|
2017-06-29 14:24:30 +02:00 |
|