Marion Muszynski
|
8ebad0868b
|
Merge branch 'ticket-13754-fixSalePosition' into develop
|
2017-07-21 11:17:21 +02:00 |
|
Marion Muszynski
|
8a1b3793da
|
resort sales after addition of new one
|
2017-07-21 11:17:05 +02:00 |
|
Marion Muszynski
|
3042613293
|
Merge branch 'fix-mondialRealy' into develop
|
2017-07-20 16:53:01 +02:00 |
|
Marion Muszynski
|
6a88e687c0
|
Merge branch 'ticket-13754-fixSalePosition' into develop
|
2017-07-20 16:51:38 +02:00 |
|
Marion Muszynski
|
e1663b365b
|
fixation of sale position
|
2017-07-20 16:51:19 +02:00 |
|
Marion Muszynski
|
738757a276
|
fix css MR fancy box
|
2017-07-20 12:05:54 +02:00 |
|
Marion Muszynski
|
4e0938b32e
|
fix sale position
|
2017-07-20 11:37:45 +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
|
ed01b1e22a
|
Merge branch 'ticket-12743-SavSupplier' into develop
|
2017-07-18 12:12:40 +02:00 |
|
Marion Muszynski
|
05062d558b
|
fix wordwrap
|
2017-07-18 12:12:25 +02:00 |
|
Marion Muszynski
|
bd8088a915
|
Merge branch 'ticket-12743-SavSupplier' into develop
|
2017-07-18 12:07:06 +02:00 |
|
Marion Muszynski
|
372fb0b51c
|
add some info
|
2017-07-18 12:06:50 +02:00 |
|
Marion Muszynski
|
3f3b5a0023
|
modif include to require
|
2017-07-18 10:38:23 +02:00 |
|
Marion Muszynski
|
66d37d34c6
|
Merge branch 'ticket-13351-EdTag' into develop
|
2017-07-18 10:28:27 +02:00 |
|
Marion Muszynski
|
0bd93ed4b2
|
add module tracking tag
|
2017-07-18 10:28:05 +02:00 |
|
Marion Muszynski
|
ffd3b8adc4
|
Merge branch 'ticket-13351-EdTag' into develop
|
2017-07-18 10:27:34 +02:00 |
|
Marion Muszynski
|
d868d563f5
|
start of tracking tag
|
2017-07-18 09:56:24 +02:00 |
|
Marion Muszynski
|
3e8e564e4e
|
Merge branch 'ticket-12743-SavSupplier' into develop
|
2017-07-13 17:00:18 +02:00 |
|
Marion Muszynski
|
0479310097
|
add quantity info
|
2017-07-13 17:00:02 +02:00 |
|
Marion Muszynski
|
d7552c5d21
|
Merge branch 'ticket-12743-SavSupplier' into develop
|
2017-07-13 16:46:26 +02:00 |
|
Marion Muszynski
|
4589c86bb5
|
add module ant supplier demand
|
2017-07-13 16:46:11 +02:00 |
|
Marion Muszynski
|
1ce931d256
|
Merge branch 'ticket-13679-AntCustomGroup' into develop
|
2017-07-12 17:14:49 +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
|
86eafbb1f8
|
Merge branch 'ticket-trustedBadge' into develop
|
2017-07-10 15:55:01 +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
|
68d240d7ae
|
Merge branch 'ticket-trustedBadge' into develop
|
2017-07-10 15:04:58 +02:00 |
|
Marion Muszynski
|
3869781a1f
|
remove trusted badge on mobile
|
2017-07-10 15:03:49 +02:00 |
|
Marion Muszynski
|
362031dc35
|
Merge branch 'ticket-13695-BugBraderie' into develop
|
2017-07-10 14:11:50 +02:00 |
|
Marion Muszynski
|
deef10a0b2
|
update and fix braderie
|
2017-07-10 14:11:35 +02:00 |
|
Marion Muszynski
|
827aac76dc
|
Merge branch 'ticket-11985-MRDeliveryAddress' into develop
|
2017-07-07 12:38:40 +02:00 |
|
Marion Muszynski
|
55d3cd475f
|
add posibility to change mr address
|
2017-07-07 12:38:21 +02:00 |
|
Marion Muszynski
|
05c988412b
|
Merge branch 'ticket-13661-mobileReturn' into develop
|
2017-07-07 11:04:07 +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
|
e01ae068ca
|
Merge branch 'ticket-13508-HMAC' into develop
|
2017-07-05 11:25:04 +02:00 |
|
Marion Muszynski
|
2b6528ad72
|
fix module id and name
|
2017-07-05 11:24:53 +02:00 |
|
Marion Muszynski
|
73dbe5691f
|
Merge branch 'ticket-13508-HMAC' into develop
|
2017-07-05 11:18:22 +02:00 |
|
Marion Muszynski
|
900848524b
|
add hash and time to paybox call
|
2017-07-05 11:18:09 +02:00 |
|
Marion Muszynski
|
eb39bdc47b
|
fix conflict
|
2017-07-05 11:07:43 +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 |
|
Marion Muszynski
|
7999a3d8f3
|
fix conflict
|
2017-07-04 16:06:55 +02:00 |
|
Marion Muszynski
|
4435110d9d
|
little fix
|
2017-07-04 16:04:00 +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 |
|