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

• 1d5578d66b Merge remote-tracking branch 'origin/ticket-14739-PackLogistic' master Michael RICOIS 2018-03-27 10:20:34 +0200
• c788138241 Merge branch 'ticket-14739-PackLogistic' into develop develop Michael RICOIS 2018-03-22 11:14:49 +0100
• 922de8200a Fix quantity ticket-14739-PackLogistic Michael RICOIS 2018-03-22 11:08:49 +0100
• ac1d708f5f Merge remote-tracking branch 'ticket/r16761-queue_name' into develop Michael RICOIS 2018-03-21 10:35:07 +0100
• 7699f86acd Save logisitic queue name in configuration ticket/r16761-queue_name Michael RICOIS 2018-03-21 10:32:59 +0100
• 76b26ac6b4 CS Michael RICOIS 2018-03-21 10:27:58 +0100
• ff5ac6e829 Fix menu ticket/r16684-famille Michael RICOIS 2018-03-20 16:02:05 +0100
• c0e474e35e trailer for content fix/sitemap Michael RICOIS 2018-03-20 12:26:10 +0100
• d30b3717fd Simplified sitemap Michael RICOIS 2018-03-20 12:10:23 +0100
• 25c1ae725b Test with cat and products Michael RICOIS 2018-03-20 12:07:55 +0100
• 6b863fe940 Fix Michael RICOIS 2018-03-19 12:27:57 +0100
• 34e2bdc553 Merge remote-tracking branch 'origin/ticket/r16490-email_error' Michael RICOIS 2018-03-19 12:19:16 +0100
• 0b451e2fc2 Mask all pages Michael RICOIS 2018-03-19 11:57:01 +0100
• 3fa1118554 CS Michael RICOIS 2018-03-19 11:47:59 +0100
• 2207ae3cb8 CS Michael RICOIS 2018-03-19 10:28:19 +0100
• 893da877e8 Merge remote-tracking branch 'origin/ticket/r16686-filter_back' Michael RICOIS 2018-03-19 10:19:01 +0100
• efbcf6327f Remove opening title (not working) ticket/r16686-filter_back Michael RICOIS 2018-03-19 10:15:54 +0100
• 5a605ad905 Fix url : typo Michael RICOIS 2018-03-19 09:45:28 +0100
• bbec1c0ef4 Merge branch 'ticket/r16686-filter_back' into develop Michael RICOIS 2018-03-16 10:34:08 +0100
• e057c88351 CSS open if values in cookie Michael RICOIS 2018-03-16 10:12:24 +0100
• 93fe8b597a CS Michael RICOIS 2018-03-16 10:11:38 +0100
• 4a85441bbf Merge branch 'ticket/r16686-filter_back' into develop Michael RICOIS 2018-03-15 17:38:51 +0100
• 9803b2424c Add filter value in cookie Michael RICOIS 2018-03-15 17:37:01 +0100
• 4691d8bb0f Remove .hg Michael RICOIS 2018-03-15 15:25:12 +0100
• 2a37cdfc54 Merge remote-tracking branch 'origin/ticket/r16490-email_error' into develop Michael RICOIS 2018-03-15 11:22:30 +0100
• a4625499c0 Override email value ticket/r16490-email_error Michael RICOIS 2018-03-15 11:21:41 +0100
• 3fd3c44b4a Remove code - you can't send multiple cookie domain fix/cookie-dev Michael RICOIS 2018-03-14 15:04:48 +0100
• a082f863fb Merge branch 'ticket/r14830-bandeaux' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into ticket/r14830-bandeaux ticket/r14830-bandeaux Michael RICOIS 2018-03-14 12:42:28 +0100
• 3f2072a20f Try to create form Michael RICOIS 2018-02-22 15:30:56 +0100
• 71e3ab5317 CS Michael RICOIS 2018-02-22 15:30:25 +0100
• 89478191be CS Michael RICOIS 2018-02-22 15:30:03 +0100
• 55ceabbe52 CS Michael RICOIS 2018-02-22 10:33:38 +0100
• 9d615586ec Create Form Michael RICOIS 2018-02-22 09:34:13 +0100
• dd21d98b9c Change libs path Michael RICOIS 2018-02-21 12:07:47 +0100
• 072eaef278 Organize libs Michael RICOIS 2018-02-21 12:07:18 +0100
• 3858644025 CS Michael RICOIS 2018-02-21 11:22:52 +0100
• 679179bc74 Add model Michael RICOIS 2018-02-21 09:35:02 +0100
• c3f5f5f54c Remove old skinstatic_old Michael RICOIS 2018-02-20 17:00:14 +0100
• e58544028d SQL Michael RICOIS 2018-02-20 12:03:55 +0100
• 20af00f1ec Start redraw skinstatic module Michael RICOIS 2018-02-20 12:02:19 +0100
• 1a5416cd30 Merge branch 'fix/cookie-dev' into develop Michael RICOIS 2018-03-14 12:03:27 +0100
• b5053e443a Merge remote-tracking branch 'origin/ticket/r15862-label_refbbb' Michael RICOIS 2018-03-14 11:57:07 +0100
• ffcd78f1fd Merge remote-tracking branch 'origin/ticket/r15862-label_refbbb' into develop Michael RICOIS 2018-03-14 11:56:37 +0100
• 34c962b75e Fix regexp ticket/r15862-label_refbbb Michael RICOIS 2018-03-14 11:51:28 +0100
• 588fa7e334 Merge branch 'ticket/r15862-label_refbbb' Michael RICOIS 2018-03-14 11:48:10 +0100
• 9ec259fa38 Merge branch 'ticket/r15862-label_refbbb' into develop Michael RICOIS 2018-03-14 11:47:40 +0100
• 03cd386f70 New regexp Michael RICOIS 2018-03-14 11:47:16 +0100
• 6d0beefa1c Merge branch 'ticket/r15862-label_refbbb' Michael RICOIS 2018-03-14 11:29:50 +0100
• 2bafc760de Merge branch 'ticket/r15862-label_refbbb' into develop Michael RICOIS 2018-03-14 11:28:40 +0100
• 2a3e8ebddd Change regexp to detect first - Michael RICOIS 2018-03-14 11:28:11 +0100
• b04dcfea06 Merge branch 'ticket/r16490-email_error' into develop Michael RICOIS 2018-03-14 11:21:22 +0100
• eea2e769d1 Remove break point Michael RICOIS 2018-03-14 11:17:26 +0100
• b2c8ce4248 Isolate env Michael RICOIS 2018-03-14 11:14:54 +0100
• 1858378454 Merge remote-tracking branch 'origin/ticket/r16627-mail_return_link' into develop Michael RICOIS 2018-03-14 09:48:56 +0100
• aca4357353 Fix return link ticket/r16627-mail_return_link Michael RICOIS 2018-03-14 09:48:02 +0100
• f2462e6bc3 Merge remote-tracking branch 'origin/ticket/r15862-label_refbbb' Michael RICOIS 2018-03-13 15:21:51 +0100
• 12db38b21d Merge branch 'ticket/r15862-label_refbbb' into develop Michael RICOIS 2018-03-13 15:20:37 +0100
• d6dbc5f479 New label format Michael RICOIS 2018-03-13 15:18:14 +0100
• e54395e5d1 Include file from server Michael RICOIS 2018-03-13 12:02:24 +0100
• 5f44b1c9fa Merge branch 'ticket/r16490-email_error' into develop Michael RICOIS 2018-03-12 16:41:53 +0100
• 2619b26347 Merge branch 'ticket-14739-PackLogistic' into develop Michael RICOIS 2018-03-12 15:00:32 +0100
• 305234f74f CS Michael RICOIS 2018-03-12 12:58:54 +0100
• 1920a84634 Add rules Michael RICOIS 2018-03-12 11:52:00 +0100
• 37b955667f Merge remote-tracking branch 'origin/ticket/r16455-exclude_bot' Michael RICOIS 2018-03-12 10:11:36 +0100
• 9115434424 Merge remote-tracking branch 'origin/tickets/customer_date_upd' Michael RICOIS 2018-03-12 10:05:44 +0100
• 2343304d25 Merge remote-tracking branch 'origin/ticket/r15109-math-captcha' Michael RICOIS 2018-03-12 09:50:53 +0100
• ffe8c187e8 Merge remote-tracking branch 'origin/ticket/r16492-bulkupdate' Michael RICOIS 2018-03-12 09:48:05 +0100
• d1d0642f91 Add a better way to correct email - to test Michael RICOIS 2018-03-09 17:54:36 +0100
• d3d2c06831 Merge branch 'ticket/r16492-bulkupdate' into develop Michael RICOIS 2018-03-09 12:41:51 +0100
• 2985b1ed4f Find tax when update ticket/r16492-bulkupdate Michael RICOIS 2018-03-09 12:41:14 +0100
• 76eb16036b update date_upd to customer tickets/customer_date_upd Michael RICOIS 2018-03-09 11:21:41 +0100
• 62139fe9fd Merge remote-tracking branch 'origin/ticket/r15862-label_refbbb' Michael RICOIS 2018-03-08 17:36:23 +0100
• ba7f3d2223 Test Michael RICOIS 2018-03-08 17:35:26 +0100
• 887c687dd1 Change dimension Michael RICOIS 2018-03-08 17:30:25 +0100
• 9e386209d7 Fix Michael RICOIS 2018-03-08 17:24:53 +0100
• 87387701c3 Remove ajax cache Michael RICOIS 2018-03-08 17:14:38 +0100
• eed8873dc5 Merge remote-tracking branch 'origin/ticket/r15862-label_refbbb' Michael RICOIS 2018-03-08 16:42:47 +0100
• 3941697c78 Merge remote-tracking branch 'origin/ticket/r15862-label_refbbb' into develop Michael RICOIS 2018-03-08 16:36:09 +0100
• cab5635c8f Test format image Michael RICOIS 2018-03-08 16:29:11 +0100
• fc107f5d6d Merge branch 'ticket/r16348-credit-expired' Michael RICOIS 2018-03-08 14:59:05 +0100
• 490baf50f4 Clean Michael RICOIS 2018-03-08 14:57:54 +0100
• 1d5eb5ec97 New label Michael RICOIS 2018-03-08 14:54:52 +0100
• c86f90f0eb Clean Michael RICOIS 2018-03-08 11:44:37 +0100
• bd8981af81 Merge branch 'ticket/r15109-math-captcha' into develop Michael RICOIS 2018-03-06 17:28:18 +0100
• 9edb325f22 Error message ticket/r15109-math-captcha Michael RICOIS 2018-03-06 17:09:30 +0100
• 0b835a3af5 New button Michael RICOIS 2018-03-06 14:34:46 +0100
• 240d6e1dee Merge branch 'ticket/r15109-math-captcha' into develop Michael RICOIS 2018-03-06 10:47:09 +0100
• db740966f1 Merge branch 'fix/sensefuel-description' into develop Michael RICOIS 2018-03-06 10:46:07 +0100
• c658d0ec75 Use description_short as description fix/sensefuel-description Michael RICOIS 2018-03-06 10:42:58 +0100
• e7551ef018 session_start Michael RICOIS 2018-03-06 10:33:14 +0100
• 4a63488b51 Style Michael RICOIS 2018-03-05 17:28:11 +0100
• 2c870b56f4 Add captcha Michael RICOIS 2018-03-05 17:05:47 +0100
• bec5a21522 CS Michael RICOIS 2018-03-05 17:04:58 +0100
• d7cce43d8f Merge branch 'ticket/r14810-dropshipping-tracking' Michael RICOIS 2018-03-05 12:59:56 +0100
• 633c8e77e4 Merge remote-tracking branch 'origin/fix/mobile_detect' Michael RICOIS 2018-03-05 12:59:15 +0100
• d86175e93f Merge branch 'ticket/r16455-exclude_bot' into develop Michael RICOIS 2018-03-05 10:34:16 +0100
• 322c019c5c Merge remote-tracking branch 'origin/ticket/r16159-customer-message' Michael RICOIS 2018-03-05 09:49:15 +0100
• 3f22601be3 Merge branch 'fix/mobile_detect' into develop Michael RICOIS 2018-03-02 16:45:18 +0100
• 97f8d56b5e Update Mobile_Detect to version 2.8.31 fix/mobile_detect Michael RICOIS 2018-03-02 16:44:00 +0100
• d931f7f081 Exclude Sensefuel bot ticket/r16455-exclude_bot Michael RICOIS 2018-03-02 16:27:52 +0100