[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:09:57 -0700 |
Branch: refs/heads/develop
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: 92a25e3d4c95d701b37b04e633088f133e8b424e
https://github.com/Dolibarr/dolibarr/commit/92a25e3d4c95d701b37b04e633088f133e8b424e
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-12 (Tue, 12 May 2015)
Changed paths:
M build/debian/changelog
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.7.1
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: ac99f3aa8fbc451d6d86087f655c918a8395fafb
https://github.com/Dolibarr/dolibarr/commit/ac99f3aa8fbc451d6d86087f655c918a8395fafb
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-12 (Tue, 12 May 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Update changelog
Commit: 8075a92d5bc50a8bb39e477558145b7bcef2de73
https://github.com/Dolibarr/dolibarr/commit/8075a92d5bc50a8bb39e477558145b7bcef2de73
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-12 (Tue, 12 May 2015)
Changed paths:
M htdocs/theme/amarok/img/stcomm-1.png
M htdocs/theme/auguria/img/stcomm-1.png
M htdocs/theme/cameleo/img/stcomm-1.png
M htdocs/theme/eldy/img/stcomm-1.png
Log Message:
-----------
FIX Bad logo for status "Do not contact" of thirdparty.
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: 942564be5635ee7ed247b39d80b73f93755961a0
https://github.com/Dolibarr/dolibarr/commit/942564be5635ee7ed247b39d80b73f93755961a0
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-05-12 (Tue, 12 May 2015)
Changed paths:
M htdocs/expedition/list.php
Log Message:
-----------
Fix : bad link when sorting shipment list #2823
Commit: 0bf7dd0686f0ec5fa44a6136c5e472ef0dd67391
https://github.com/Dolibarr/dolibarr/commit/0bf7dd0686f0ec5fa44a6136c5e472ef0dd67391
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-12 (Tue, 12 May 2015)
Changed paths:
M htdocs/expedition/list.php
Log Message:
-----------
Merge pull request #2824 from atm-maxime/3.7
Fix : bad link when sorting shipment list #2823
Commit: b0d73ee674748794427c86ff2bc055542a66cefd
https://github.com/Dolibarr/dolibarr/commit/b0d73ee674748794427c86ff2bc055542a66cefd
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-12 (Tue, 12 May 2015)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
FIX Bad link to login page into email for password renewal.
Commit: 1af2459d90dac4315f7dd17289198bada3043ecc
https://github.com/Dolibarr/dolibarr/commit/1af2459d90dac4315f7dd17289198bada3043ecc
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-12 (Tue, 12 May 2015)
Changed paths:
M htdocs/expedition/list.php
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: d65721bb20658b7a8fe96da86624248af40539bf
https://github.com/Dolibarr/dolibarr/commit/d65721bb20658b7a8fe96da86624248af40539bf
Author: Juanjo Menent <address@hidden>
Date: 2015-05-13 (Wed, 13 May 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Insert option to use old system storage photos only if the first
installation was done with a version < 3.7.0
Commit: 0b42940d5f8fc837ceceb3562f0dbd33d32a56a4
https://github.com/Dolibarr/dolibarr/commit/0b42940d5f8fc837ceceb3562f0dbd33d32a56a4
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-16 (Sat, 16 May 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Merge pull request #2830 from simnandez/3.7
Insert option to use old system storage photos only if the first installation
was done with a version < 3.7.0
Commit: 0e1cf72c4385fbf154b6fd694dd941a8b911d893
https://github.com/Dolibarr/dolibarr/commit/0e1cf72c4385fbf154b6fd694dd941a8b911d893
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-16 (Sat, 16 May 2015)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
Fix bad order for firstname, lasname
Commit: ad7c4a2b52657fb5c59c3b3daee99a160b48a001
https://github.com/Dolibarr/dolibarr/commit/ad7c4a2b52657fb5c59c3b3daee99a160b48a001
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-16 (Sat, 16 May 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
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: e46a8b3b54a5605032780fc174c6876d4276c800
https://github.com/Dolibarr/dolibarr/commit/e46a8b3b54a5605032780fc174c6876d4276c800
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
Log Message:
-----------
Enhance packaging
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
Commit: a11e707728b088c785c3dde6dacd37ce31a8dd75
https://github.com/Dolibarr/dolibarr/commit/a11e707728b088c785c3dde6dacd37ce31a8dd75
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-16 (Sat, 16 May 2015)
Changed paths:
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: fe3f701928cdece71be00563d186029190d24732
https://github.com/Dolibarr/dolibarr/commit/fe3f701928cdece71be00563d186029190d24732
Author: Laurent Destailleur <address@hidden>
Date: 2015-05-16 (Sat, 16 May 2015)
Changed paths:
M ChangeLog
M build/debian/changelog
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/expedition/list.php
M htdocs/filefunc.inc.php
M htdocs/theme/amarok/img/stcomm-1.png
M htdocs/theme/auguria/img/stcomm-1.png
M htdocs/theme/cameleo/img/stcomm-1.png
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
htdocs/expedition/list.php
htdocs/filefunc.inc.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/user/class/user.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/45040f89afc3...fe3f701928cd