[Dolibarr-git] [Dolibarr/dolibarr] 3e39cd: Fix: avoid to include not desired directory

[Laurent Destailleur]

  Branch: refs/heads/3.4_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 3e39cd279daef5bdf5e387f5b4248bb1b54b95be
      
https://github.com/Dolibarr/dolibarr/commit/3e39cd279daef5bdf5e387f5b4248bb1b54b95be
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-12-28 (Sat, 28 Dec 2013)

  Changed paths:
    M build/exe/doliwamp/doliwamp.iss

  Log Message:
  -----------
  Fix: avoid to include not desired directory


  Commit: a59a0151fbad9b569fa6cabc5aef8723a80e88eb
      
https://github.com/Dolibarr/dolibarr/commit/a59a0151fbad9b569fa6cabc5aef8723a80e88eb
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-12-30 (Mon, 30 Dec 2013)

  Changed paths:
    M dev/dolibarr_changes.txt
    M htdocs/includes/jquery/plugins/jcrop/index.html

  Log Message:
  -----------
  Fix: Removed analytics tags


  Commit: f0bda47d9619753f71e63b5eafdc4f46c0abcd55
      
https://github.com/Dolibarr/dolibarr/commit/f0bda47d9619753f71e63b5eafdc4f46c0abcd55
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-12-30 (Mon, 30 Dec 2013)

  Changed paths:
    M dev/dolibarr_changes.txt
    M htdocs/includes/jquery/plugins/jcrop/index.html

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.4


  Commit: 13eff7d629a3aee38188a6fa5069284da57810ac
      
https://github.com/Dolibarr/dolibarr/commit/13eff7d629a3aee38188a6fa5069284da57810ac
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-12-31 (Tue, 31 Dec 2013)

  Changed paths:
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  More prerequisites to check to run makepack-dolibarr to build debian
package (check on dpatch too).


  Commit: 50df4e1ff1aaff3bf42ff909eb46544306ba7bd8
      
https://github.com/Dolibarr/dolibarr/commit/50df4e1ff1aaff3bf42ff909eb46544306ba7bd8
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-12-31 (Tue, 31 Dec 2013)

  Changed paths:
    M build/README
    M build/exe/doliwamp/doliwamp.iss

  Log Message:
  -----------
  Fix: Update doc and packager for doliwamp

Conflicts:
        build/exe/doliwamp/doliwamp.iss

Conflicts:
        build/exe/doliwamp/doliwamp.iss


  Commit: 7fc052ce197ce5f774d27fdf50ae3ebb9e30ad97
      
https://github.com/Dolibarr/dolibarr/commit/7fc052ce197ce5f774d27fdf50ae3ebb9e30ad97
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-12-31 (Tue, 31 Dec 2013)

  Changed paths:
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  More prerequisites to check to run makepack-dolibarr to build debian
package (check on dpatch too).


  Commit: 0e54780377fe6a06b69330d167551ec267001de1
      
https://github.com/Dolibarr/dolibarr/commit/0e54780377fe6a06b69330d167551ec267001de1
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-12-31 (Tue, 31 Dec 2013)

  Changed paths:
    M ChangeLog
    M build/README
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Fix: Update doc and packager for doliwamp

Conflicts:
        build/exe/doliwamp/doliwamp.iss

Conflicts:
        build/exe/doliwamp/doliwamp.iss

Conflicts:
        build/exe/doliwamp/doliwamp.iss


  Commit: b1ea05e0d14e188e85fd8503124540d1d6db9d30
      
https://github.com/Dolibarr/dolibarr/commit/b1ea05e0d14e188e85fd8503124540d1d6db9d30
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-12-31 (Tue, 31 Dec 2013)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    R htdocs/filefunc.inc.php
    A htdocs/filefunc.inc.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
        ChangeLog
        build/debian/changelog
        build/exe/doliwamp/doliwamp.iss
        build/makepack-dolibarr.pl
        build/pad/pad_dolibarr.xml
        build/pad/pad_doliwamp.xml
        build/rpm/dolibarr_fedora.spec
        build/rpm/dolibarr_generic.spec
        build/rpm/dolibarr_mandriva.spec
        build/rpm/dolibarr_opensuse.spec
        htdocs/filefunc.inc.php


  Commit: 808abb6b4ee4fcd0306850c53880b8da3cb1c137
      
https://github.com/Dolibarr/dolibarr/commit/808abb6b4ee4fcd0306850c53880b8da3cb1c137
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-12-31 (Tue, 31 Dec 2013)

  Changed paths:
    M build/debian/changelog

  Log Message:
  -----------
  Restore correct date


  Commit: 76f890b72f49432411b7b56bfff6a5f674608534
      
https://github.com/Dolibarr/dolibarr/commit/76f890b72f49432411b7b56bfff6a5f674608534
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-01-02 (Thu, 02 Jan 2014)

  Changed paths:
    M htdocs/core/modules/member/doc/pdf_standard.class.php
    M htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
    M htdocs/core/modules/printsheet/modules_labels.php

  Log Message:
  -----------
  Fix: Call Image on this instead of pdf.
Fix: Missing parameter for photo.

Conflicts:
        htdocs/core/modules/member/doc/pdf_standard.class.php
        htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php


  Commit: 4a4084e0962cac4d4178949785075951433ecfc9
      
https://github.com/Dolibarr/dolibarr/commit/4a4084e0962cac4d4178949785075951433ecfc9
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-01-02 (Thu, 02 Jan 2014)

  Changed paths:
    M htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php

  Log Message:
  -----------
  Fix: doxygen


  Commit: c64234a5bfd4ec7902ac7f2d2bb113e7e1e19a6c
      
https://github.com/Dolibarr/dolibarr/commit/c64234a5bfd4ec7902ac7f2d2bb113e7e1e19a6c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-01-02 (Thu, 02 Jan 2014)

  Changed paths:
    M ChangeLog
    M build/README
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M dev/dolibarr_changes.txt
    M htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
    M htdocs/includes/jquery/plugins/jcrop/index.html

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into 3.4_backported


Compare: 
https://github.com/Dolibarr/dolibarr/compare/368825e9adfc...c64234a5bfd4