[Dolibarr-git] [Dolibarr/dolibarr] d808ad: FIX #7567

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d808add49905eec4fcbc07bea250e606b5a60559
      
https://github.com/Dolibarr/dolibarr/commit/d808add49905eec4fcbc07bea250e606b5a60559
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-06 (Fri, 06 Oct 2017)

  Changed paths:
    M htdocs/langs/en_US/interventions.lang
    M htdocs/projet/element.php

  Log Message:
  -----------
  FIX #7567


  Commit: 7b853d8981b22b600c1d2d1b005f4cbd9eedbfd0
      
https://github.com/Dolibarr/dolibarr/commit/7b853d8981b22b600c1d2d1b005f4cbd9eedbfd0
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-06 (Fri, 06 Oct 2017)

  Changed paths:
    M htdocs/langs/en_US/interventions.lang

  Log Message:
  -----------
  FIX #7567


  Commit: 8104c97f77144c259db137778f92878f13f10be5
      
https://github.com/Dolibarr/dolibarr/commit/8104c97f77144c259db137778f92878f13f10be5
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-07 (Sat, 07 Oct 2017)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Prepare 6.0.2


  Commit: 8513ddb9b4081279e720e1b8e872952973c93ebb
      
https://github.com/Dolibarr/dolibarr/commit/8513ddb9b4081279e720e1b8e872952973c93ebb
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2017-10-08 (Sun, 08 Oct 2017)

  Changed paths:
    M htdocs/core/modules/mailings/advthirdparties.modules.php

  Log Message:
  -----------
  Fix : missing new target type in advance target selection


  Commit: 21bb799e7beeb76a780f75aa58a2e2f8f6b5d5c5
      
https://github.com/Dolibarr/dolibarr/commit/21bb799e7beeb76a780f75aa58a2e2f8f6b5d5c5
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-08 (Sun, 08 Oct 2017)

  Changed paths:
    M htdocs/core/modules/mailings/advthirdparties.modules.php

  Log Message:
  -----------
  Merge pull request #7592 from atm-maxime/fix_advtarget

Fix : missing new target type in advance target selection


  Commit: 257fe68f1388ac31d30d96364c3ddbaded21e769
      
https://github.com/Dolibarr/dolibarr/commit/257fe68f1388ac31d30d96364c3ddbaded21e769
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-08 (Sun, 08 Oct 2017)

  Changed paths:
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Prepare 6.0.3


  Commit: ec9c3557919f0312f6f72d33400e237837204094
      
https://github.com/Dolibarr/dolibarr/commit/ec9c3557919f0312f6f72d33400e237837204094
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-08 (Sun, 08 Oct 2017)

  Changed paths:
    M htdocs/core/modules/mailings/advthirdparties.modules.php

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


  Commit: 19de053054ce0912023ec44349fb160fc2c1519c
      
https://github.com/Dolibarr/dolibarr/commit/19de053054ce0912023ec44349fb160fc2c1519c
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-09 (Mon, 09 Oct 2017)

  Changed paths:
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql

  Log Message:
  -----------
  Fix itf8 mix collation


  Commit: dce71d6e7db2fe3b06783d27e2668e332e0274f6
      
https://github.com/Dolibarr/dolibarr/commit/dce71d6e7db2fe3b06783d27e2668e332e0274f6
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-09 (Mon, 09 Oct 2017)

  Changed paths:
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php

  Log Message:
  -----------
  Fix loose filter


  Commit: 3b6f6c40274fa51fb85cad0920d6197d294792de
      
https://github.com/Dolibarr/dolibarr/commit/3b6f6c40274fa51fb85cad0920d6197d294792de
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-09 (Mon, 09 Oct 2017)

  Changed paths:
    M htdocs/langs/en_US/admin.lang

  Log Message:
  -----------
  Translation


  Commit: 0b7aa204643fc9cd59475f7720a7c965efcb4f54
      
https://github.com/Dolibarr/dolibarr/commit/0b7aa204643fc9cd59475f7720a7c965efcb4f54
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-09 (Mon, 09 Oct 2017)

  Changed paths:
    M htdocs/admin/system/dolibarr.php
    M htdocs/langs/en_US/admin.lang

  Log Message:
  -----------
  Add link to ChangeLog


  Commit: f93ecc15846523c293714cf8a476335706506298
      
https://github.com/Dolibarr/dolibarr/commit/f93ecc15846523c293714cf8a476335706506298
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/mailings/advthirdparties.modules.php
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/langs/en_US/interventions.lang
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/element.php

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

Conflicts:
        ChangeLog
        htdocs/filefunc.inc.php
        htdocs/projet/activity/perweek.php
        htdocs/projet/element.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/dd69f7621292...f93ecc158465