Commit Graph

Select branches

Hide Pull Requests

alexandre-braderie

develop

evo-10581

evo-9386

evo-removeThumbVP

evo-savePaypal

feature/api_bbb

feature/api_branch

feature/api_return_url_paypal

feature/appmobile

feature/canonical

feature/override_object_model

feature/unique_cart_web_and_app

fix-10571

fix-10796

fix/500-module-invite

fix/500-order-getIfSended

fix/500-validate-order

fix/PDF_send_mail_after_order

fix/captcha

fix/cookie-dev

fix/discount_search

fix/imageResize

fix/mktime

fix/mobile_detect

fix/order_mobile

fix/paybox-save-card

fix/payement-id_state

fix/paymentModule

fix/secure_key

fix/sensefuel-description

fix/sensefuel_https

fix/sitemap

fix/soapclient-500

fluxcatalogue

local_christophe

marion

master

mobile

module-ant_support_form

module-labelgenerate

paypal_billing

tibo

ticket-10169

ticket-10296

ticket-10393

ticket-10393-guide-achat

ticket-13149

ticket-13156-FilterVP

ticket-14139-delivery-poste

ticket-14162-returnwithqty

ticket-14273-voucher

ticket-14436-excel-format

ticket-14525-parrain

ticket-14666-appli-discount

ticket-14698-sensefuel

ticket-14739-PackLogistic

ticket-14805-creditexpiration

ticket-14811-title-not-clickable

ticket-14826-fix-product-title

ticket-14904-achatexpressmobile

ticket-14959-fraud

ticket-14974-refundvoucher

ticket-15155-paypal-order-display

ticket-15629-new-landing

ticket-8048

ticket-9260

ticket-9599

ticket-9728

ticket-9895

ticket-blockOrderSummary

ticket-criteo

ticket-deliveryDelay_cart

ticket-deliveryDelay_product

ticket-payboxAgreement

ticket-philea

ticket/14716-order-mobile

ticket/15014-invite_credits

ticket/15057-lang2

ticket/15099-facebookpixel

ticket/15116-nous-contacter-display

ticket/r11982-ganalytics

ticket/r14647-welcome-mail

ticket/r14716-order-detail-device

ticket/r14810-dropshipping-tracking

ticket/r14830-bandeaux

ticket/r15109-math-captcha

ticket/r15128-sponsor

ticket/r15172-change-adress-socol

ticket/r15224-balises

ticket/r15225-redirect-mobile

ticket/r15251-limit_etagere

ticket/r15296-import

ticket/r15314-generate-label

ticket/r15319-multi-voucher

ticket/r15334-return-article-form

ticket/r15351-permissions-managers

ticket/r15364-fix-shipping-cost

ticket/r15365-logistic-reshipping

ticket/r15463-discount-remove-display

ticket/r15587-refund-paypal

ticket/r15656-braderie

ticket/r15670-email

ticket/r15782-stats

ticket/r15788-discount-use

ticket/r15862-label_refbbb

ticket/r15925-check-adress

ticket/r15931-contacts

ticket/r15975-contact-spam

ticket/r16108-test-sponsor

ticket/r16112-display-credit

ticket/r16159-customer-message

ticket/r16345-lang

ticket/r16347-mail-lang

ticket/r16450-mr_country

ticket/r16455-exclude_bot

ticket/r16490-email_error

ticket/r16492-bulkupdate

ticket/r16627-mail_return_link

ticket/r16684-famille

ticket/r16686-filter_back

ticket/r16761-queue_name

ticket_9890

tickets/customer_date_upd

Mono Color

• 807fc023f3 Test Michael RICOIS 2018-01-29 14:34:59 +0100
• 02def68974 Rewrite Michael RICOIS 2018-01-26 16:24:00 +0100
• 6b8472979c Merge branch 'ticket-14739-PackLogistic' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into ticket-14739-PackLogistic Michael RICOIS 2018-01-26 15:25:49 +0100
• a24ebc48d9 deleting useless files Marion Muszynski 2017-11-29 14:48:16 +0100
• c978c25373 add module ant logistic for test Marion Muszynski 2017-11-29 14:46:02 +0100
• e2ff256675 Comment ticket/r15656-braderie Michael RICOIS 2018-01-26 15:15:11 +0100
• b907ac0e66 CS Michael RICOIS 2018-01-26 11:56:03 +0100
• 67b9dd85be CS Michael RICOIS 2018-01-26 10:50:02 +0100
• 063ce25d01 CS and comment Michael RICOIS 2018-01-26 10:06:48 +0100
• 0b787dd69b Comment Michael RICOIS 2018-01-25 17:21:15 +0100
• 411c795497 Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop Michael RICOIS 2018-01-25 10:23:11 +0100
• 53eb8c1006 Merge branch 'ticket/r11982-ganalytics' into develop Michael RICOIS 2018-01-25 10:22:02 +0100
• c13496d8e1 Merge branch 'ticket-14436-excel-format' David 2018-01-24 17:25:00 +0100
• bbe237f64e Merge branch 'ticket-14436-excel-format' into develop David 2018-01-24 16:52:07 +0100
• daa9f31bc0 Major rework David 2018-01-24 16:50:32 +0100
• 9723cc3e20 Add align=left Michael RICOIS 2018-01-24 11:09:32 +0100
• f1006491e7 CS ticket/r11982-ganalytics Michael RICOIS 2018-01-23 17:38:42 +0100
• cb32e313c0 CS Michael RICOIS 2018-01-23 17:36:59 +0100
• 588898123a Add cookie reset if id_transaction is different Michael RICOIS 2018-01-23 17:36:17 +0100
• 85f4874ac8 Validation Michael RICOIS 2018-01-23 17:10:17 +0100
• 361b1bfa5b Merge branch 'ticket/r14647-welcome-mail' into develop Michael RICOIS 2018-01-23 16:42:22 +0100
• 9b3f4d087b Add counter for purchase transaction Michael RICOIS 2018-01-23 16:38:06 +0100
• c4a59c0dcd Merge remote-tracking branch 'origin/ticket/r14647-welcome-mail' into develop Michael RICOIS 2018-01-23 15:57:34 +0100
• d0c9e8f59b Timestamp set at 10 minutes Michael RICOIS 2018-01-23 15:56:33 +0100
• 8424843068 Remove password Michael RICOIS 2018-01-23 15:05:56 +0100
• 853c9dc5ea Update Michael RICOIS 2018-01-23 15:05:03 +0100
• 5c22897bf0 Update Michael RICOIS 2018-01-23 14:49:31 +0100
• b32329e321 Merge branch 'ticket/r14647-welcome-mail' into develop Michael RICOIS 2018-01-23 11:36:53 +0100
• 42a0fdfda5 Update account.html Michael RICOIS 2018-01-23 11:35:54 +0100
• 3897a4304d Get back original mail template Michael RICOIS 2018-01-23 10:55:50 +0100
• 71c6adc38a Update ES account.html Michael RICOIS 2018-01-23 10:08:31 +0100
• c1662e0472 Merge branch 'fix/payement-id_state' into develop Michael RICOIS 2018-01-22 12:02:18 +0100
• bac9e3a694 Fix id_state undefined fix/payement-id_state Michael RICOIS 2018-01-22 11:59:57 +0100
• 9dddba314a Update mails template Michael RICOIS 2018-01-22 11:53:24 +0100
• 645d3bd0a1 Check time Michael RICOIS 2018-01-19 17:11:20 +0100
• 6915872212 CS Michael RICOIS 2018-01-15 11:46:05 +0100
• a7f38bf474 Merge branch 'ticket/15099-facebookpixel' Michael RICOIS 2018-01-22 10:28:29 +0100
• 64d33eafb7 Fix currency with facebook pixel ticket/15099-facebookpixel Michael RICOIS 2018-01-22 10:24:57 +0100
• 10ce2852e6 Merge remote-tracking branch 'origin/ticket/r15334-return-article-form' Michael RICOIS 2018-01-22 09:32:50 +0100
• 0e1461391a Merge branch 'ticket-14904-achatexpressmobile' into develop Michael RICOIS 2018-01-19 15:35:22 +0100
• fd00430307 Reduce z-index ticket-14904-achatexpressmobile Michael RICOIS 2018-01-19 15:34:53 +0100
• f9ad9f344d Merge branch 'ticket/r15334-return-article-form' into develop Michael RICOIS 2018-01-19 12:02:43 +0100
• f3594c4300 Fix achatexpress style Michael RICOIS 2018-01-19 11:41:14 +0100
• 25a4512f0f Merge remote-tracking branch 'origin/ticket-14904-achatexpressmobile' into develop Michael RICOIS 2018-01-19 11:30:33 +0100
• 8e2a1ba4a3 Fix conflict Michael RICOIS 2018-01-19 11:23:42 +0100
• f010de6d2d Merge branch 'ticket-14904-achatexpressmobile' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into ticket-14904-achatexpressmobile Michael RICOIS 2018-01-19 11:23:26 +0100
• 3f98533689 Rebase and fix Michael RICOIS 2018-01-19 11:22:07 +0100
• a367324847 Change image - better quality Michael RICOIS 2018-01-18 14:34:22 +0100
• dfbb1407eb z-index on expresscart Michael RICOIS 2018-01-11 11:10:02 +0100
• 1f24d1b88b Add a select for mobile Michael RICOIS 2018-01-10 17:55:44 +0100
• 3808f28f53 Merge branch 'ticket-14436-excel-format' into develop David 2018-01-18 18:30:18 +0100
• 17cb1fdc7c Added conditionnal formatting David 2018-01-18 18:29:59 +0100
• 7b9043b4c2 Merge branch 'ticket-14436-excel-format' into develop David 2018-01-18 17:51:43 +0100
• f52f89ad64 Code cleanup Background format Bold format Conditionnal in comments David 2018-01-18 17:49:10 +0100
• ab90b9214c Change image - better quality Michael RICOIS 2018-01-18 14:34:22 +0100
• 6f7c18458d Fix Call to undefined function imageResize() fix/imageResize Michael RICOIS 2018-01-18 12:13:21 +0100
• 3a5aed3c7f Merge remote-tracking branch 'origin/ticket/r15224-balises' Michael RICOIS 2018-01-17 17:49:30 +0100
• 18258a9db5 Merge remote-tracking branch 'origin/ticket/r15224-balises' into develop Michael RICOIS 2018-01-17 17:49:03 +0100
• e9b0ef0dae Fix ticket/r15224-balises Michael RICOIS 2018-01-17 17:48:37 +0100
• cdb8b397c2 Merge remote-tracking branch 'origin/ticket/r15463-discount-remove-display' Michael RICOIS 2018-01-17 15:10:23 +0100
• 1481338cac Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping' Michael RICOIS 2018-01-17 14:57:47 +0100
• 20ab8c5b14 Merge branch 'ticket/r15365-logistic-reshipping' into develop Michael RICOIS 2018-01-17 14:55:59 +0100
• 9670db71e9 Fix carrier name for delete action ticket/r15365-logistic-reshipping Michael RICOIS 2018-01-17 14:55:15 +0100
• b3adf075e5 Quantity for return form ticket/r15334-return-article-form Michael RICOIS 2018-01-17 11:56:50 +0100
• 69d2c02608 Merge branch 'ticket/r11982-ganalytics' into develop Michael RICOIS 2018-01-17 10:23:43 +0100
• 010ec70298 Merge branch 'ticket-15155-paypal-order-display' David 2018-01-16 18:22:07 +0100
• 4c25a0de1e Merge branch 'ticket-15155-paypal-order-display' into develop David 2018-01-16 18:21:41 +0100
• 5392ff667a typo ticket-15155-paypal-order-display David 2018-01-16 18:21:23 +0100
• bcd555d6ef Merge branch 'ticket-15155-paypal-order-display' David 2018-01-16 18:18:48 +0100
• 69500d338e Merge branch 'ticket-15155-paypal-order-display' into develop David 2018-01-16 18:17:22 +0100
• 8194a1f247 Added transaction information on paypal/paybox orders David 2018-01-16 18:07:49 +0100
• 21ac110911 Merge remote-tracking branch 'origin/ticket/r15463-discount-remove-display' into develop Michael RICOIS 2018-01-16 15:26:58 +0100
• 96f4237fc7 Override method getCustomerDiscountsto to not display discount with quantities = 0 ticket/r15463-discount-remove-display Michael RICOIS 2018-01-16 15:26:19 +0100
• a762200fc2 Typo Michael RICOIS 2018-01-16 14:38:21 +0100
• 43ec8c121b Merge branch 'ticket/r15365-logistic-reshipping' into develop Michael RICOIS 2018-01-16 09:27:46 +0100
• 90a09e1ce7 Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping' Michael RICOIS 2018-01-15 16:27:20 +0100
• 741b69f733 Bad SQL Michael RICOIS 2018-01-15 16:27:03 +0100
• 35e9afa6d9 Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping' Michael RICOIS 2018-01-15 16:04:15 +0100
• 65cec1825d Set philea as first Michael RICOIS 2018-01-15 16:03:18 +0100
• 6cdeaba17f CS Michael RICOIS 2018-01-15 15:45:33 +0100
• e459ed17c3 CS Michael RICOIS 2018-01-15 15:38:14 +0100
• d063c3ef40 Merge remote-tracking branch 'origin/ticket/r15365-logistic-reshipping' Michael RICOIS 2018-01-15 14:26:15 +0100
• 82476d2afa Remove debug Michael RICOIS 2018-01-15 12:52:52 +0100
• cd7483274d Facebook currency Michael RICOIS 2018-01-15 12:52:00 +0100
• 233faf8026 CS Michael RICOIS 2018-01-15 11:46:05 +0100
• 9afceeca10 Merge branch 'ticket/r15319-multi-voucher' Michael RICOIS 2018-01-15 10:18:00 +0100
• fd6b00ed78 Merge branch 'ticket/r15296-import' Michael RICOIS 2018-01-15 10:17:27 +0100
• a018ea7833 Merge remote-tracking branch 'origin/ticket/r15224-balises' Michael RICOIS 2018-01-15 09:24:39 +0100
• 7dc9c51ab4 Merge branch 'ticket/r15296-import' into develop Michael RICOIS 2018-01-12 16:03:38 +0100
• bd363dbd21 Check if id_category_default is set, on all lines ticket/r15296-import Michael RICOIS 2018-01-12 16:02:19 +0100
• 5fc550ae7a Merge branch 'ticket/r15224-balises' into develop Michael RICOIS 2018-01-12 15:27:15 +0100
• 18f7642e3d remove debug Michael RICOIS 2018-01-12 15:22:13 +0100
• 9f241711a3 Merge branch 'ticket/r15365-logistic-reshipping' into develop Michael RICOIS 2018-01-12 14:58:34 +0100
• 637fea818f Set philea when delete Michael RICOIS 2018-01-12 14:58:02 +0100
• a7ae9914c7 Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop Michael RICOIS 2018-01-12 14:34:37 +0100
• d59821639b Merge branch 'ticket/r15365-logistic-reshipping' into develop Michael RICOIS 2018-01-12 14:33:57 +0100
• bede86e06b Add possibilty to re-send order when first is by philea Michael RICOIS 2018-01-12 12:32:59 +0100
• f32ca94f43 CS Michael RICOIS 2018-01-12 12:19:23 +0100
• 7da68f2768 Merge branch 'hotfix-cart-packs' David 2018-01-12 11:36:16 +0100
• ab8da26f51 Merge branch 'hotfix-cart-packs' into develop David 2018-01-12 11:35:33 +0100