[Dolibarr-git] [Dolibarr/dolibarr] 2b966e: Doc

[Laurent Destailleur]

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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Doc


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

  Changed paths:
    M build/makepack-dolibarr.pl
    M htdocs/includes/stripe/build.php
    M htdocs/modulebuilder/template/.gitattributes
    R htdocs/modulebuilder/template/dev/dolistore/README.md
    R htdocs/modulebuilder/template/dev/dolistore/keywords-de.txt
    R htdocs/modulebuilder/template/dev/dolistore/keywords-en.txt
    R htdocs/modulebuilder/template/dev/dolistore/keywords-es.txt
    R htdocs/modulebuilder/template/dev/dolistore/keywords-fr.txt
    R htdocs/modulebuilder/template/dev/dolistore/keywords-it.txt
    R htdocs/modulebuilder/template/dev/dolistore/long_desc-de.html
    R htdocs/modulebuilder/template/dev/dolistore/long_desc-en.html
    R htdocs/modulebuilder/template/dev/dolistore/long_desc-es.html
    R htdocs/modulebuilder/template/dev/dolistore/long_desc-fr.html
    R htdocs/modulebuilder/template/dev/dolistore/long_desc-it.html
    R htdocs/modulebuilder/template/dev/dolistore/name-de.txt
    R htdocs/modulebuilder/template/dev/dolistore/name-en.txt
    R htdocs/modulebuilder/template/dev/dolistore/name-es.txt
    R htdocs/modulebuilder/template/dev/dolistore/name-fr.txt
    R htdocs/modulebuilder/template/dev/dolistore/name-it.txt
    R htdocs/modulebuilder/template/dev/dolistore/short_desc-de.html
    R htdocs/modulebuilder/template/dev/dolistore/short_desc-en.html
    R htdocs/modulebuilder/template/dev/dolistore/short_desc-es.html
    R htdocs/modulebuilder/template/dev/dolistore/short_desc-fr.html
    R htdocs/modulebuilder/template/dev/dolistore/short_desc-it.html
    M htdocs/modulebuilder/template/dev/git-hooks/post-commit
    M htdocs/modulebuilder/template/dev/git-hooks/pre-commit
    M htdocs/modulebuilder/template/dev/git-hooks/pre-push
    R htdocs/modulebuilder/template/dev/newmodule.sh
    M htdocs/modulebuilder/template/scripts/myobject.php

  Log Message:
  -----------
  Clean packager


  Commit: a6879775bb787b34a38f055ae97c1c2eec382045
      
https://github.com/Dolibarr/dolibarr/commit/a6879775bb787b34a38f055ae97c1c2eec382045
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-01 (Wed, 01 Nov 2017)

  Changed paths:
    M htdocs/admin/translation.php

  Log Message:
  -----------
  FIX Search into language is ok for file into external modules two.


  Commit: 91fbb4da416f774bab4df40e21eac419311d30ca
      
https://github.com/Dolibarr/dolibarr/commit/91fbb4da416f774bab4df40e21eac419311d30ca
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-01 (Wed, 01 Nov 2017)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix changelog


  Commit: 192dc43b876919c51be8360ea1660dd253577b50
      
https://github.com/Dolibarr/dolibarr/commit/192dc43b876919c51be8360ea1660dd253577b50
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-02 (Thu, 02 Nov 2017)

  Changed paths:
    M htdocs/api/index.php

  Log Message:
  -----------
  Fix regression


  Commit: 59df957181506c92401e7f4c986482f1c13c1eee
      
https://github.com/Dolibarr/dolibarr/commit/59df957181506c92401e7f4c986482f1c13c1eee
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-02 (Thu, 02 Nov 2017)

  Changed paths:
    M htdocs/api/index.php

  Log Message:
  -----------
  Fix return HTTP code 501 if calling a non existing api


  Commit: 47551975039d063f76a1b70fad34bd0d6916652f
      
https://github.com/Dolibarr/dolibarr/commit/47551975039d063f76a1b70fad34bd0d6916652f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-02 (Thu, 02 Nov 2017)

  Changed paths:
    M htdocs/api/index.php

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


  Commit: 5df49123241d9fac01d938f425c529529b8e9495
      
https://github.com/Dolibarr/dolibarr/commit/5df49123241d9fac01d938f425c529529b8e9495
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-02 (Thu, 02 Nov 2017)

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl
    M htdocs/api/index.php
    M htdocs/includes/stripe/build.php
    M htdocs/modulebuilder/template/.gitattributes
    R htdocs/modulebuilder/template/dev/dolistore/README.md
    R htdocs/modulebuilder/template/dev/dolistore/keywords-de.txt
    R htdocs/modulebuilder/template/dev/dolistore/keywords-en.txt
    R htdocs/modulebuilder/template/dev/dolistore/keywords-es.txt
    R htdocs/modulebuilder/template/dev/dolistore/keywords-fr.txt
    R htdocs/modulebuilder/template/dev/dolistore/keywords-it.txt
    R htdocs/modulebuilder/template/dev/dolistore/long_desc-de.html
    R htdocs/modulebuilder/template/dev/dolistore/long_desc-en.html
    R htdocs/modulebuilder/template/dev/dolistore/long_desc-es.html
    R htdocs/modulebuilder/template/dev/dolistore/long_desc-fr.html
    R htdocs/modulebuilder/template/dev/dolistore/long_desc-it.html
    R htdocs/modulebuilder/template/dev/dolistore/name-de.txt
    R htdocs/modulebuilder/template/dev/dolistore/name-en.txt
    R htdocs/modulebuilder/template/dev/dolistore/name-es.txt
    R htdocs/modulebuilder/template/dev/dolistore/name-fr.txt
    R htdocs/modulebuilder/template/dev/dolistore/name-it.txt
    R htdocs/modulebuilder/template/dev/dolistore/short_desc-de.html
    R htdocs/modulebuilder/template/dev/dolistore/short_desc-en.html
    R htdocs/modulebuilder/template/dev/dolistore/short_desc-es.html
    R htdocs/modulebuilder/template/dev/dolistore/short_desc-fr.html
    R htdocs/modulebuilder/template/dev/dolistore/short_desc-it.html
    M htdocs/modulebuilder/template/dev/git-hooks/post-commit
    M htdocs/modulebuilder/template/dev/git-hooks/pre-commit
    M htdocs/modulebuilder/template/dev/git-hooks/pre-push
    R htdocs/modulebuilder/template/dev/newmodule.sh
    M htdocs/modulebuilder/template/scripts/myobject.php

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

Conflicts:
        ChangeLog


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e184cac2c5e7...5df49123241d