dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 969930: Qual: smtps is not really an


From: Herve Prot
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 969930: Qual: smtps is not really an external project but ...
Date: Sat, 27 Aug 2011 03:03:26 -0700

  Branch: refs/heads/3.2-alpha
  Home:   https://github.com/Dolibarr/dolibarr

  Commit: 96993091d74fc5377677c7b2968d93a662610f2a
      
https://github.com/Dolibarr/dolibarr/commit/96993091d74fc5377677c7b2968d93a662610f2a
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-08-26 (Fri, 26 Aug 2011)

  Changed paths:
    M htdocs/core/class/smtps.php

  Log Message:
  -----------
  Qual: smtps is not really an external project but now a specific dolibarr 
class file, so i moved it into core/class


  Commit: 2d94bbae85ab3202a161294cea5ff8a0afb22df8
      
https://github.com/Dolibarr/dolibarr/commit/2d94bbae85ab3202a161294cea5ff8a0afb22df8
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-08-26 (Fri, 26 Aug 2011)

  Changed paths:
    M htdocs/core/class/smtps.php

  Log Message:
  -----------
  Qual: smtps is not really an external project but now a specific dolibarr 
class file, so i moved it into core/class


  Commit: 3b30c2c4be2bc7ad7f8877f258e70e42d047827c
      
https://github.com/Dolibarr/dolibarr/commit/3b30c2c4be2bc7ad7f8877f258e70e42d047827c
  Author: Herve Prot <address@hidden>
  Date:   2011-08-26 (Fri, 26 Aug 2011)

  Changed paths:
    M htdocs/compta/facture.php
  M htdocs/compta/facture/fiche-rec.php
  M htdocs/theme/yellow/style.css.php

  Log Message:
  -----------
  Resolve merge error


  Commit: 4ff832ec2550a12c561a7c7b9a031076f5ca2323
      
https://github.com/Dolibarr/dolibarr/commit/4ff832ec2550a12c561a7c7b9a031076f5ca2323
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-08-26 (Fri, 26 Aug 2011)

  Changed paths:
    M COPYRIGHT
  M htdocs/admin/external_rss.php
  M htdocs/contact/vcard.php
  M htdocs/core/class/rssparser.class.php
  A htdocs/core/class/smtps.php
  A htdocs/core/class/vcard.class.php
  R htdocs/includes/smtps/README
  R htdocs/includes/smtps/SMTPs.php
  R htdocs/includes/vcard/README
  R htdocs/includes/vcard/vcard.class.php
  M htdocs/langs/ca_ES/admin.lang
  M htdocs/langs/en_US/admin.lang
  M htdocs/langs/en_US/boxes.lang
  M htdocs/langs/en_US/errors.lang
  M htdocs/langs/es_ES/admin.lang
  M htdocs/langs/fr_FR/admin.lang
  M htdocs/langs/fr_FR/errors.lang
  M htdocs/langs/ru_RU/boxes.lang
  M htdocs/lib/CMailFile.class.php
  M htdocs/lib/files.lib.php

  Log Message:
  -----------
  Qual: vcard is not really an external project but now a specific dolibarr 
class file, so i moved it into core/class


  Commit: f40a474002f4e474d52690e6642f592f5deac5ad
      
https://github.com/Dolibarr/dolibarr/commit/f40a474002f4e474d52690e6642f592f5deac5ad
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-08-26 (Fri, 26 Aug 2011)

  Changed paths:
    M COPYRIGHT
  M htdocs/core/class/smtps.php

  Log Message:
  -----------
  Qual: vcard is not really an external project but now a specific dolibarr 
class file, so i moved it into core/class


  Commit: ba7d36b12f5154a1ade59c31bfd90b61823d89de
      
https://github.com/Dolibarr/dolibarr/commit/ba7d36b12f5154a1ade59c31bfd90b61823d89de
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-08-26 (Fri, 26 Aug 2011)

  Changed paths:
    M COPYRIGHT
  M htdocs/core/class/smtps.php

  Log Message:
  -----------
  Qual: vcard is not really an external project but now a specific dolibarr 
class file, so i moved it into core/class


  Commit: 6bf85f42a05ffd54a85c045d9a6296727250cea8
      
https://github.com/Dolibarr/dolibarr/commit/6bf85f42a05ffd54a85c045d9a6296727250cea8
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-08-26 (Fri, 26 Aug 2011)

  Changed paths:
    M COPYRIGHT

  Log Message:
  -----------
  Qual: vcard is not really an external project but now a specific dolibarr 
class file, so i moved it into core/class


  Commit: 7fb0b2850abac25d1e1f5052750bbf7e6571b9c3
      
https://github.com/Dolibarr/dolibarr/commit/7fb0b2850abac25d1e1f5052750bbf7e6571b9c3
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-08-26 (Fri, 26 Aug 2011)

  Changed paths:
    M COPYRIGHT

  Log Message:
  -----------
  Qual: vcard is not really an external project but now a specific dolibarr 
class file, so i moved it into core/class


  Commit: 416f4696c7e094837ceafc82b164355ddfb05ae2
      
https://github.com/Dolibarr/dolibarr/commit/416f4696c7e094837ceafc82b164355ddfb05ae2
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-08-26 (Fri, 26 Aug 2011)

  Changed paths:
    M COPYRIGHT

  Log Message:
  -----------
  Qual: vcard is not really an external project but now a specific dolibarr 
class file, so i moved it into core/class


  Commit: a8361cdee997978dc992abf8e1bef13fea5f13dc
      
https://github.com/Dolibarr/dolibarr/commit/a8361cdee997978dc992abf8e1bef13fea5f13dc
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-08-26 (Fri, 26 Aug 2011)

  Changed paths:
    M htdocs/cashdesk/admin/cashdesk.php

  Log Message:
  -----------
  Show option for service only if module service is on


  Commit: d67f2feb7fabc548469fdfce58ac34e61b6fe11d
      
https://github.com/Dolibarr/dolibarr/commit/d67f2feb7fabc548469fdfce58ac34e61b6fe11d
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-08-26 (Fri, 26 Aug 2011)

  Changed paths:
    M htdocs/cashdesk/admin/cashdesk.php

  Log Message:
  -----------
  Show option for service only if module service is on


  Commit: 2859facdb850945fc112a1a1aefb5c19cb940f9f
      
https://github.com/Dolibarr/dolibarr/commit/2859facdb850945fc112a1a1aefb5c19cb940f9f
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-08-26 (Fri, 26 Aug 2011)

  Changed paths:
    M COPYRIGHT
  M build/deb/control.debian
  M build/deb/control.debianbin
  M htdocs/admin/external_rss.php
  M htdocs/admin/societe.php
  A htdocs/cache.manifest
  M htdocs/cashdesk/admin/cashdesk.php
  M htdocs/cashdesk/facturation.php
  M htdocs/cashdesk/tpl/facturation1.tpl.php
  M htdocs/contact/vcard.php
  M htdocs/core/class/rssparser.class.php
  A htdocs/core/class/smtps.php
  A htdocs/core/class/vcard.class.php
  R htdocs/includes/modules/societe/mod_codecompta_digitaria.php
  R htdocs/includes/smtps/README
  R htdocs/includes/smtps/SMTPs.php
  R htdocs/includes/vcard/README
  R htdocs/includes/vcard/vcard.class.php
  M htdocs/langs/ca_ES/admin.lang
  M htdocs/langs/ca_ES/cashdesk.lang
  M htdocs/langs/en_US/admin.lang
  M htdocs/langs/en_US/boxes.lang
  M htdocs/langs/en_US/cashdesk.lang
  M htdocs/langs/en_US/errors.lang
  M htdocs/langs/es_ES/admin.lang
  M htdocs/langs/es_ES/cashdesk.lang
  M htdocs/langs/fr_FR/admin.lang
  M htdocs/langs/fr_FR/cashdesk.lang
  M htdocs/langs/fr_FR/errors.lang
  M htdocs/langs/ru_RU/boxes.lang
  M htdocs/lib/CMailFile.class.php
  M htdocs/lib/files.lib.php
  M htdocs/main.inc.php
  M htdocs/theme/bureau2crea/style.css.php

  Log Message:
  -----------
  cvsimport


  Commit: bde543a2d27393729d51821ed69b4b7d6ac6cc5d
      
https://github.com/Dolibarr/dolibarr/commit/bde543a2d27393729d51821ed69b4b7d6ac6cc5d
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-08-26 (Fri, 26 Aug 2011)

  Log Message:
  -----------
  Show option for service only if module service is on


  Commit: b7f7be9d7b17e938deb0e8ba1ed9fb0536eb8913
      
https://github.com/Dolibarr/dolibarr/commit/b7f7be9d7b17e938deb0e8ba1ed9fb0536eb8913
  Author: Regis Houssin <address@hidden>
  Date:   2011-08-26 (Fri, 26 Aug 2011)

  Log Message:
  -----------
  cvsimport


  Commit: 590f0039eb6b089b9ac2b849c95fda94eee31630
      
https://github.com/Dolibarr/dolibarr/commit/590f0039eb6b089b9ac2b849c95fda94eee31630
  Author: Regis Houssin <address@hidden>
  Date:   2011-08-26 (Fri, 26 Aug 2011)

  Log Message:
  -----------
  cvsimport


  Commit: eb8269484c710198259d46250b55b4a12dcd7757
      
https://github.com/Dolibarr/dolibarr/commit/eb8269484c710198259d46250b55b4a12dcd7757
  Author: Herve Prot <address@hidden>
  Date:   2011-08-27 (Sat, 27 Aug 2011)

  Changed paths:
    M COPYRIGHT
  M build/deb/control.debian
  M build/deb/control.debianbin
  M htdocs/admin/external_rss.php
  M htdocs/admin/societe.php
  A htdocs/cache.manifest
  M htdocs/cashdesk/admin/cashdesk.php
  M htdocs/cashdesk/facturation.php
  M htdocs/cashdesk/tpl/facturation1.tpl.php
  M htdocs/contact/vcard.php
  M htdocs/core/class/rssparser.class.php
  A htdocs/core/class/smtps.php
  A htdocs/core/class/vcard.class.php
  R htdocs/includes/modules/societe/mod_codecompta_digitaria.php
  R htdocs/includes/smtps/README
  R htdocs/includes/smtps/SMTPs.php
  R htdocs/includes/vcard/README
  R htdocs/includes/vcard/vcard.class.php
  M htdocs/langs/ca_ES/admin.lang
  M htdocs/langs/ca_ES/cashdesk.lang
  M htdocs/langs/en_US/admin.lang
  M htdocs/langs/en_US/boxes.lang
  M htdocs/langs/en_US/cashdesk.lang
  M htdocs/langs/en_US/errors.lang
  M htdocs/langs/es_ES/admin.lang
  M htdocs/langs/es_ES/cashdesk.lang
  M htdocs/langs/fr_FR/admin.lang
  M htdocs/langs/fr_FR/cashdesk.lang
  M htdocs/langs/fr_FR/errors.lang
  M htdocs/langs/ru_RU/boxes.lang
  M htdocs/lib/CMailFile.class.php
  M htdocs/lib/files.lib.php
  M htdocs/main.inc.php
  M htdocs/theme/bureau2crea/style.css.php

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


Compare: https://github.com/Dolibarr/dolibarr/compare/3cecdc3...eb82694



reply via email to

[Prev in Thread] Current Thread [Next in Thread]