[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 819827: FIX for MAIN_MAXTABS_IN_CARD
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 819827: FIX for MAIN_MAXTABS_IN_CARD = $i card |
Date: |
Thu, 22 Aug 2019 03:47:30 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 8198276d64856cd7fe9cf27c9d6a9e39c63dce7f
https://github.com/Dolibarr/dolibarr/commit/8198276d64856cd7fe9cf27c9d6a9e39c63dce7f
Author: ptibogxiv <address@hidden>
Date: 2019-08-13 (Tue, 13 Aug 2019)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
FIX for MAIN_MAXTABS_IN_CARD = $i card
Commit: 93d64bb84e3278891a52332bae037a31df58329f
https://github.com/Dolibarr/dolibarr/commit/93d64bb84e3278891a52332bae037a31df58329f
Author: ptibogxiv <address@hidden>
Date: 2019-08-13 (Tue, 13 Aug 2019)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Update functions.lib.php
Commit: 5613532b80474f28bcb00cbb389c9a59fede2f25
https://github.com/Dolibarr/dolibarr/commit/5613532b80474f28bcb00cbb389c9a59fede2f25
Author: ptibogxiv <address@hidden>
Date: 2019-08-21 (Wed, 21 Aug 2019)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
Fix context in takepos
need downgrade in v10 of this PR fo fix hiden context
https://github.com/Dolibarr/dolibarr/pull/11629
Commit: b06dab69307cf73c34e22f00abbd80b26127a5cc
https://github.com/Dolibarr/dolibarr/commit/b06dab69307cf73c34e22f00abbd80b26127a5cc
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-22 (Thu, 22 Aug 2019)
Changed paths:
M htdocs/core/lib/company.lib.php
Log Message:
-----------
Fix add option to restore backward compatibility
Commit: a19228ccc043e26d87f97df48d0edd886adf89e9
https://github.com/Dolibarr/dolibarr/commit/a19228ccc043e26d87f97df48d0edd886adf89e9
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-22 (Thu, 22 Aug 2019)
Changed paths:
M htdocs/api/class/api_login.class.php
M htdocs/dav/fileserver.php
Log Message:
-----------
Fix compatibility with twofactor
Conflicts:
htdocs/api/class/api_login.class.php
htdocs/dav/fileserver.php
Commit: 2bc0163354ff341b75cfd26c35924951974fe9c0
https://github.com/Dolibarr/dolibarr/commit/2bc0163354ff341b75cfd26c35924951974fe9c0
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-22 (Thu, 22 Aug 2019)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #11685 from ptibogxiv/patch-224
FIX for MAIN_MAXTABS_IN_CARD = $i card
Commit: 923eb935eb004eb9ed3239612dc9bde3c5e04980
https://github.com/Dolibarr/dolibarr/commit/923eb935eb004eb9ed3239612dc9bde3c5e04980
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-22 (Thu, 22 Aug 2019)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Revert "FIX for MAIN_MAXTABS_IN_CARD = $i card"
Commit: 5897fe52b3cecf6d90bd3d4da222774b9978944d
https://github.com/Dolibarr/dolibarr/commit/5897fe52b3cecf6d90bd3d4da222774b9978944d
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-22 (Thu, 22 Aug 2019)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge pull request #11722 from Dolibarr/revert-11685-patch-224
Revert "FIX for MAIN_MAXTABS_IN_CARD = $i card"
Commit: cdda08c0d3200ece5b7e0eb6a1c22b46c1b9beae
https://github.com/Dolibarr/dolibarr/commit/cdda08c0d3200ece5b7e0eb6a1c22b46c1b9beae
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-22 (Thu, 22 Aug 2019)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
FIX #11685
Commit: f7391879a2a61e1e9fc1a26027d072b2e89b2516
https://github.com/Dolibarr/dolibarr/commit/f7391879a2a61e1e9fc1a26027d072b2e89b2516
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-22 (Thu, 22 Aug 2019)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
Merge pull request #11713 from ptibogxiv/patch-225
Fix context in takepos
Commit: a35f010e55e76518bf4007f3261b0f039dc522e8
https://github.com/Dolibarr/dolibarr/commit/a35f010e55e76518bf4007f3261b0f039dc522e8
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-22 (Thu, 22 Aug 2019)
Changed paths:
M htdocs/compta/bank/treso.php
M htdocs/compta/paiement.php
M htdocs/product/fournisseurs.php
M htdocs/stripe/payment.php
Log Message:
-----------
FIX name and position of hook FIX #11710
Commit: 27cd6cd308594af212e80cb4fefc1d88acee1adf
https://github.com/Dolibarr/dolibarr/commit/27cd6cd308594af212e80cb4fefc1d88acee1adf
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-22 (Thu, 22 Aug 2019)
Changed paths:
M htdocs/compta/bank/treso.php
M htdocs/compta/paiement.php
M htdocs/core/lib/company.lib.php
M htdocs/product/fournisseurs.php
M htdocs/stripe/payment.php
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/paiement.php
htdocs/product/fournisseurs.php
htdocs/stripe/payment.php
Commit: 2080f92ec219bc39e3ab9c617bf9c98c65e6a8d7
https://github.com/Dolibarr/dolibarr/commit/2080f92ec219bc39e3ab9c617bf9c98c65e6a8d7
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-22 (Thu, 22 Aug 2019)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 3339f89fc5efca1052bacc1ce8137694ad61662e
https://github.com/Dolibarr/dolibarr/commit/3339f89fc5efca1052bacc1ce8137694ad61662e
Author: Laurent Destailleur <address@hidden>
Date: 2019-08-22 (Thu, 22 Aug 2019)
Changed paths:
M htdocs/api/class/api_login.class.php
M htdocs/compta/bank/treso.php
M htdocs/compta/paiement.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/security2.lib.php
M htdocs/dav/fileserver.php
M htdocs/product/fournisseurs.php
M htdocs/stripe/payment.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/api/class/api_login.class.php
htdocs/dav/fileserver.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/48361c481fa4...3339f89fc5ef