[Dolibarr-git] [Dolibarr/dolibarr] b85ed3: FIX: mail presend: can overwrite a file previously...

[Laurent Destailleur]

  Branch: refs/heads/8.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b85ed3e0b7aaff32ca892235b293cbbfb8c7ad89
      
https://github.com/Dolibarr/dolibarr/commit/b85ed3e0b7aaff32ca892235b293cbbfb8c7ad89
  Author: ATM-Marc <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/core/actions_sendmails.inc.php

  Log Message:
  -----------
  FIX: mail presend: can overwrite a file previously uploaded


  Commit: ba88d89ff5d594ef978450af14bb58748890277d
      
https://github.com/Dolibarr/dolibarr/commit/ba88d89ff5d594ef978450af14bb58748890277d
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-18 (Sat, 18 May 2019)

  Changed paths:
    M htdocs/core/actions_sendmails.inc.php

  Log Message:
  -----------
  Merge pull request #11195 from ATM-Marc/FIX_7.0_presend_file_overwrite

FIX: mail presend: can overwrite a file previously uploaded (Issue #11056)


  Commit: 1d980342ec6929516e0ab977477969cd181de22f
      
https://github.com/Dolibarr/dolibarr/commit/1d980342ec6929516e0ab977477969cd181de22f
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  Fix #8344


  Commit: 234ad4c76ae75ae0cd36289be6de7c09dd498a59
      
https://github.com/Dolibarr/dolibarr/commit/234ad4c76ae75ae0cd36289be6de7c09dd498a59
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  Merge pull request #11214 from atm-maxime/7.0

Fix #8344


  Commit: 7738787729c085149267fcd6a3d2b615d4647cb3
      
https://github.com/Dolibarr/dolibarr/commit/7738787729c085149267fcd6a3d2b615d4647cb3
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0

Conflicts:
        htdocs/core/actions_sendmails.inc.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/0f3ae6dc39ea...7738787729c0