[Dolibarr-git] [Dolibarr/dolibarr] fb186d: Added delay between mails in Newsletter module

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: fb186d6ef8a403b49a0bdefccc68ee1c27534180
      
https://github.com/Dolibarr/dolibarr/commit/fb186d6ef8a403b49a0bdefccc68ee1c27534180
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/mailing.php
    M htdocs/comm/mailing/card.php
    M htdocs/langs/en_US/admin.lang
    M scripts/emailings/mailing-send.php

  Log Message:
  -----------
  Added delay between mails in Newsletter module


  Commit: 449f2b934617688502cf075b8dc29deeaf820209
      
https://github.com/Dolibarr/dolibarr/commit/449f2b934617688502cf075b8dc29deeaf820209
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/mailing.php
    M htdocs/comm/mailing/card.php
    M htdocs/langs/en_US/admin.lang
    M scripts/emailings/mailing-send.php

  Log Message:
  -----------
  Merge branch 'delay-emailing' of https://github.com/marcosgdf/dolibarr
into marcosgdf-delay-emailing

Conflicts:
        htdocs/comm/mailing/card.php


  Commit: 59ef42cd52d23c5ecd988950c0e1e7a9154ec0d5
      
https://github.com/Dolibarr/dolibarr/commit/59ef42cd52d23c5ecd988950c0e1e7a9154ec0d5
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/admin/mailing.php
    M htdocs/comm/mailing/card.php
    M htdocs/langs/en_US/admin.lang
    M scripts/emailings/mailing-send.php

  Log Message:
  -----------
  Merge branch 'marcosgdf-delay-emailing' into develop


  Commit: 017a483eb3dc62efdd699d513bc99fae89e0dc40
      
https://github.com/Dolibarr/dolibarr/commit/017a483eb3dc62efdd699d513bc99fae89e0dc40
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/comm/card.php
    M htdocs/comm/propal/index.php
    M htdocs/commande/index.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/fourn/card.php
    M htdocs/fourn/index.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/projects.lang
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/da75877caad4...017a483eb3dc