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

• ee3d947936 Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop Michael RICOIS 2018-02-15 09:52:24 +0100
• 1540c973eb Merge branch 'ticket/r14647-welcome-mail' into develop Michael RICOIS 2018-02-15 09:51:48 +0100
• b98a8c9d4a Merge branch 'ticket-14436-excel-format' into develop David 2018-02-14 18:54:23 +0100
• 88d1284171 Added new calculation for best sales David 2018-02-14 18:53:23 +0100
• 2e26b7a8fb Merge remote-tracking branch 'origin/ticket/r16108-test-sponsor' into develop Michael RICOIS 2018-02-14 17:14:58 +0100
• c530d9324e rawurlencode params ticket/r16108-test-sponsor Michael RICOIS 2018-02-14 17:07:37 +0100
• 775f373994 Merge branch 'ticket/r16112-display-credit' into develop Michael RICOIS 2018-02-14 14:54:39 +0100
• 1903c42573 Enable/Disable credit display Michael RICOIS 2018-02-14 14:54:13 +0100
• 36d74c72d8 Merge branch 'ticket/r16108-test-sponsor' into develop Michael RICOIS 2018-02-14 12:47:33 +0100
• 7b734c9b60 Remove samrtbanner error Michael RICOIS 2018-02-14 12:46:25 +0100
• 688adfedb4 Merge branch 'ticket/r16108-test-sponsor' into develop Michael RICOIS 2018-02-14 12:25:46 +0100
• 8ff1af50df Test Michael RICOIS 2018-02-14 12:16:16 +0100
• 1303a72d41 Use method to restrict Address ticket/r15925-check-adress Michael RICOIS 2018-02-14 10:20:13 +0100
• a348fd8328 Exchange order pack first, single after Michael RICOIS 2018-02-14 09:36:36 +0100
• bb7d8d133d Merge branch 'ticket-14739-PackLogistic' Michael RICOIS 2018-02-13 17:42:41 +0100
• f512725399 Merge branch 'ticket-14739-PackLogistic' into develop Michael RICOIS 2018-02-13 17:42:16 +0100
• ee76fb5feb Display action Michael RICOIS 2018-02-13 17:35:12 +0100
• 4e88bd364a Merge branch 'ticket-14739-PackLogistic' Michael RICOIS 2018-02-13 16:46:08 +0100
• fb61d8b1ad id_order Michael RICOIS 2018-02-13 16:45:38 +0100
• 46d2353512 checkAdress Michael RICOIS 2018-02-13 16:10:34 +0100
• d818d7f8ab Change mail template Michael RICOIS 2018-02-13 15:51:59 +0100
• 31047b7014 Merge branch 'ticket-14739-PackLogistic' into develop Michael RICOIS 2018-02-13 12:44:55 +0100
• 7a207b2010 CS Michael RICOIS 2018-02-13 12:42:39 +0100
• 5d8b7ba155 Oups Michael RICOIS 2018-02-13 10:41:59 +0100
• c4de0d3e8e Oups Michael RICOIS 2018-02-13 09:56:36 +0100
• 3851c2e70f Merge branch 'ticket-14739-PackLogistic' Michael RICOIS 2018-02-12 17:06:59 +0100
• 3f1d411ce6 Merge branch 'ticket-14739-PackLogistic' into develop Michael RICOIS 2018-02-12 17:05:19 +0100
• 6aebf9206a Merge remote-tracking branch 'origin/ticket/r15587-refund-paypal' into develop Michael RICOIS 2018-02-12 11:58:09 +0100
• dbbb5a7817 Merge remote-tracking branch 'origin/ticket/r15670-email' Michael RICOIS 2018-02-12 09:57:24 +0100
• 4baf6925ed Merge remote-tracking branch 'origin/ticket/r15225-redirect-mobile' Michael RICOIS 2018-02-12 09:41:58 +0100
• 1f546c17f9 Merge remote-tracking branch 'origin/ticket/r15670-email' into develop Michael RICOIS 2018-02-09 11:59:51 +0100
• e2a9475ec7 Vérification modification du compte, erreur si un compte existe déjà ticket/r15670-email Michael RICOIS 2018-02-09 11:49:12 +0100
• 60c7fc9a07 Merge branch 'ticket/r15670-email' into develop Michael RICOIS 2018-02-09 10:14:01 +0100
• f53dee8581 CS Michael RICOIS 2018-02-09 10:10:22 +0100
• 0d6e609448 CS Michael RICOIS 2018-02-09 10:03:42 +0100
• b67de1c311 CS Michael RICOIS 2018-02-09 09:30:13 +0100
• 20fd85c5fb email strtolower Michael RICOIS 2018-02-08 17:39:33 +0100
• ca461979c4 Var email Michael RICOIS 2018-02-08 17:31:49 +0100
• 54781041ee Merge branch 'ticket/r15782-stats' Michael RICOIS 2018-02-06 16:48:32 +0100
• e22919778d Merge branch 'ticket/r15782-stats' into develop Michael RICOIS 2018-02-06 16:48:04 +0100
• 3cc9394547 Form name ticket/r15782-stats Michael RICOIS 2018-02-06 16:47:39 +0100
• 8208894b2d Merge branch 'ticket/r15225-redirect-mobile' into develop Michael RICOIS 2018-02-06 16:25:16 +0100
• a3c2e56824 Merge branch 'ticket/r15782-stats' Michael RICOIS 2018-02-06 15:50:33 +0100
• de3d84758a Merge branch 'ticket/r15782-stats' into develop Michael RICOIS 2018-02-06 15:42:35 +0100
• 1097c2111e Fix ajax / https Michael RICOIS 2018-02-06 15:41:39 +0100
• cd1d3caeb6 Merge branch 'ticket/r15782-stats' Michael RICOIS 2018-02-06 15:23:05 +0100
• b59f0e70b1 Merge remote-tracking branch 'origin/ticket/r15782-stats' into develop Michael RICOIS 2018-02-06 15:21:35 +0100
• 75633bb6e2 Domain + https Michael RICOIS 2018-02-06 15:21:12 +0100
• d3077cf244 Merge remote-tracking branch 'origin/ticket/r15782-stats' Michael RICOIS 2018-02-06 14:49:48 +0100
• e02ddd8dee Merge branch 'ticket/r15782-stats' into develop Michael RICOIS 2018-02-06 14:48:36 +0100
• 1e0baff8cd https Michael RICOIS 2018-02-06 14:47:52 +0100
• dc5beb562c Remove debug Michael RICOIS 2018-02-06 14:36:25 +0100
• 11f40df725 Merge branch 'ticket/r15975-contact-spam' into develop Michael RICOIS 2018-02-06 11:19:36 +0100
• 3768576288 Add fix for spam ticket/r15975-contact-spam Michael RICOIS 2018-02-06 10:48:30 +0100
• 42b5f95c1f Update from logistics module Michael RICOIS 2018-02-06 09:31:12 +0100
• 4280d4960b Keep params when redirect on mobile Michael RICOIS 2018-02-05 16:23:46 +0100
• 99c9fad462 Merge remote-tracking branch 'origin/ticket/r14810-dropshipping-tracking' into develop Michael RICOIS 2018-02-05 12:51:25 +0100
• e01ffd309f CS ticket/r14810-dropshipping-tracking Michael RICOIS 2018-02-05 12:50:19 +0100
• b0cafcbe70 Email for dropshipping without carrier info Michael RICOIS 2018-02-05 12:26:27 +0100
• a12ab8132a Merge remote-tracking branch 'origin/ticket/r15782-stats' Michael RICOIS 2018-02-05 12:00:56 +0100
• d728c55633 Merge remote-tracking branch 'origin/ticket/r15931-contacts' into develop Michael RICOIS 2018-02-05 11:26:36 +0100
• 3769c8fc5c Remove condition ticket/r15931-contacts Michael RICOIS 2018-02-05 11:26:14 +0100
• 325c56ad1b Merge branch 'ticket/r15931-contacts' into develop Michael RICOIS 2018-02-05 11:19:21 +0100
• dd923fa2d7 Merge branch 'ticket-14436-excel-format' David 2018-02-02 22:01:19 +0100
• a3f1529659 Merge branch 'ticket-14436-excel-format' into develop David 2018-02-02 22:00:23 +0100
• 7c218242be Added doubled ean recovery options David 2018-02-02 21:59:26 +0100
• 134af30198 Harmonisation Michael RICOIS 2018-02-02 17:46:57 +0100
• 17061a6371 Merge branch 'ticket-14436-excel-format' into develop David 2018-02-02 15:38:27 +0100
• cbf9b268ce new duplicates management fix in formula David 2018-02-02 15:37:43 +0100
• d7ea10a2bb Mails Michael RICOIS 2018-02-02 12:28:49 +0100
• f73be8dba4 New landing XSS vulnerabilities fix David 2018-02-02 10:52:55 +0100
• c972fdf000 Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop Michael RICOIS 2018-02-02 10:36:42 +0100
• b152917951 Merge remote-tracking branch 'origin/ticket/r15782-stats' into develop Michael RICOIS 2018-02-02 10:36:20 +0100
• e73277ec38 Export in ajax Michael RICOIS 2018-02-01 17:39:33 +0100
• 1ae7e28abe Async export Michael RICOIS 2018-02-01 09:34:23 +0100
• 539d777960 Merge branch 'ticket-14811-title-not-clickable' into develop David 2018-01-31 18:18:40 +0100
• ac6a5c1667 banner not clickable ticket-14811-title-not-clickable David 2018-01-31 18:17:40 +0100
• 2c91058ece Text Michael RICOIS 2018-01-31 12:36:51 +0100
• 84472fbb03 Merge branch 'ticket/r14810-dropshipping-tracking' into develop Michael RICOIS 2018-01-31 12:22:44 +0100
• 9cadd3e8af Don't save shipping number in dropshipping Michael RICOIS 2018-01-31 12:05:57 +0100
• 70afb97e26 Column name Michael RICOIS 2018-01-31 11:34:17 +0100
• a71a5c9eac Remove glob Michael RICOIS 2018-01-31 10:50:00 +0100
• 8b49b143ac Merge branch 'ticket/r15788-discount-use' into develop Michael RICOIS 2018-01-31 09:43:14 +0100
• a6cf9bd87f Replace BETWEEN instruction Michael RICOIS 2018-01-31 09:39:24 +0100
• 40468043c9 CS Michael RICOIS 2018-01-30 18:00:48 +0100
• db36c1026b fix js errors Michael RICOIS 2018-01-30 17:49:53 +0100
• 84a1b37f50 Check quantity ticket/r15788-discount-use Michael RICOIS 2018-01-30 17:47:03 +0100
• 8b15ef46a6 Rework for dropshipping Michael RICOIS 2018-01-30 17:15:33 +0100
• 4fd935962e Merge branch 'ticket-14739-PackLogistic' Michael RICOIS 2018-01-30 12:30:01 +0100
• 5b2fb71241 Merge branch 'ticket-14739-PackLogistic' into develop Michael RICOIS 2018-01-30 12:27:52 +0100
• 60cef82038 Get file from server Michael RICOIS 2018-01-30 12:17:53 +0100
• 96a27def01 Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop Christophe Latour 2018-01-30 12:07:15 +0100
• ef01e6515d Residu server Christophe Latour 2018-01-30 12:06:44 +0100
• 1b5f1efbc0 Merge branch 'ticket-14739-PackLogistic' into develop Michael RICOIS 2018-01-30 11:59:02 +0100
• 12507d60c3 Not an ajax admin Michael RICOIS 2018-01-30 11:57:37 +0100
• 04399b0f6b Add cookie as global Michael RICOIS 2018-01-30 10:53:00 +0100
• 3aca7c4e2e Add hookCancelShipping Michael RICOIS 2018-01-29 16:47:51 +0100
• 54dcf852c2 Merge branch 'ticket/r15717-trad' into develop Michael RICOIS 2018-01-29 15:27:14 +0100
• 82b4072df7 Trad Michael RICOIS 2018-01-29 15:26:30 +0100
• 7a7cc4d7fe Merge remote-tracking branch 'origin/ticket/r11982-ganalytics' Michael RICOIS 2018-01-29 14:36:38 +0100