[Dolibarr-git] [Dolibarr/dolibarr] d79ba9: Task 157 : Add a skype button

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d79ba9695adbdffe7720579817ec2893d1310bba
      
https://github.com/Dolibarr/dolibarr/commit/d79ba9695adbdffe7720579817ec2893d1310bba
  Author: aspangaro <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/fiche.php
    M htdocs/admin/ldap_contacts.php
    M htdocs/admin/ldap_members.php
    M htdocs/admin/ldap_users.php
    M htdocs/comm/fiche.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/fiche.php
    M htdocs/contact/list.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/ldap.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    A htdocs/core/modules/modSkype.class.php
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    M htdocs/install/mysql/tables/llx_adherent.sql
    M htdocs/install/mysql/tables/llx_societe.sql
    M htdocs/install/mysql/tables/llx_socpeople.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/langs/en_US/companies.lang
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php
    A htdocs/theme/amarok/img/object_skype.png
    A htdocs/theme/auguria/img/object_skype.png
    A htdocs/theme/bureau2crea/img/object_skype.png
    A htdocs/theme/cameleo/img/object_skype.png
    A htdocs/theme/eldy/img/object_skype.png

  Log Message:
  -----------
  Task 157 : Add a skype button


  Commit: 8fd021bf36f24fd0fbe055b1d5f58d47da2dc366
      
https://github.com/Dolibarr/dolibarr/commit/8fd021bf36f24fd0fbe055b1d5f58d47da2dc366
  Author: aspangaro <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/tpl/login.tpl.php

  Log Message:
  -----------
  Merge branch 'upstream/develop'


  Commit: d64fe2b7298220877c45ea200f087e1a06c03737
      
https://github.com/Dolibarr/dolibarr/commit/d64fe2b7298220877c45ea200f087e1a06c03737
  Author: aspangaro <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/tpl/login.tpl.php

  Log Message:
  -----------
  Merge branch 'upstream/develop'


  Commit: ccea7ebd5086b333e955c6d1f8183dfe432add30
      
https://github.com/Dolibarr/dolibarr/commit/ccea7ebd5086b333e955c6d1f8183dfe432add30
  Author: aspangaro <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/actions_extrafields.inc.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    M htdocs/install/mysql/tables/llx_actioncomm_resources.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/product/document.php
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge branch 'upstream/develop'


  Commit: 76263213ab796f277f5f7a4a77773b4ec44809e3
      
https://github.com/Dolibarr/dolibarr/commit/76263213ab796f277f5f7a4a77773b4ec44809e3
  Author: aspangaro <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/actions_extrafields.inc.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    M htdocs/install/mysql/tables/llx_actioncomm_resources.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/product/document.php
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge branch 'origin/develop'


  Commit: b18e125143fac171328dfee486e3ebe67e94f02a
      
https://github.com/Dolibarr/dolibarr/commit/b18e125143fac171328dfee486e3ebe67e94f02a
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/fiche.php
    M htdocs/admin/ldap_contacts.php
    M htdocs/admin/ldap_members.php
    M htdocs/admin/ldap_users.php
    M htdocs/comm/fiche.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/fiche.php
    M htdocs/contact/list.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/ldap.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    A htdocs/core/modules/modSkype.class.php
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    M htdocs/install/mysql/tables/llx_adherent.sql
    M htdocs/install/mysql/tables/llx_societe.sql
    M htdocs/install/mysql/tables/llx_socpeople.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/langs/en_US/companies.lang
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php
    A htdocs/theme/amarok/img/object_skype.png
    A htdocs/theme/auguria/img/object_skype.png
    A htdocs/theme/bureau2crea/img/object_skype.png
    A htdocs/theme/cameleo/img/object_skype.png
    A htdocs/theme/eldy/img/object_skype.png

  Log Message:
  -----------
  Merge pull request #1279 from aspangaro/skype

Task 157 : add a Skype button


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e226fe154751...b18e125143fa