[Dolibarr-git] [Dolibarr/dolibarr] d32fd7: FIX javascript xss injection and a translation

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d32fd7aa116ee016c6a1bda7979d3f396151013c
      
https://github.com/Dolibarr/dolibarr/commit/d32fd7aa116ee016c6a1bda7979d3f396151013c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M htdocs/install/mysql/data/llx_c_payment_term.sql
    M htdocs/langs/en_US/bills.lang
    M htdocs/main.inc.php
    M test/phpunit/CoreTest.php

  Log Message:
  -----------
  FIX javascript xss injection and a translation


  Commit: 2c4c48ad6fc0f78afb59ebc2d42ae00daf85f663
      
https://github.com/Dolibarr/dolibarr/commit/2c4c48ad6fc0f78afb59ebc2d42ae00daf85f663
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/smtps.class.php
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Better fix to add server name into email id.


  Commit: 8f3ce46c50851851f0afcbe682b2d6a8ed47873f
      
https://github.com/Dolibarr/dolibarr/commit/8f3ce46c50851851f0afcbe682b2d6a8ed47873f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/smtps.class.php
    M htdocs/core/lib/functions.lib.php

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


  Commit: 7fdd6ccbd2fb9185e44411f9f02c5a1a3fc7a208
      
https://github.com/Dolibarr/dolibarr/commit/7fdd6ccbd2fb9185e44411f9f02c5a1a3fc7a208
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Prepare 4.0.3


  Commit: 534e2b12825768a12f8e8f6c3b30a6334b640760
      
https://github.com/Dolibarr/dolibarr/commit/534e2b12825768a12f8e8f6c3b30a6334b640760
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M build/debian/conf.php.install
    M htdocs/admin/system/constall.php
    M htdocs/admin/system/dolibarr.php
    M htdocs/comm/mailing/card.php
    M htdocs/conf/conf.php.example
    M htdocs/filefunc.inc.php
    M htdocs/langs/en_US/mails.lang
    M htdocs/master.inc.php
    M scripts/emailings/mailing-send.php

  Log Message:
  -----------
  FIX Security to restrict email sending was not efficient


  Commit: 929904041d5994763ae92e2bc9156b198c018ea5
      
https://github.com/Dolibarr/dolibarr/commit/929904041d5994763ae92e2bc9156b198c018ea5
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M build/debian/conf.php.install
    M htdocs/admin/system/constall.php
    M htdocs/admin/system/dolibarr.php
    M htdocs/comm/mailing/card.php
    M htdocs/conf/conf.php.example
    M htdocs/filefunc.inc.php
    M htdocs/langs/en_US/mails.lang
    M htdocs/master.inc.php
    M scripts/emailings/mailing-send.php

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

Conflicts:
        htdocs/conf/conf.php.example
        htdocs/langs/en_US/mails.lang


  Commit: c750ba8b997924563f32ececc28e1082bed21921
      
https://github.com/Dolibarr/dolibarr/commit/c750ba8b997924563f32ececc28e1082bed21921
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M build/debian/conf.php.install
    M htdocs/admin/system/constall.php
    M htdocs/admin/system/dolibarr.php
    M htdocs/comm/mailing/card.php
    M htdocs/conf/conf.php.example
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/smtps.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/filefunc.inc.php
    M htdocs/install/mysql/data/llx_c_payment_term.sql
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/main.inc.php
    M htdocs/master.inc.php
    M scripts/emailings/mailing-send.php
    M test/phpunit/CoreTest.php

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

Conflicts:
        htdocs/filefunc.inc.php
        htdocs/install/mysql/data/llx_c_payment_term.sql
        htdocs/langs/en_US/bills.lang
        htdocs/langs/en_US/mails.lang


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c9ce95550577...c750ba8b9979