[Dolibarr-git] [Dolibarr/dolibarr] 329c0b: Fix: Missing include files.lib.php in some pages t...

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 329c0b29131a8ee10d044c97e534620aebcca378
      
https://github.com/Dolibarr/dolibarr/commit/329c0b29131a8ee10d044c97e534620aebcca378
  Author: Florian HENRY <address@hidden>
  Date:   2014-08-13 (Wed, 13 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/fiche.php
    M htdocs/admin/tools/update.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/product/class/product.class.php
    M htdocs/projet/class/task.class.php

  Log Message:
  -----------
  Fix: Missing include files.lib.php in some pages ti use
dol_delete_recursive


  Commit: 230dd3d4eb4a00ecb8014c9bb0d732cc1ef9721f
      
https://github.com/Dolibarr/dolibarr/commit/230dd3d4eb4a00ecb8014c9bb0d732cc1ef9721f
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-13 (Wed, 13 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/fiche.php
    M htdocs/admin/tools/update.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/product/class/product.class.php
    M htdocs/projet/class/task.class.php

  Log Message:
  -----------
  Merge pull request #1824 from FHenry/3.5

Fix: Missing include files.lib.php in some pages to use dol_delete_recursive


  Commit: 387c12322966a28218e56679263a5fa9d2eab68b
      
https://github.com/Dolibarr/dolibarr/commit/387c12322966a28218e56679263a5fa9d2eab68b
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M htdocs/theme/eldy/graph-color.php

  Log Message:
  -----------
  Fix: List of colors was too low.


  Commit: 91900f54c2611c03e864a9c0572b08bc4621a3fa
      
https://github.com/Dolibarr/dolibarr/commit/91900f54c2611c03e864a9c0572b08bc4621a3fa
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/fiche.php
    M htdocs/admin/tools/update.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/product/class/product.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/theme/eldy/style.css.php

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


  Commit: d4a0c122bee431b9ca4dae85163beb4625ce2d8e
      
https://github.com/Dolibarr/dolibarr/commit/d4a0c122bee431b9ca4dae85163beb4625ce2d8e
  Author: Regis Houssin <address@hidden>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

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

  Log Message:
  -----------
  Fix: add global object to test condition with an object


  Commit: 6b6b3725791ab72ba4ff58b0ea16bcfea4d08a0d
      
https://github.com/Dolibarr/dolibarr/commit/6b6b3725791ab72ba4ff58b0ea16bcfea4d08a0d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/fiche.php
    M htdocs/admin/tools/update.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/product/class/product.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/theme/eldy/graph-color.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
        htdocs/theme/eldy/graph-color.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a8668aee1195...6b6b3725791a