[Dolibarr-git] [Dolibarr/dolibarr] ea7eb2: Close bug #2757 Deleting product category photo gi...

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ea7eb241e36bd0f732df7466eecbeadbe10074a9
      
https://github.com/Dolibarr/dolibarr/commit/ea7eb241e36bd0f732df7466eecbeadbe10074a9
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M ChangeLog
    M htdocs/categories/photos.php

  Log Message:
  -----------
  Close bug #2757 Deleting product category photo gives "Forbidden access" error


  Commit: 190f12c4c4b962a14f633e0339b4e476c7446af4
      
https://github.com/Dolibarr/dolibarr/commit/190f12c4c4b962a14f633e0339b4e476c7446af4
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M ChangeLog
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Merge branch '3.5' into bug-2757

Conflicts:
        ChangeLog


  Commit: f8e8fe6f34829c3e585c1ed9439ee7c4aa7e1258
      
https://github.com/Dolibarr/dolibarr/commit/f8e8fe6f34829c3e585c1ed9439ee7c4aa7e1258
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M ChangeLog
    M htdocs/categories/photos.php

  Log Message:
  -----------
  Merge pull request #2816 from marcosgdf/bug-2757

Close bug #2757 Deleting product category photo gives "Forbidden access" error


  Commit: 80943111cc946c1d2da6320eb12e05c67fd1b3e9
      
https://github.com/Dolibarr/dolibarr/commit/80943111cc946c1d2da6320eb12e05c67fd1b3e9
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-16 (Sat, 16 May 2015)

  Changed paths:
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    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:
  -----------
  Prepare 3.5.7


  Commit: 1d8a3809f00261850f993ce77120f765cc42aca7
      
https://github.com/Dolibarr/dolibarr/commit/1d8a3809f00261850f993ce77120f765cc42aca7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-16 (Sat, 16 May 2015)

  Changed paths:
    M ChangeLog
    M htdocs/categories/photos.php

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


  Commit: 4dcdea5219c452e40eb99f75fa0df385c54a9d96
      
https://github.com/Dolibarr/dolibarr/commit/4dcdea5219c452e40eb99f75fa0df385c54a9d96
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-16 (Sat, 16 May 2015)

  Changed paths:
    M build/makepack-dolibarr.pl
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec

  Log Message:
  -----------
  Prepare package 3.5.7
Removed hardcoded version from rpm spec files, so it will not be
necessary to update this files when making a new release.


  Commit: e8fb89f89f2f9be2190f5b4fa8fae7c90a398dc1
      
https://github.com/Dolibarr/dolibarr/commit/e8fb89f89f2f9be2190f5b4fa8fae7c90a398dc1
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-16 (Sat, 16 May 2015)

  Changed paths:
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    M build/makepack-howto.txt

  Log Message:
  -----------
  Prepare packaging 3.7


  Commit: cabbb9e4216fc18fc833ee406c83d6b57087c8f4
      
https://github.com/Dolibarr/dolibarr/commit/cabbb9e4216fc18fc833ee406c83d6b57087c8f4
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-16 (Sat, 16 May 2015)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    M build/makepack-howto.txt
    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:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/973e2253bf01...cabbb9e4216f