Michael RICOIS
|
10ce2852e6
|
Merge remote-tracking branch 'origin/ticket/r15334-return-article-form'
|
2018-01-22 09:32:50 +01:00 |
|
Michael RICOIS
|
fd00430307
|
Reduce z-index
|
2018-01-19 15:34:53 +01:00 |
|
Michael RICOIS
|
8e2a1ba4a3
|
Fix conflict
|
2018-01-19 11:23:42 +01:00 |
|
Michael RICOIS
|
f010de6d2d
|
Merge branch 'ticket-14904-achatexpressmobile' of
git@gitlab.antadis.net:dev-antadis/bebeboutik.git into
ticket-14904-achatexpressmobile
Conflicts:
themes/site_mobile/css/style.css
|
2018-01-19 11:23:26 +01:00 |
|
Michael RICOIS
|
3f98533689
|
Rebase and fix
|
2018-01-19 11:22:07 +01:00 |
|
Michael RICOIS
|
a367324847
|
Change image - better quality
|
2018-01-19 11:13:31 +01:00 |
|
Michael RICOIS
|
dfbb1407eb
|
z-index on expresscart
|
2018-01-19 11:12:55 +01:00 |
|
Michael RICOIS
|
1f24d1b88b
|
Add a select for mobile
|
2018-01-19 11:08:12 +01:00 |
|
David
|
17cb1fdc7c
|
Added conditionnal formatting
|
2018-01-18 18:29:59 +01:00 |
|
David
|
f52f89ad64
|
Code cleanup
Background format
Bold format
Conditionnal in comments
|
2018-01-18 17:49:10 +01:00 |
|
Michael RICOIS
|
ab90b9214c
|
Change image - better quality
|
2018-01-18 14:34:22 +01:00 |
|
Michael RICOIS
|
6f7c18458d
|
Fix Call to undefined function imageResize()
|
2018-01-18 12:13:21 +01:00 |
|
Michael RICOIS
|
3a5aed3c7f
|
Merge remote-tracking branch 'origin/ticket/r15224-balises'
|
2018-01-17 17:49:30 +01:00 |
|
Michael RICOIS
|
e9b0ef0dae
|
Fix
|
2018-01-17 17:48:37 +01:00 |
|
Michael RICOIS
|
cdb8b397c2
|
Merge remote-tracking branch 'origin/ticket/r15463-discount-remove-display'
|
2018-01-17 15:10:23 +01:00 |
|
Michael RICOIS
|
1481338cac
|
Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping'
|
2018-01-17 14:57:47 +01:00 |
|
Michael RICOIS
|
9670db71e9
|
Fix carrier name for delete action
|
2018-01-17 14:55:15 +01:00 |
|
Michael RICOIS
|
b3adf075e5
|
Quantity for return form
|
2018-01-17 11:56:50 +01:00 |
|
David
|
010ec70298
|
Merge branch 'ticket-15155-paypal-order-display'
|
2018-01-16 18:22:07 +01:00 |
|
David
|
5392ff667a
|
typo
|
2018-01-16 18:21:23 +01:00 |
|
David
|
bcd555d6ef
|
Merge branch 'ticket-15155-paypal-order-display'
|
2018-01-16 18:18:48 +01:00 |
|
David
|
8194a1f247
|
Added transaction information on paypal/paybox orders
|
2018-01-16 18:07:49 +01:00 |
|
Michael RICOIS
|
96f4237fc7
|
Override method getCustomerDiscountsto to not display discount with
quantities = 0
|
2018-01-16 15:26:19 +01:00 |
|
Michael RICOIS
|
a762200fc2
|
Typo
|
2018-01-16 14:38:21 +01:00 |
|
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
|
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
|
bd363dbd21
|
Check if id_category_default is set, on all lines
|
2018-01-12 16:02:19 +01:00 |
|
Michael RICOIS
|
18f7642e3d
|
remove debug
|
2018-01-12 15:22:13 +01:00 |
|
Michael RICOIS
|
637fea818f
|
Set philea when delete
|
2018-01-12 14:58:02 +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
|
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
|
00657ccd4e
|
z-index on expresscart
|
2018-01-11 11:10:02 +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
|
6dcf2c757e
|
Add a timestamp to bypass cache
|
2018-01-10 12:49:28 +01:00 |
|
David
|
b2130305b2
|
js files need to be downloaded from the same domain.
|
2018-01-09 18:53:38 +01:00 |
|