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

• 8dfb53c792 Set index on $cart_add_qties David 2018-01-12 11:32:53 +0100
• ee7ec89a87 Add mark philea Michael RICOIS 2018-01-11 16:22:25 +0100
• a66a711598 CS Michael RICOIS 2018-01-11 14:55:22 +0100
• dbc9d4b8e3 CS Michael RICOIS 2018-01-11 13:19:25 +0100
• 9228227d89 CS Michael RICOIS 2018-01-11 13:03:54 +0100
• 9012485ba3 Merge branch 'ticket-14904-achatexpressmobile' into develop Michael RICOIS 2018-01-11 11:33:04 +0100
• 00657ccd4e z-index on expresscart Michael RICOIS 2018-01-11 11:10:02 +0100
• 2b897d2010 Merge remote-tracking branch 'origin/ticket-14904-achatexpressmobile' into develop Michael RICOIS 2018-01-10 17:56:20 +0100
• 8b2476e6a7 Add a select for mobile Michael RICOIS 2018-01-10 17:55:44 +0100
• 391d526942 Merge remote-tracking branch 'origin/ticket/r15314-generate-label' Michael RICOIS 2018-01-10 15:04:36 +0100
• 99048f9fef Merge remote-tracking branch 'origin/ticket/r15314-generate-label' into develop Michael RICOIS 2018-01-10 15:02:31 +0100
• 6dcf2c757e Add a timestamp to bypass cache ticket/r15314-generate-label Michael RICOIS 2018-01-10 12:49:28 +0100
• 86838491d1 Merge remote-tracking branch 'origin/develop' into develop David 2018-01-09 19:02:49 +0100
• 0c44a48f99 Merge branch 'fix/domain-issue-ajax-express-cart' into develop David 2018-01-09 19:01:58 +0100
• b2130305b2 js files need to be downloaded from the same domain. David 2018-01-09 18:53:38 +0100
• b3fec0e045 Merge remote-tracking branch 'origin/master' David 2018-01-09 16:53:23 +0100
• 3db4b0a411 post merge fix David 2018-01-09 16:51:48 +0100
• 371ad472aa Merge branch 'ticket-14904-achatexpressmobile' David 2018-01-09 16:21:17 +0100
• 225f857725 Merge branch 'ticket-14826-fix-product-title' David 2018-01-09 12:26:12 +0100
• 130a2e27b3 Merge branch 'ticket/r14716-order-detail-device' into develop Michael RICOIS 2018-01-09 11:55:38 +0100
• 191f9a3312 Icon for device in order details ticket/r14716-order-detail-device Michael RICOIS 2018-01-09 11:51:26 +0100
• 428dd65c8e Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop Michael RICOIS 2018-01-09 10:08:57 +0100
• 7dfc4db294 Merge remote-tracking branch 'origin/ticket/r15364-fix-shipping-cost' into develop Michael RICOIS 2018-01-09 10:08:39 +0100
• 04254c0d83 Fix shipping cost for category 8744158 ticket/r15364-fix-shipping-cost Michael RICOIS 2018-01-09 10:05:53 +0100
• 428fd82c38 Merge branch 'ticket-14904-achatexpressmobile' into develop David 2018-01-08 17:27:00 +0100
• 6006429bea Missing translations ES / FR David 2018-01-08 17:24:42 +0100
• e1e5f7c634 Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop Michael RICOIS 2018-01-08 17:11:15 +0100
• 2b4033a51d Merge branch 'ticket/r15319-multi-voucher' into develop Michael RICOIS 2018-01-08 17:08:07 +0100
• a896679d6a Use number only when we get more than 1 discount ticket/r15319-multi-voucher Michael RICOIS 2018-01-08 17:07:30 +0100
• c82df4b134 Manage several discount per order Michael RICOIS 2018-01-08 17:01:55 +0100
• d9f23e7f30 Merge branch 'ticket/r15314-generate-label' Michael RICOIS 2018-01-08 16:46:14 +0100
• 3dd5712e92 Rollback Michael RICOIS 2018-01-08 16:45:38 +0100
• a87264db47 Merge branch 'ticket/r15314-generate-label' Michael RICOIS 2018-01-08 15:06:16 +0100
• 0a3cad9e8e Merge remote-tracking branch 'origin/develop' into develop David 2018-01-08 13:13:59 +0100
• 68df3e7e6a Merge branch 'ticket-14904-achatexpressmobile' into develop David 2018-01-08 13:13:22 +0100
• 584ee64e5a fixed bug related to cart and translation David 2018-01-08 13:12:51 +0100
• b1614b7fda Merge branch 'ticket/r15351-permissions-managers' into develop Michael RICOIS 2018-01-08 12:50:18 +0100
• 2e2ac976a0 Add profile 13 (managers) ticket/r15351-permissions-managers Michael RICOIS 2018-01-08 12:47:09 +0100
• c7718cc938 Merge branch 'ticket-14826-fix-product-title' into develop David 2018-01-08 12:02:00 +0100
• 9694bb685b Fixed style position ticket-14826-fix-product-title David 2018-01-08 11:39:05 +0100
• 70b140a03c Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop Michael RICOIS 2018-01-05 15:25:44 +0100
• 28cf96ba5e Merge branch 'ticket/r15314-generate-label' into develop Michael RICOIS 2018-01-05 15:24:37 +0100
• 3a217603ed CS Michael RICOIS 2018-01-05 15:20:41 +0100
• c16b34b0df Generate Label even if product have EAN code Michael RICOIS 2018-01-05 15:14:30 +0100
• 9374aeb31c Merge branch 'fix/mktime' into 'master' David TESTON 2018-01-04 18:43:30 +0100
• a199f1bed9 Merge branch 'fix/mktime' into local_christophe local_christophe Christophe LATOUR 2018-01-04 18:39:56 +0100
• d80baa79bd FIX 500 : - exception 'ErrorException' with message 'mktime(): You should be using the time() function instead' in /Library/WebServer/Documents/bebeboutik/modules/privatesales/Sale.php:76 fix/mktime Christophe LATOUR 2018-01-04 18:39:01 +0100
• 7003069279 Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik into local_christophe Christophe LATOUR 2018-01-04 18:26:44 +0100
• 2582a426de Merge branch 'fix/order_mobile' Michael RICOIS 2018-01-03 12:13:27 +0100
• 059d483841 Merge branch 'ticket-14826-fix-product-title' into develop David 2018-01-02 12:36:44 +0100
• 306858b179 css fix David 2018-01-02 11:58:33 +0100
• c71c1e7712 Merge branch 'ticket-14826-fix-product-title' into develop David 2018-01-02 11:52:06 +0100
• 4664d8f6fa attempt at correccting ajax add to cart David 2018-01-02 11:51:07 +0100
• 7184fccba4 Merge remote-tracking branch 'origin/ticket/r15251-limit_etagere' Michael RICOIS 2018-01-02 10:47:13 +0100
• ad47f0c1f6 Merge branch 'ticket/r15251-limit_etagere' into develop Michael RICOIS 2018-01-02 10:30:11 +0100
• 07cea80436 Increase "emplacement" limit ticket/r15251-limit_etagere Michael RICOIS 2018-01-02 10:28:59 +0100
• e84e304c9e Merge branch 'ticket/r15172-change-adress-socol' David 2018-01-02 10:20:01 +0100
• 2d84b8127e Merge branch 'ticket-14826-fix-product-title' into develop David 2017-12-29 18:25:28 +0100
• 44da8e13b1 Additionnal information will not break the template anymore David 2017-12-29 18:22:13 +0100
• 392bccd110 Merge branch 'ticket/r15172-change-adress-socol' into develop David 2017-12-29 18:13:34 +0100
• 0868abc8ea no more checking for change ticket/r15172-change-adress-socol David 2017-12-29 18:12:55 +0100
• 657b39d532 Merge branch 'ticket/r15172-change-adress-socol' into develop David 2017-12-29 15:55:01 +0100
• de0efe93eb Added modification button display in all conditions. David 2017-12-29 15:52:23 +0100
• 5b2ee8b7aa Merge branch 'ticket-14826-fix-product-title' David 2017-12-29 13:04:30 +0100
• 5d1065ab7e Merge branch 'ticket-14826-fix-product-title' into develop David 2017-12-29 12:20:39 +0100
• b8612b7dfd product title is longer in async product list David 2017-12-29 12:19:17 +0100
• fc4f66c0cf Merge branch 'fix/paybox-dec-2017' into develop David 2017-12-22 15:10:00 +0100
• f5f52de382 switched emails David 2017-12-22 15:08:14 +0100
• c09890dea8 Merge branch 'fix/order' into develop Michael RICOIS 2017-12-22 14:42:49 +0100
• c75f641567 Fix order on mobile website. appli is not a bool fix/order_mobile Michael RICOIS 2017-12-22 14:42:19 +0100
• 5acba9c265 Fix order mobile Michael RICOIS 2017-12-22 12:51:26 +0100
• fe49739aa4 Merge branch 'fix/smartbanner' Michael RICOIS 2017-12-21 17:00:38 +0100
• 3a5c74c325 Merge remote-tracking branch 'origin/ticket/14716-order-mobile' Michael RICOIS 2017-12-21 16:56:29 +0100
• 4ee4994d33 Merge branch 'ticket/r15224-balises' into develop Michael RICOIS 2017-12-21 16:46:02 +0100
• 58d0028c22 Use $_REQUEST to not double Michael RICOIS 2017-12-21 16:44:50 +0100
• c4c97cb837 Merge branch 'fix/smartbanner' into develop Michael RICOIS 2017-12-21 15:59:48 +0100
• e56e0fd53f Delete old smartbanner Michael RICOIS 2017-12-21 15:59:20 +0100
• 78c1c15990 Merge branch 'fix/smartbanner' into develop Michael RICOIS 2017-12-21 15:56:46 +0100
• e12922da5c New smartbanner Michael RICOIS 2017-12-21 15:51:21 +0100
• 3dd620e9e9 Merge remote-tracking branch 'origin/master' into develop Michael RICOIS 2017-12-21 15:20:50 +0100
• c650ee706c Display EDIT Michael RICOIS 2017-12-21 15:10:45 +0100
• 6ab4df6b66 Merge remote-tracking branch 'origin/ticket/r15172-change-adress-socol' into develop Michael RICOIS 2017-12-21 12:36:32 +0100
• 81b74686cf Remove invoice change Michael RICOIS 2017-12-21 12:34:58 +0100
• cd393096c4 Merge branch 'ticket/r15172-change-adress-socol' into develop Michael RICOIS 2017-12-21 12:08:29 +0100
• ab11871b99 CS Michael RICOIS 2017-12-21 12:07:40 +0100
• 422f7e9820 Merge branch 'ticket/r15172-change-adress-socol' into develop Michael RICOIS 2017-12-21 11:53:06 +0100
• e200eb6c6f Fix bug presta afterUpdate Michael RICOIS 2017-12-21 11:49:19 +0100
• bbf2698b31 Merge branch 'ticket/r15172-change-adress-socol' into develop Michael RICOIS 2017-12-21 10:13:31 +0100
• 5e3c35b95b Modification et affichage adresse socolissimo lorsque livraison domicile Michael RICOIS 2017-12-21 10:12:16 +0100
• ac36ae8bac Merge branch 'fix/suspect_with_other_domain' into develop Michael RICOIS 2017-12-20 14:25:01 +0100
• 5eb320c4de Ajout exclusion Michael RICOIS 2017-12-20 11:52:56 +0100
• 07b607cfc2 Merge remote-tracking branch 'origin/ticket/15014-invite_credits' Michael RICOIS 2017-12-20 11:04:41 +0100
• 1116cb292f Merge remote-tracking branch 'origin/ticket/r15128-sponsor' Michael RICOIS 2017-12-20 11:03:07 +0100
• a04d0712cb Merge remote-tracking branch 'origin/develop' into develop David 2017-12-18 15:55:59 +0100
• e2a6393cea Merge branch 'ticket-14826-fix-product-title' into develop David 2017-12-18 15:55:23 +0100
• 9e25127b26 fix David 2017-12-18 15:54:59 +0100
• 15ac61838b Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop Michael RICOIS 2017-12-18 15:53:57 +0100
• 3c2e01149c Merge branch 'ticket/14716-order-mobile' into develop Michael RICOIS 2017-12-18 15:53:45 +0100
• 8e74921024 Merge branch 'ticket-14826-fix-product-title' into develop David 2017-12-18 15:51:07 +0100
• 05e9556730 color for icon ticket/14716-order-mobile Michael RICOIS 2017-12-18 15:39:30 +0100