Michael RICOIS
|
90a09e1ce7
|
Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping'
|
2018-01-15 16:27:20 +01:00 |
|
Michael RICOIS
|
741b69f733
|
Bad SQL
|
2018-01-15 16:27:03 +01:00 |
|
Michael RICOIS
|
35e9afa6d9
|
Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping'
|
2018-01-15 16:04:15 +01:00 |
|
Michael RICOIS
|
65cec1825d
|
Set philea as first
|
2018-01-15 16:03:18 +01:00 |
|
Michael RICOIS
|
6cdeaba17f
|
CS
|
2018-01-15 15:45:33 +01:00 |
|
Michael RICOIS
|
e459ed17c3
|
CS
|
2018-01-15 15:38:14 +01:00 |
|
Michael RICOIS
|
d063c3ef40
|
Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping'
|
2018-01-15 14:26:15 +01:00 |
|
Michael RICOIS
|
82476d2afa
|
Remove debug
|
2018-01-15 12:52:52 +01:00 |
|
Michael RICOIS
|
cd7483274d
|
Facebook currency
|
2018-01-15 12:52:00 +01:00 |
|
Michael RICOIS
|
233faf8026
|
CS
|
2018-01-15 11:46:05 +01:00 |
|
Michael RICOIS
|
9afceeca10
|
Merge branch 'ticket/r15319-multi-voucher'
|
2018-01-15 10:18:00 +01:00 |
|
Michael RICOIS
|
fd6b00ed78
|
Merge branch 'ticket/r15296-import'
|
2018-01-15 10:17:27 +01:00 |
|
Michael RICOIS
|
a018ea7833
|
Merge remote-tracking branch 'origin/ticket/r15224-balises'
|
2018-01-15 09:24:39 +01:00 |
|
Michael RICOIS
|
7dc9c51ab4
|
Merge branch 'ticket/r15296-import' into develop
|
2018-01-12 16:03:38 +01:00 |
|
Michael RICOIS
|
bd363dbd21
|
Check if id_category_default is set, on all lines
|
2018-01-12 16:02:19 +01:00 |
|
Michael RICOIS
|
5fc550ae7a
|
Merge branch 'ticket/r15224-balises' into develop
|
2018-01-12 15:27:15 +01:00 |
|
Michael RICOIS
|
18f7642e3d
|
remove debug
|
2018-01-12 15:22:13 +01:00 |
|
Michael RICOIS
|
9f241711a3
|
Merge branch 'ticket/r15365-logistic-reshipping' into develop
|
2018-01-12 14:58:34 +01:00 |
|
Michael RICOIS
|
637fea818f
|
Set philea when delete
|
2018-01-12 14:58:02 +01:00 |
|
Michael RICOIS
|
a7ae9914c7
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2018-01-12 14:34:37 +01:00 |
|
Michael RICOIS
|
d59821639b
|
Merge branch 'ticket/r15365-logistic-reshipping' into develop
|
2018-01-12 14:33:57 +01:00 |
|
Michael RICOIS
|
bede86e06b
|
Add possibilty to re-send order when first is by philea
|
2018-01-12 12:32:59 +01:00 |
|
Michael RICOIS
|
f32ca94f43
|
CS
|
2018-01-12 12:19:23 +01:00 |
|
David
|
7da68f2768
|
Merge branch 'hotfix-cart-packs'
|
2018-01-12 11:36:16 +01:00 |
|
David
|
ab8da26f51
|
Merge branch 'hotfix-cart-packs' into develop
|
2018-01-12 11:35:33 +01:00 |
|
David
|
8dfb53c792
|
Set index on $cart_add_qties
|
2018-01-12 11:32:53 +01:00 |
|
Michael RICOIS
|
ee7ec89a87
|
Add mark philea
|
2018-01-11 16:22:25 +01:00 |
|
Michael RICOIS
|
a66a711598
|
CS
|
2018-01-11 14:55:22 +01:00 |
|
Michael RICOIS
|
dbc9d4b8e3
|
CS
|
2018-01-11 13:19:25 +01:00 |
|
Michael RICOIS
|
9228227d89
|
CS
|
2018-01-11 13:03:54 +01:00 |
|
Michael RICOIS
|
9012485ba3
|
Merge branch 'ticket-14904-achatexpressmobile' into develop
Conflicts:
themes/site_mobile/css/style.css
|
2018-01-11 11:33:04 +01:00 |
|
Michael RICOIS
|
00657ccd4e
|
z-index on expresscart
|
2018-01-11 11:10:02 +01:00 |
|
Michael RICOIS
|
2b897d2010
|
Merge remote-tracking branch 'origin/ticket-14904-achatexpressmobile' into develop
|
2018-01-10 17:56:20 +01:00 |
|
Michael RICOIS
|
8b2476e6a7
|
Add a select for mobile
|
2018-01-10 17:55:44 +01:00 |
|
Michael RICOIS
|
391d526942
|
Merge remote-tracking branch 'origin/ticket/r15314-generate-label'
|
2018-01-10 15:04:36 +01:00 |
|
Michael RICOIS
|
99048f9fef
|
Merge remote-tracking branch 'origin/ticket/r15314-generate-label' into develop
|
2018-01-10 15:02:31 +01:00 |
|
Michael RICOIS
|
6dcf2c757e
|
Add a timestamp to bypass cache
|
2018-01-10 12:49:28 +01:00 |
|
David
|
86838491d1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-09 19:02:49 +01:00 |
|
David
|
0c44a48f99
|
Merge branch 'fix/domain-issue-ajax-express-cart' into develop
|
2018-01-09 19:01:58 +01:00 |
|
David
|
b2130305b2
|
js files need to be downloaded from the same domain.
|
2018-01-09 18:53:38 +01:00 |
|
David
|
b3fec0e045
|
Merge remote-tracking branch 'origin/master'
|
2018-01-09 16:53:23 +01:00 |
|
David
|
3db4b0a411
|
post merge fix
|
2018-01-09 16:51:48 +01:00 |
|
David
|
371ad472aa
|
Merge branch 'ticket-14904-achatexpressmobile'
# Conflicts:
# themes/site_mobile/css/style.css
# themes/site_mobile/product-list.tpl
|
2018-01-09 16:21:17 +01:00 |
|
David
|
225f857725
|
Merge branch 'ticket-14826-fix-product-title'
|
2018-01-09 12:26:12 +01:00 |
|
Michael RICOIS
|
130a2e27b3
|
Merge branch 'ticket/r14716-order-detail-device' into develop
|
2018-01-09 11:55:38 +01:00 |
|
Michael RICOIS
|
191f9a3312
|
Icon for device in order details
|
2018-01-09 11:51:26 +01:00 |
|
Michael RICOIS
|
428dd65c8e
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2018-01-09 10:08:57 +01:00 |
|
Michael RICOIS
|
7dfc4db294
|
Merge remote-tracking branch 'origin/ticket/r15364-fix-shipping-cost' into develop
|
2018-01-09 10:08:39 +01:00 |
|
Michael RICOIS
|
04254c0d83
|
Fix shipping cost for category 8744158
|
2018-01-09 10:05:53 +01:00 |
|
David
|
428fd82c38
|
Merge branch 'ticket-14904-achatexpressmobile' into develop
|
2018-01-08 17:27:00 +01:00 |
|