dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr/dolibarr] bd6d49: FIX advanced target emailing sql and ergonom


From: Laurent Destailleur
Subject: [Dolibarr/dolibarr] bd6d49: FIX advanced target emailing sql and ergonomy
Date: Sat, 08 Feb 2020 06:42:40 -0800

  Branch: refs/heads/11.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: bd6d49f04a5ff374f4631950443518d51cbbed66
      
https://github.com/Dolibarr/dolibarr/commit/bd6d49f04a5ff374f4631950443518d51cbbed66
  Author: atm-arnaud <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M htdocs/comm/mailing/class/advtargetemailing.class.php
    M htdocs/core/tpl/advtarget.tpl.php

  Log Message:
  -----------
  FIX advanced target emailing sql and ergonomy


  Commit: 23fc8321d5852b2d56f64523cea5d4114b3dab18
      
https://github.com/Dolibarr/dolibarr/commit/23fc8321d5852b2d56f64523cea5d4114b3dab18
  Author: ksar <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M htdocs/admin/tools/export_files.php

  Log Message:
  -----------
  FIX : Warning on admin/export_files

#13041


  Commit: 387db16217fb998449e3aad73f2ede57259d73d1
      
https://github.com/Dolibarr/dolibarr/commit/387db16217fb998449e3aad73f2ede57259d73d1
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

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

  Log Message:
  -----------
  FIX Filenames must not contains non ascii char or we will get non ascii
char into the SMTP header.

Conflicts:
        htdocs/core/class/CMailFile.class.php


  Commit: 78389e6c5dabb81db51119c79b310de226057be1
      
https://github.com/Dolibarr/dolibarr/commit/78389e6c5dabb81db51119c79b310de226057be1
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:

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


  Commit: 5fac824824a6549404e23f25d73be7d1e3adb68b
      
https://github.com/Dolibarr/dolibarr/commit/5fac824824a6549404e23f25d73be7d1e3adb68b
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-08 (Sat, 08 Feb 2020)

  Changed paths:
    M htdocs/comm/mailing/class/advtargetemailing.class.php
    M htdocs/core/tpl/advtarget.tpl.php

  Log Message:
  -----------
  Merge pull request #13040 from atm-arnaud/FIX_adv_target_emailing

FIX advanced target emailing sql and ergonomy


  Commit: 2a897ac91adee16bf6ff773feaade1e2a47a0573
      
https://github.com/Dolibarr/dolibarr/commit/2a897ac91adee16bf6ff773feaade1e2a47a0573
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-08 (Sat, 08 Feb 2020)

  Changed paths:
    M htdocs/comm/mailing/class/advtargetemailing.class.php
    M htdocs/core/tpl/advtarget.tpl.php

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


  Commit: e951743077fb435f977a8473260024b091de9517
      
https://github.com/Dolibarr/dolibarr/commit/e951743077fb435f977a8473260024b091de9517
  Author: ksar <address@hidden>
  Date:   2020-02-08 (Sat, 08 Feb 2020)

  Changed paths:
    M htdocs/admin/tools/export_files.php

  Log Message:
  -----------
  Update export_files.php

Remove Warning


  Commit: 5f5645a184d254ba4b12a91b14df364815b3ca02
      
https://github.com/Dolibarr/dolibarr/commit/5f5645a184d254ba4b12a91b14df364815b3ca02
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-08 (Sat, 08 Feb 2020)

  Changed paths:
    M htdocs/admin/tools/export_files.php

  Log Message:
  -----------
  Merge pull request #13044 from ksar-ksar/10.0

FIX : Warning on admin/export_files


  Commit: 9b9101dc2f989b13b49880f840ef20e5de02cafe
      
https://github.com/Dolibarr/dolibarr/commit/9b9101dc2f989b13b49880f840ef20e5de02cafe
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-08 (Sat, 08 Feb 2020)

  Changed paths:

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

Conflicts:
        htdocs/admin/tools/export_files.php


  Commit: df7cdd1da8197268e6f54b1cfee23c18b47605d2
      
https://github.com/Dolibarr/dolibarr/commit/df7cdd1da8197268e6f54b1cfee23c18b47605d2
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-02-08 (Sat, 08 Feb 2020)

  Changed paths:
    M htdocs/admin/tools/export_files.php
    M htdocs/comm/mailing/advtargetemailing.php
    M htdocs/comm/mailing/class/advtargetemailing.class.php
    M htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
    M htdocs/core/lib/emailing.lib.php
    M htdocs/core/tpl/advtarget.tpl.php

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

Conflicts:
        htdocs/admin/tools/export_files.php
        htdocs/comm/mailing/class/advtargetemailing.class.php
        htdocs/core/tpl/advtarget.tpl.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1a167aa5b400...df7cdd1da819



reply via email to

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