[Dolibarr-git] [Dolibarr/dolibarr] dfae15: Fix : email message combined with html signature m...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: dfae157cc5de789c3a22f159916ff262a189594f
      
https://github.com/Dolibarr/dolibarr/commit/dfae157cc5de789c3a22f159916ff262a189594f
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M htdocs/core/class/html.formmail.class.php

  Log Message:
  -----------
  Fix : email message combined with html signature made troubles with line 
breaks


  Commit: c40e18784211e8f0890f83bf59073402d3f27e0d
      
https://github.com/Dolibarr/dolibarr/commit/c40e18784211e8f0890f83bf59073402d3f27e0d
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M htdocs/core/class/html.formmail.class.php

  Log Message:
  -----------
  Typo


  Commit: 27cfe802aa05269edbeb411240b8a4de41ac5bda
      
https://github.com/Dolibarr/dolibarr/commit/27cfe802aa05269edbeb411240b8a4de41ac5bda
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/index.php
    M htdocs/categories/photos.php
    M htdocs/categories/viewcat.php
    M htdocs/compta/facture/impayees.php
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/tpl/contacts.tpl.php
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/fr_FR/categories.lang
    M htdocs/projet/contact.php
    A htdocs/theme/amarok/img/close_title.png
    A htdocs/theme/amarok/img/grip_title.png
    A htdocs/theme/auguria/img/close_title.png
    A htdocs/theme/auguria/img/grip_title.png
    A htdocs/theme/bureau2crea/img/close_title.png
    A htdocs/theme/bureau2crea/img/grip_title.png
    A htdocs/theme/cameleo/img/close_title.png
    A htdocs/theme/cameleo/img/grip_title.png
    A htdocs/theme/eldy/img/close_title.png
    A htdocs/theme/eldy/img/grip_title.png

  Log Message:
  -----------
  Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop


  Commit: 3395df2b66f95e8391064592b6b29e93724a5fad
      
https://github.com/Dolibarr/dolibarr/commit/3395df2b66f95e8391064592b6b29e93724a5fad
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M ChangeLog
    M dev/translation/txpush.sh
    M htdocs/admin/expedition.php
    M htdocs/contrat/fiche.php
    M htdocs/contrat/liste.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/contracts.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/contracts.lang
    M htdocs/livraison/class/livraison.class.php
    M htdocs/public/emailing/mailing-unsubscribe.php
    A scripts/company/export-contacts-xls-example.php
    R scripts/company/export-contacts-xls-example.php
    R scripts/company/sync_contacts_dolibarr2ldap.php
    A scripts/company/sync_contacts_dolibarr2ldap.php
    M scripts/contracts/email_expire_services_to_customers.php
    M scripts/contracts/email_expire_services_to_representatives.php
    M scripts/invoices/email_unpaid_invoices_to_customers.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php
    R scripts/withdrawals/build_withdrawal_file.php
    A scripts/withdrawals/build_withdrawal_file.php
    M test/phpunit/ScriptsTest.php

  Log Message:
  -----------
  Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop


  Commit: 2fa10320793a628a7c818a41ef8208769f4dd83f
      
https://github.com/Dolibarr/dolibarr/commit/2fa10320793a628a7c818a41ef8208769f4dd83f
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M htdocs/core/class/html.formmail.class.php

  Log Message:
  -----------
  Merge pull request #1145 from atm-maxime/develop

Fix : email message combined with html signature made troubles with line breaks


Compare: 
https://github.com/Dolibarr/dolibarr/compare/70eef21bc83b...2fa10320793a