[Dolibarr-git] [Dolibarr/dolibarr] e71103: task #768:

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e71103ed021b12965234731094544a11171e5624
      
https://github.com/Dolibarr/dolibarr/commit/e71103ed021b12965234731094544a11171e5624
  Author: fhenry <address@hidden>
  Date:   2013-03-16 (Sat, 16 Mar 2013)

  Changed paths:
    M htdocs/admin/fckeditor.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/modules/modFckeditor.class.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/fr_FR/admin.lang

  Log Message:
  -----------
  task #768:
https://doliforge.org/tracker/?func=detail&aid=768&group_id=144 
task #769 :
https://doliforge.org/tracker/?func=detail&aid=769&group_id=144


  Commit: 1f5ebb594a0ef9fa00f8b613b7fd6fc791813819
      
https://github.com/Dolibarr/dolibarr/commit/1f5ebb594a0ef9fa00f8b613b7fd6fc791813819
  Author: fhenry <address@hidden>
  Date:   2013-03-16 (Sat, 16 Mar 2013)

  Changed paths:
    M htdocs/user/class/user.class.php
    M htdocs/user/fiche.php

  Log Message:
  -----------
  [ task #769 ] WYSIWYG for user signature


  Commit: 98cc7b7a2b5d565c83e52da10720760f1477ff81
      
https://github.com/Dolibarr/dolibarr/commit/98cc7b7a2b5d565c83e52da10720760f1477ff81
  Author: fhenry <address@hidden>
  Date:   2013-03-16 (Sat, 16 Mar 2013)

  Changed paths:
    M COPYRIGHT
    M htdocs/adherents/admin/adherent.php
    M htdocs/adherents/cartes/carte.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/fiche.php
    M htdocs/admin/ldap_members.php
    M htdocs/compta/facture.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/empty.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    R htdocs/includes/phpmailer/LICENSE
    R htdocs/includes/phpmailer/README
    R htdocs/includes/phpmailer/changelog.txt
    R htdocs/includes/phpmailer/class.phpmailer.php
    R htdocs/includes/phpmailer/class.pop3.php
    R htdocs/includes/phpmailer/class.smtp.php
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/tables/llx_adherent.sql
    M htdocs/public/members/new.php
    M htdocs/public/members/public_card.php
    M htdocs/public/members/public_list.php
    M scripts/members/sync_members_ldap2dolibarr.php
    M test/phpunit/AdherentTest.php

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


  Commit: cf21b32eb1e953448341a4696f27bf8f46f57545
      
https://github.com/Dolibarr/dolibarr/commit/cf21b32eb1e953448341a4696f27bf8f46f57545
  Author: fhenry <address@hidden>
  Date:   2013-03-16 (Sat, 16 Mar 2013)

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

  Log Message:
  -----------
  task #768


  Commit: 07bc0cd09e314a2c4866ba7b629670071ef1708e
      
https://github.com/Dolibarr/dolibarr/commit/07bc0cd09e314a2c4866ba7b629670071ef1708e
  Author: fhenry <address@hidden>
  Date:   2013-03-16 (Sat, 16 Mar 2013)

  Changed paths:
    M htdocs/user/class/user.class.php
    M htdocs/user/fiche.php

  Log Message:
  -----------
  Taking account remark
https://github.com/FHenry/dolibarr/commit/1f5ebb594a0ef9fa00f8b613b7fd6fc791813819


  Commit: 9e46a55bbf8fb852cb197fc3498fc19d5098a114
      
https://github.com/Dolibarr/dolibarr/commit/9e46a55bbf8fb852cb197fc3498fc19d5098a114
  Author: fhenry <address@hidden>
  Date:   2013-03-17 (Sun, 17 Mar 2013)

  Changed paths:
    M htdocs/user/fiche.php

  Log Message:
  -----------
  Taking account remark on pull request


  Commit: 45a6717dd31979c08252a0b2447f6627a62d8c1f
      
https://github.com/Dolibarr/dolibarr/commit/45a6717dd31979c08252a0b2447f6627a62d8c1f
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M htdocs/admin/fckeditor.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/modules/modFckeditor.class.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/user/fiche.php

  Log Message:
  -----------
  Merge pull request #752 from FHenry/develop

task #768  &  task #769


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c6b4259735ec...45a6717dd319