Commit Graph

1156 Commits

Author SHA1 Message Date
Marion Muszynski
64f0796b94 fix location of data in table 2017-07-21 12:47:16 +02:00
Marion Muszynski
0a7cfcfbdf fix round 2017-07-21 12:15:01 +02:00
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
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
3f3b5a0023 modif include to require 2017-07-18 10:38:23 +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
adf8bc8185 add module custom group 2017-07-12 17:14:30 +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
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
55d3cd475f add posibility to change mr address 2017-07-07 12:38:21 +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
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
91536bdb4d Merge branch 'ticket11985-invoiceMR' 2017-07-04 16:23:26 +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
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
cd390c8fb9 add promo banner for ps 2017-06-28 12:18:03 +02:00
Marion Muszynski
b87d25038f addition of module ant_promobanner 2017-06-27 18:22:24 +02:00
Marion Muszynski
407da54291 ready for first tests 2017-06-27 12:10:10 +02:00
Marion Muszynski
db8e0ffcce addition of selection by ean 2017-06-27 10:12:22 +02:00
Marion Muszynski
a2a0385822 upgrading of return process 2017-06-26 11:52:56 +02:00
Marion Muszynski
2a5e3d861b fix label 2017-06-23 12:27:50 +02:00
Marion Muszynski
5f28f49b51 modification reason,instruction and comment 2017-06-23 12:24:55 +02:00
Marion Muszynski
2b858963a3 add comment 2017-06-23 10:11:06 +02:00
Marion Muszynski
4572379dfc fix multi paiement and css 2017-06-22 16:53:29 +02:00
Marion Muszynski
9f25935902 Merge branch 'ticket-13389-3Dsecure' 2017-06-22 15:15:04 +02:00
Marion Muszynski
4eb5fded0b start of moving to HMAC system 2017-06-22 11:38:36 +02:00
Marion Muszynski
d3e5dc18d0 test 2017-06-21 16:47:43 +02:00
Marion Muszynski
a3dc8fa981 add 3Dsecure 2017-06-21 16:37:50 +02:00
Marion Muszynski
03c6b2c8bd modif 2017-06-21 15:54:34 +02:00
Marion Muszynski
805d225840 ergo changement and cleaning cron 2017-06-21 14:44:10 +02:00
Marion Muszynski
12e744b313 Merge branch 'ticket-9103-UrlMetaCategory' 2017-06-20 09:51:32 +02:00
Marion Muszynski
2237a0df03 start of new extract 2017-06-19 17:04:16 +02:00
Marion Muszynski
fec2e5ba19 remove add buttom 2017-06-19 12:18:25 +02:00