[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] aaaad7: FIX : do not include disabled
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] aaaad7: FIX : do not include disabled modules tpl |
|
Date: |
Sun, 02 Jun 2019 02:49:59 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: aaaad713470a2dbada31b0a2c68052d3bfe59bad
https://github.com/Dolibarr/dolibarr/commit/aaaad713470a2dbada31b0a2c68052d3bfe59bad
Author: Christophe Battarel <address@hidden>
Date: 2019-05-24 (Fri, 24 May 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX : do not include disabled modules tpl
Commit: abc7c2f0f8deead444bc41727cc36099d517a014
https://github.com/Dolibarr/dolibarr/commit/abc7c2f0f8deead444bc41727cc36099d517a014
Author: Christophe Battarel <address@hidden>
Date: 2019-05-24 (Fri, 24 May 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
test include return on TRUE
Commit: 545cdd07623163eda45df13a92f7ef4a5a16cf9d
https://github.com/Dolibarr/dolibarr/commit/545cdd07623163eda45df13a92f7ef4a5a16cf9d
Author: Christophe Battarel <address@hidden>
Date: 2019-05-24 (Fri, 24 May 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
test include return on FALSE
Commit: 4863ddcb00bd757bac09afa0319437d28b2de28a
https://github.com/Dolibarr/dolibarr/commit/4863ddcb00bd757bac09afa0319437d28b2de28a
Author: Christophe Battarel <address@hidden>
Date: 2019-05-24 (Fri, 24 May 2019)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0
Commit: 83d883c36a9d36c4a687939e04d7686d1bada205
https://github.com/Dolibarr/dolibarr/commit/83d883c36a9d36c4a687939e04d7686d1bada205
Author: Christophe Battarel <address@hidden>
Date: 2019-05-24 (Fri, 24 May 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
finally eldy is always right
Commit: a853764f6d7226db4481e2d0cbf56b12926a518a
https://github.com/Dolibarr/dolibarr/commit/a853764f6d7226db4481e2d0cbf56b12926a518a
Author: atm-arnaud <address@hidden>
Date: 2019-05-28 (Tue, 28 May 2019)
Changed paths:
M htdocs/accountancy/admin/productaccount.php
Log Message:
-----------
FIX productaccount buylist with pages
Commit: a491de01b3a138a77afd985922f4e1efd0b01995
https://github.com/Dolibarr/dolibarr/commit/a491de01b3a138a77afd985922f4e1efd0b01995
Author: Laurent Destailleur <address@hidden>
Date: 2019-05-29 (Wed, 29 May 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge pull request #11244 from altatof/8.0
FIX : do not include tpl from disabled modules
Commit: b46b675b7c54558f020ee40658f7f023a0de0746
https://github.com/Dolibarr/dolibarr/commit/b46b675b7c54558f020ee40658f7f023a0de0746
Author: Laurent Destailleur <address@hidden>
Date: 2019-05-29 (Wed, 29 May 2019)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: 69efc54fb6239719f156f62acec54af194086eb0
https://github.com/Dolibarr/dolibarr/commit/69efc54fb6239719f156f62acec54af194086eb0
Author: Laurent Destailleur <address@hidden>
Date: 2019-05-29 (Wed, 29 May 2019)
Changed paths:
M htdocs/accountancy/admin/productaccount.php
Log Message:
-----------
Merge pull request #11263 from atm-arnaud/9.0_FIX_productaccount_buy_page
FIX productaccount buylist with pages
Commit: bdd54ae24583536d63baf2bac4679efe369a415c
https://github.com/Dolibarr/dolibarr/commit/bdd54ae24583536d63baf2bac4679efe369a415c
Author: Regis Houssin <address@hidden>
Date: 2019-05-30 (Thu, 30 May 2019)
Changed paths:
M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
Log Message:
-----------
FIX missing llx_const encrypt
Commit: dedd85c8b5238c82026c35b844e02d0cbbdb9dc6
https://github.com/Dolibarr/dolibarr/commit/dedd85c8b5238c82026c35b844e02d0cbbdb9dc6
Author: Laurent Destailleur <address@hidden>
Date: 2019-05-31 (Fri, 31 May 2019)
Changed paths:
M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
Log Message:
-----------
Merge pull request #11271 from hregis/9.0_security
FIX missing llx_const encrypt
Commit: cd75794aaac0b9e98711e707e2cfe1a595395abe
https://github.com/Dolibarr/dolibarr/commit/cd75794aaac0b9e98711e707e2cfe1a595395abe
Author: Laurent Destailleur <address@hidden>
Date: 2019-05-31 (Fri, 31 May 2019)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
FIX #11169 #11202
Commit: 12c1531b3b269398c7d2ac2183a9f1e8967f457b
https://github.com/Dolibarr/dolibarr/commit/12c1531b3b269398c7d2ac2183a9f1e8967f457b
Author: Laurent Destailleur <address@hidden>
Date: 2019-05-31 (Fri, 31 May 2019)
Changed paths:
M htdocs/accountancy/admin/productaccount.php
M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: f2088a084f4a366e4e06b8a85bdfa79448e0626f
https://github.com/Dolibarr/dolibarr/commit/f2088a084f4a366e4e06b8a85bdfa79448e0626f
Author: Laurent Destailleur <address@hidden>
Date: 2019-05-31 (Fri, 31 May 2019)
Changed paths:
M htdocs/contact/card.php
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Fix error management
Commit: 5f0fbcea9a019bdec123178ed217438ed1555c56
https://github.com/Dolibarr/dolibarr/commit/5f0fbcea9a019bdec123178ed217438ed1555c56
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-02 (Sun, 02 Jun 2019)
Changed paths:
M htdocs/contact/card.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/contact/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
Commit: ea58f8a617d1bd1340bf986e0260db799843ef89
https://github.com/Dolibarr/dolibarr/commit/ea58f8a617d1bd1340bf986e0260db799843ef89
Author: Laurent Destailleur <address@hidden>
Date: 2019-06-02 (Sun, 02 Jun 2019)
Changed paths:
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/install/mysql/migration/9.0.0-10.0.0.sql
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/7e678f3d83d5...ea58f8a617d1
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] aaaad7: FIX : do not include disabled modules tpl,
Laurent Destailleur <=