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

• 5b40878629 modif tpl Marion Muszynski 2016-04-26 16:39:06 +0200
• 21f418dd84 fix confict css Marion Muszynski 2016-04-26 16:22:26 +0200
• cbf6deeb91 begin new product tpl Marion Muszynski 2016-04-26 16:19:40 +0200
• f72b207fc0 Merge branch 'ticket-newExtract' into develop Marion Muszynski 2016-04-25 17:17:05 +0200
• 54bbfd5248 modif extract Marion Muszynski 2016-04-25 17:16:29 +0200
• dde198080d modif extract custom Marion Muszynski 2016-04-25 16:50:51 +0200
• 423b9fbcc0 Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-25 16:05:33 +0200
• c4052dc0f0 modif css mobile Marion Muszynski 2016-04-25 16:04:51 +0200
• 6926224b43 Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-25 12:45:37 +0200
• be4026ba1a modif tpl Marion Muszynski 2016-04-25 12:45:13 +0200
• 99316efe95 Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-25 11:34:06 +0200
• 48ba0424d8 other modif Marion Muszynski 2016-04-25 11:31:26 +0200
• 7084a1055b Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-25 11:14:07 +0200
• 957c7f1db6 modif hookOrderReturn Marion Muszynski 2016-04-25 11:13:36 +0200
• e8f0026211 Merge branch 'ticket-updBraderie' Marion Muszynski 2016-04-25 10:48:17 +0200
• b7dbcbd3b0 Merge branch 'ticket-updBraderie' into develop Marion Muszynski 2016-04-25 10:44:39 +0200
• 72a3792897 fix bug double adding Marion Muszynski 2016-04-25 10:43:24 +0200
• 1091ccea77 Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-22 18:01:02 +0200
• 4397a50151 correction concernant le return et cancel product Marion Muszynski 2016-04-22 18:00:36 +0200
• 2ef9fbd9ce Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-22 17:01:40 +0200
• b7ff14c0a7 correction for return Marion Muszynski 2016-04-22 17:00:45 +0200
• 82882a9b5b Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-22 16:43:35 +0200
• 364fe5e367 corrections Marion Muszynski 2016-04-22 16:43:07 +0200
• bd74ed03d7 Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-22 16:31:11 +0200
• cd742921f3 update tpl Marion Muszynski 2016-04-22 16:30:18 +0200
• bb15d1e81b Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-22 16:21:48 +0200
• 3d1fb8a10a other update Marion Muszynski 2016-04-22 16:20:53 +0200
• 5764cda5b6 Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-22 15:24:40 +0200
• 3b855c3f4a modif BO Marion Muszynski 2016-04-22 15:23:16 +0200
• 2db0ee384d Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-22 15:17:50 +0200
• 7edf0ce6b7 update for return Marion Muszynski 2016-04-22 15:17:26 +0200
• 87829ac8c3 Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-22 15:07:52 +0200
• f303bb4b2d encore un int qui trainait Marion Muszynski 2016-04-22 15:07:18 +0200
• 4bc9303ff7 Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-22 12:58:01 +0200
• f1f14667a4 modif BO loyalty Marion Muszynski 2016-04-22 12:57:31 +0200
• c6cdcd748b Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-21 18:37:44 +0200
• b6e25b87cc modifs Marion Muszynski 2016-04-21 18:37:11 +0200
• b05ebd8a38 Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-21 18:06:50 +0200
• e540e9e1cf modifs Marion Muszynski 2016-04-21 18:06:22 +0200
• c6559904ff Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-21 17:57:17 +0200
• 36af8de7d8 correction int float second round Marion Muszynski 2016-04-21 17:56:54 +0200
• e28d322bd1 Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-21 17:53:22 +0200
• aaf2290d28 correction int float Marion Muszynski 2016-04-21 17:52:52 +0200
• d3f7d66f95 fix conflict css Marion Muszynski 2016-04-21 17:44:16 +0200
• 35ee4a1c68 many update of module loyalty Marion Muszynski 2016-04-21 17:41:04 +0200
• fa2d77b8b2 Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-21 12:39:56 +0200
• a2e21669b0 correction bug newOrderHook Marion Muszynski 2016-04-21 12:39:07 +0200
• d0644b680e Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-21 12:15:31 +0200
• e505c1e9db other corrctions Marion Muszynski 2016-04-21 12:15:04 +0200
• 02bff329ca Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-21 12:01:36 +0200
• 15f3b6fa20 modif tpl Marion Muszynski 2016-04-21 12:01:10 +0200
• 0d92bae9f9 Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-21 11:39:49 +0200
• 5d52bff134 corrections Marion Muszynski 2016-04-21 11:39:25 +0200
• 042d42d578 Merge branch 'ticket-fidelite' into develop Marion Muszynski 2016-04-21 11:32:06 +0200
• ba0e8d29bc modif tpl loyalty Marion Muszynski 2016-04-21 11:31:36 +0200
• c8befd1ede total modification of loyalty module Marion Muszynski 2016-04-21 11:14:33 +0200
• 6827513a88 Merge branch 'paypal_billing' into develop Thibault UBUNTU 2016-04-20 17:39:02 +0200
• fa60d253e8 box paypal Thibault UBUNTU 2016-04-20 17:38:57 +0200
• 3cd9af191d Merge branch 'paypal_billing' into develop Thibault UBUNTU 2016-04-20 17:35:17 +0200
• bbee57249a version mobile Thibault UBUNTU 2016-04-20 17:35:03 +0200
• 811ba9b3a9 Merge branch 'ticket-newExtracts' Marion Muszynski 2016-04-20 16:40:37 +0200
• 4b80f9f7a6 correction Marion Muszynski 2016-04-20 16:40:12 +0200
• ef33e2cbc7 Merge branch 'ticket-newExtracts' Marion Muszynski 2016-04-20 16:05:20 +0200
• 9f20e049de Merge branch 'ticket-newExtracts' into develop Marion Muszynski 2016-04-20 15:59:31 +0200
• 753b17fcba petite rectification quantity_sold Marion Muszynski 2016-04-20 15:58:47 +0200
• 21f1ada2d1 Merge branch 'ticket-landingpage' Marion Muszynski 2016-04-20 15:35:16 +0200
• fd5bccadd7 begin loyalty Marion Muszynski 2016-04-20 15:33:56 +0200
• c37df06d47 add reassurance text Thibault UBUNTU 2016-04-20 15:32:12 +0200
• 6512b4aaaa Merge branch 'develop' of gitlab.antadis.fr:dev-antadis/bebeboutik into develop Thibault UBUNTU 2016-04-20 14:20:40 +0200
• 639d2402e6 Merge branch 'paypal_billing' into develop Thibault UBUNTU 2016-04-20 14:20:15 +0200
• 848dbdedc0 load payment paypal Thibault UBUNTU 2016-04-20 14:20:07 +0200
• f2e0e80149 Merge branch 'ticket-landingpage' into develop Marion Muszynski 2016-04-20 12:35:50 +0200
• 4c4c069588 modif width button Marion Muszynski 2016-04-20 12:35:20 +0200
• 789b011f7f Merge branch 'ticket-newExtracts' into develop Marion Muszynski 2016-04-20 11:59:27 +0200
• ecf913626f update extract names Marion Muszynski 2016-04-20 11:59:02 +0200
• 7ff21f8a76 Merge branch 'ticket-newExtracts' into develop Marion Muszynski 2016-04-20 11:38:26 +0200
• c63769824e add 2 new extracts for deb Marion Muszynski 2016-04-20 11:37:50 +0200
• 219b6dabb3 Merge branch 'ticket-consumable' Marion Muszynski 2016-04-18 16:17:30 +0200
• ca6587052b change id consumable for prod Marion Muszynski 2016-04-18 16:17:04 +0200
• ffb8f1f3c2 Merge branch 'ticket-consumable' into develop Marion Muszynski 2016-04-18 16:14:40 +0200
• cbbaf9c8e0 modif left_img.tpl Marion Muszynski 2016-04-18 16:14:19 +0200
• e15f382530 Merge branch 'ticket-consumable' into develop Marion Muszynski 2016-04-18 16:03:42 +0200
• 1c0d70688c modif categoryimg Marion Muszynski 2016-04-18 16:03:17 +0200
• f288f1ce8d Merge branch 'ticket-landingpage' into develop Marion Muszynski 2016-04-18 15:22:50 +0200
• d7b7e7abc6 modif connect button in landing page Marion Muszynski 2016-04-18 15:22:00 +0200
• e2cc8ff3fd Merge branch 'ticket-extract' Marion Muszynski 2016-04-15 16:48:37 +0200
• ef01566b17 Merge branch 'ticket-extract' into develop Marion Muszynski 2016-04-15 12:39:14 +0200
• f0e2a7481a fix to order image by position Marion Muszynski 2016-04-15 12:38:31 +0200
• c1e1f78057 Merge branch 'ticket-extract' into develop Marion Muszynski 2016-04-15 12:05:53 +0200
• cdd8b21bfe add nc8 id_country into export sales Marion Muszynski 2016-04-15 12:05:25 +0200
• 92e77117f8 Merge branch 'ticket-consumable' into develop Marion Muszynski 2016-04-15 11:46:36 +0200
• e56cf154f7 Merge branch 'ticket-consumable' Marion Muszynski 2016-04-15 11:44:09 +0200
• d0a702380f update css Marion Muszynski 2016-04-15 11:43:42 +0200
• 5521eeba23 Merge branch 'ticket-consumable' Marion Muszynski 2016-04-15 11:37:26 +0200
• 0073cb8dde fix css Marion Muszynski 2016-04-15 11:37:01 +0200
• ab9546027d Merge branch 'ticket-consumable' Marion Muszynski 2016-04-15 11:33:28 +0200
• f7f7a15339 update css site mobile Marion Muszynski 2016-04-15 11:33:00 +0200
• 8dcdd78eb1 Merge branch 'ticket-consumable' Marion Muszynski 2016-04-15 11:28:24 +0200
• d1ef6a27c2 Merge branch 'ticket-consumable' into develop Marion Muszynski 2016-04-15 11:27:16 +0200
• 7f2cf9cd16 add tpl and css for site mobile Marion Muszynski 2016-04-15 11:26:00 +0200