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

• 22bef2c9db Merge branch 'ticket/r16450-mr_country' into develop Michael RICOIS 2018-03-02 11:39:13 +0100
• c09fe7c1fb Fix switch ticket/r16450-mr_country Michael RICOIS 2018-03-02 11:38:32 +0100
• 05d11e97fa Merge branch 'ticket/r16450-mr_country' into develop Michael RICOIS 2018-03-02 11:04:57 +0100
• 056d5a9f3f Country display Michael RICOIS 2018-03-02 10:44:07 +0100
• 4f729d9b2b Merge branch 'ticket/r16159-customer-message' into develop Michael RICOIS 2018-03-01 16:30:19 +0100
• 7208390679 Typo ticket/r16159-customer-message Michael RICOIS 2018-03-01 16:29:55 +0100
• 9e010d63d6 Typo Michael RICOIS 2018-03-01 16:27:27 +0100
• 63e4c4385e Merge branch 'ticket/r16348-credit-expired' into develop Michael RICOIS 2018-03-01 16:09:17 +0100
• 75176c652f Merge remote-tracking branch 'origin/ticket/r16347-mail-lang' into develop Michael RICOIS 2018-02-28 17:50:20 +0100
• 45d340ac64 Reset global value ticket/r16347-mail-lang Michael RICOIS 2018-02-28 17:37:15 +0100
• 92415523d0 Merge branch 'ticket/r16112-display-credit' Michael RICOIS 2018-02-28 11:27:53 +0100
• a5578a75c1 Merge branch 'ticket/r16112-display-credit' into develop Michael RICOIS 2018-02-28 11:24:27 +0100
• af201001f1 Display credit on standard customer ticket/r16112-display-credit Michael RICOIS 2018-02-28 11:14:09 +0100
• 5a6ff9c962 Remove credit expired Michael RICOIS 2018-02-27 17:48:02 +0100
• 95ff7a4323 Merge branch 'ticket/r16345-lang' Michael RICOIS 2018-02-27 16:18:11 +0100
• 63e1e1eae5 Merge branch 'ticket/r16112-display-credit' Michael RICOIS 2018-02-27 16:17:18 +0100
• 9c8f93faa9 Merge branch 'ticket/r16345-lang' into develop Michael RICOIS 2018-02-27 15:12:12 +0100
• 4f0dab9452 Merge remote-tracking branch 'origin/ticket/r16112-display-credit' into develop Michael RICOIS 2018-02-27 14:46:12 +0100
• 427258606c CS Michael RICOIS 2018-02-27 14:36:05 +0100
• 563bd0c7df Change display Michael RICOIS 2018-02-27 10:44:27 +0100
• 9450f9f0de Clean mail translation ticket/r16345-lang Michael RICOIS 2018-02-26 17:08:23 +0100
• 7cea4e23ba Language Michael RICOIS 2018-02-26 16:13:35 +0100
• 613411ea4a Encode Michael RICOIS 2018-02-26 15:50:21 +0100
• 73563b0ca8 Remove .hg Michael RICOIS 2018-02-26 15:30:58 +0100
• 5980a64743 Merge branch 'ticket-14739-PackLogistic' into develop Michael RICOIS 2018-02-26 12:45:37 +0100
• 8288c15333 Enhance customer search for discount fix/discount_search Michael RICOIS 2018-02-26 12:20:35 +0100
• b9016d4131 Merge branch 'ticket/r15587-refund-paypal' Michael RICOIS 2018-02-26 11:50:28 +0100
• 197f4161d1 Add New Import Michael RICOIS 2018-02-26 11:46:03 +0100
• e10b13392d Merge branch 'ticket-15629-new-landing' into develop David 2018-02-23 18:48:15 +0100
• 89f3aff521 image cache invalidation breadcrumb visible on error ticket-15629-new-landing David 2018-02-23 18:46:48 +0100
• 094f382eb5 Enhance customer search for discount Michael RICOIS 2018-02-23 16:12:06 +0100
• 96352f3042 Merge branch 'ticket/r16159-customer-message' into develop Michael RICOIS 2018-02-23 12:36:35 +0100
• d307e50f7f Get back to date_upd Michael RICOIS 2018-02-23 12:19:46 +0100
• 71d44a1eb6 Merge branch 'ticket/r16159-customer-message' into develop Michael RICOIS 2018-02-23 12:11:05 +0100
• a09de51ac2 Reset date_upd Michael RICOIS 2018-02-23 12:10:14 +0100
• b87e937fbc Merge branch 'ticket/r15587-refund-paypal' into develop Michael RICOIS 2018-02-23 11:38:11 +0100
• 78ec506d8b Change detection of complete order refund, and change state of order ticket/r15587-refund-paypal Michael RICOIS 2018-02-23 11:22:14 +0100
• 2cdfbdb833 Date update only if it's a thread Michael RICOIS 2018-02-22 17:56:47 +0100
• cf142b7071 CS Michael RICOIS 2018-02-22 17:54:49 +0100
• d5b1691ebf Merge branch 'fix/imageResize' Michael RICOIS 2018-02-22 16:28:11 +0100
• 9fd729310a Merge branch 'fix/imageResize' into develop Michael RICOIS 2018-02-22 16:24:06 +0100
• a4edf0dbc1 Image lib Michael RICOIS 2018-02-22 16:23:41 +0100
• b98aad808b Merge branch 'ticket/r15587-refund-paypal' Michael RICOIS 2018-02-22 16:05:43 +0100
• f514096c98 Merge branch 'fix/imageResize' Michael RICOIS 2018-02-22 16:03:42 +0100
• 57d8bc52c6 Merge branch 'fix/imageResize' into develop Michael RICOIS 2018-02-22 15:55:42 +0100
• b5307d448a Merge branch 'ticket/r15587-refund-paypal' into develop Michael RICOIS 2018-02-22 15:54:47 +0100
• 06413abad5 Fix var Michael RICOIS 2018-02-22 15:54:25 +0100
• ea70a48b64 Try to create form Michael RICOIS 2018-02-22 15:30:56 +0100
• 21a337c8f0 CS Michael RICOIS 2018-02-22 15:30:25 +0100
• 3ad6f43fbf CS Michael RICOIS 2018-02-22 15:30:03 +0100
• 681fb29f74 CS Michael RICOIS 2018-02-22 10:33:38 +0100
• 834fbe9348 Merge branch 'ticket/r14647-welcome-mail' Michael RICOIS 2018-02-22 09:41:10 +0100
• 48f2940d2d Merge branch 'ticket-14739-PackLogistic' Michael RICOIS 2018-02-22 09:35:41 +0100
• 0786af52fd Create Form Michael RICOIS 2018-02-22 09:34:13 +0100
• d303a06b7e Merge branch 'ticket/r15587-refund-paypal' Michael RICOIS 2018-02-21 17:21:32 +0100
• 3497ca7675 Merge branch 'ticket/r15587-refund-paypal' into develop Michael RICOIS 2018-02-21 17:12:36 +0100
• c3b0dafacf Merge branch 'ticket/r14647-welcome-mail' into develop Michael RICOIS 2018-02-21 17:02:03 +0100
• 3644f8968e Fix link ticket/r14647-welcome-mail Michael RICOIS 2018-02-21 16:59:59 +0100
• 16dd993a97 Merge branch 'ticket/r14647-welcome-mail' into develop Michael RICOIS 2018-02-21 16:54:03 +0100
• 870b8ab4d5 Change invite link Michael RICOIS 2018-02-21 16:53:15 +0100
• 7163d60447 Detect if is a full refund Michael RICOIS 2018-02-21 16:42:43 +0100
• af4f1270c8 Merge branch 'ticket/r15587-refund-paypal' Michael RICOIS 2018-02-21 14:54:23 +0100
• 2c9155bc00 Merge branch 'ticket/r15587-refund-paypal' into develop Michael RICOIS 2018-02-21 14:53:45 +0100
• 8c24fe9fc6 Display items refund Michael RICOIS 2018-02-21 14:53:13 +0100
• f82639ca09 Save refund message and transaction for shipping cost Michael RICOIS 2018-02-21 13:04:53 +0100
• 718dd61be2 Change libs path Michael RICOIS 2018-02-21 12:07:47 +0100
• 0a4e6cf6ec Organize libs Michael RICOIS 2018-02-21 12:07:18 +0100
• 34521b21ec CS Michael RICOIS 2018-02-21 11:22:52 +0100
• 395aa0cd8a Merge remote-tracking branch 'origin/ticket/r15587-refund-paypal' Michael RICOIS 2018-02-21 09:43:41 +0100
• 0336529ca5 Add model Michael RICOIS 2018-02-21 09:35:02 +0100
• 8ce16dae63 Remove old skinstatic_old Michael RICOIS 2018-02-20 17:00:14 +0100
• 34c1132f0d Merge branch 'ticket-14739-PackLogistic' into develop Michael RICOIS 2018-02-20 15:53:44 +0100
• 2a1c162040 Reload ajax page after submit Michael RICOIS 2018-02-20 15:46:42 +0100
• f7a4656e9d Update libs multiselect Michael RICOIS 2018-02-20 14:41:46 +0100
• 4a548ef2a7 SQL Michael RICOIS 2018-02-20 12:03:55 +0100
• 525e221e17 Start redraw skinstatic module Michael RICOIS 2018-02-20 12:02:19 +0100
• eba305a933 Merge branch 'ticket-14436-excel-format' David 2018-02-20 12:00:35 +0100
• 9fdbcb6eb1 Merge branch 'ticket-14436-excel-format' into develop David 2018-02-20 11:59:42 +0100
• 0c1e1a7b21 git export management ticket-14436-excel-format David 2018-02-20 11:46:34 +0100
• 7f8f72089a Merge branch 'ticket-14436-excel-format' David 2018-02-20 11:34:20 +0100
• 2df3466462 Merge branch 'ticket-15629-new-landing' into develop David 2018-02-20 11:10:57 +0100
• d89616320f Removed useless link David 2018-02-20 11:09:45 +0100
• 89bc626e0c Merge branch 'ticket-15629-new-landing' into develop David 2018-02-20 11:01:43 +0100
• 9e706f18d4 Image integration David 2018-02-20 10:42:38 +0100
• 33753fc289 Allow now the combo between invite / sponsor email in landingpage module Fix on desktop David 2018-02-19 20:02:23 +0100
• 2df6c80619 Removed dead code David 2018-02-19 11:54:31 +0100
• 8ba1eee6bb Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop Michael RICOIS 2018-02-19 11:53:42 +0100
• 538292d158 Merge branch 'ticket-14739-PackLogistic' into develop Michael RICOIS 2018-02-19 11:53:24 +0100
• 9e3eb8d991 Merge branch 'ticket-15629-new-landing' into develop David 2018-02-19 11:16:48 +0100
• b4894392cd Remaining png extensions in the code have been removed David 2018-02-19 10:57:58 +0100
• 013e705e94 Use date_add Michael RICOIS 2018-02-16 16:32:15 +0100
• 674d095cf0 Added file field in admin form Finished page integration David 2018-02-16 15:52:35 +0100
• 713c316914 Merge remote-tracking branch 'origin/ticket/r16108-test-sponsor' Michael RICOIS 2018-02-15 11:31:23 +0100
• 3b2bbeed4c Merge remote-tracking branch 'origin/ticket/r15225-redirect-mobile' Michael RICOIS 2018-02-15 11:31:00 +0100
• e992d084da Merge branch 'ticket/r15225-redirect-mobile' into develop Michael RICOIS 2018-02-15 11:28:02 +0100
• 44e2c88319 rawurlencode ticket/r15225-redirect-mobile Michael RICOIS 2018-02-15 11:27:33 +0100
• 300fd94cf4 Merge branch 'ticket/r14647-welcome-mail' into develop Michael RICOIS 2018-02-15 10:35:27 +0100
• ad9ad9d1f1 Update Itunes link Michael RICOIS 2018-02-15 10:34:47 +0100
• 12a9b24cad Invert link app store Michael RICOIS 2018-02-15 10:25:29 +0100
• d6107bf198 Remove <br> Michael RICOIS 2018-02-15 10:13:22 +0100