dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 179309: Fix: use global $object inste


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 179309: Fix: use global $object instead parameter
Date: Sat, 16 May 2015 08:01:55 -0700

  Branch: refs/heads/3.7
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 179309710cb71c927a4905a630a25a1f4ed297e4
      
https://github.com/Dolibarr/dolibarr/commit/179309710cb71c927a4905a630a25a1f4ed297e4
  Author: Regis Houssin <address@hidden>
  Date:   2015-05-06 (Wed, 06 May 2015)

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

  Log Message:
  -----------
  Fix: use global $object instead parameter


  Commit: 1b56144cb8cf5b86d0e44859efc5874612eabc64
      
https://github.com/Dolibarr/dolibarr/commit/1b56144cb8cf5b86d0e44859efc5874612eabc64
  Author: Regis Houssin <address@hidden>
  Date:   2015-05-07 (Thu, 07 May 2015)

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

  Log Message:
  -----------
  Revert "Fix: use global $object instead parameter"

This reverts commit 179309710cb71c927a4905a630a25a1f4ed297e4.


  Commit: c976d32e7d45ddebcc09d72d71df811b25d96e99
      
https://github.com/Dolibarr/dolibarr/commit/c976d32e7d45ddebcc09d72d71df811b25d96e99
  Author: Regis Houssin <address@hidden>
  Date:   2015-05-07 (Thu, 07 May 2015)

  Changed paths:
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php

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


  Commit: 9a32d7ec2f6a1735609eaf8b469774c17f4d72a8
      
https://github.com/Dolibarr/dolibarr/commit/9a32d7ec2f6a1735609eaf8b469774c17f4d72a8
  Author: Regis Houssin <address@hidden>
  Date:   2015-05-07 (Thu, 07 May 2015)

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

  Log Message:
  -----------
  Fix: add $object for use with triggers


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

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

  Log Message:
  -----------
  Merge pull request #2797 from hregis/3.6

Fix: add $object for use with triggers


  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


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

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

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


  Commit: e4aaff1de9529fc89cccf091318b883cb58f71a1
      
https://github.com/Dolibarr/dolibarr/commit/e4aaff1de9529fc89cccf091318b883cb58f71a1
  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

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

Conflicts:
        build/debian/changelog
        build/makepack-dolibarr.pl
        build/makepack-howto.txt
        build/rpm/dolibarr_fedora.spec
        build/rpm/dolibarr_generic.spec
        build/rpm/dolibarr_mandriva.spec
        build/rpm/dolibarr_opensuse.spec
        htdocs/filefunc.inc.php
        htdocs/product/class/product.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/ad7c4a2b5265...e4aaff1de952

reply via email to

[Prev in Thread] Current Thread [Next in Thread]