[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr/dolibarr] 7cdd33: FIX require category class in extrafield
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr/dolibarr] 7cdd33: FIX require category class in extrafield |
|
Date: |
Wed, 29 Jan 2020 10:28:15 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 7cdd334995a855982c936f7e0ead519f8afa7573
https://github.com/Dolibarr/dolibarr/commit/7cdd334995a855982c936f7e0ead519f8afa7573
Author: VESSILLER <address@hidden>
Date: 2020-01-28 (Tue, 28 Jan 2020)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
FIX require category class in extrafield
Commit: e770b503e5a03002f04e95b5c475a8add24b55f5
https://github.com/Dolibarr/dolibarr/commit/e770b503e5a03002f04e95b5c475a8add24b55f5
Author: gti-eu <address@hidden>
Date: 2020-01-28 (Tue, 28 Jan 2020)
Changed paths:
M htdocs/emailcollector/class/emailcollector.class.php
Log Message:
-----------
Fix mailcollector text format
Commit: 8a9ca97b45fa25d0a6ebb36423f41f0ea491a8d5
https://github.com/Dolibarr/dolibarr/commit/8a9ca97b45fa25d0a6ebb36423f41f0ea491a8d5
Author: stickler-ci <address@hidden>
Date: 2020-01-28 (Tue, 28 Jan 2020)
Changed paths:
M htdocs/emailcollector/class/emailcollector.class.php
Log Message:
-----------
Fixing style errors.
Commit: c169632f7b267b03905e715bd9f269ddfcd04f6f
https://github.com/Dolibarr/dolibarr/commit/c169632f7b267b03905e715bd9f269ddfcd04f6f
Author: gti-eu <address@hidden>
Date: 2020-01-28 (Tue, 28 Jan 2020)
Changed paths:
M htdocs/emailcollector/class/emailcollector.class.php
Log Message:
-----------
Add missing doc
Commit: 8af5d87e80e1bfda9acf71f44ac7433da55b59e6
https://github.com/Dolibarr/dolibarr/commit/8af5d87e80e1bfda9acf71f44ac7433da55b59e6
Author: VESSILLER <address@hidden>
Date: 2020-01-28 (Tue, 28 Jan 2020)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
FIX regex for include or exclude categories in full arbo
Commit: 5783f9b7c2f7a83e6e04bfb5178174957b9b4790
https://github.com/Dolibarr/dolibarr/commit/5783f9b7c2f7a83e6e04bfb5178174957b9b4790
Author: ptibogxiv <address@hidden>
Date: 2020-01-28 (Tue, 28 Jan 2020)
Changed paths:
M htdocs/stripe/charge.php
Log Message:
-----------
fix lang for other payment mode available
Commit: 9ae174d8b4fb16ffa4492b8718ebc556e2e79ec3
https://github.com/Dolibarr/dolibarr/commit/9ae174d8b4fb16ffa4492b8718ebc556e2e79ec3
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-28 (Tue, 28 Jan 2020)
Changed paths:
M htdocs/api/class/api.class.php
M htdocs/expensereport/class/api_expensereports.class.php
Log Message:
-----------
Clean code
Commit: b2256620c40d4310c93ed3aec876c27fa1b74960
https://github.com/Dolibarr/dolibarr/commit/b2256620c40d4310c93ed3aec876c27fa1b74960
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-28 (Tue, 28 Jan 2020)
Changed paths:
M htdocs/emailcollector/class/emailcollector.class.php
Log Message:
-----------
Update emailcollector.class.php
Commit: be9d27d4308f239ce832ec6765140fafb52b88db
https://github.com/Dolibarr/dolibarr/commit/be9d27d4308f239ce832ec6765140fafb52b88db
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-28 (Tue, 28 Jan 2020)
Changed paths:
M htdocs/emailcollector/class/emailcollector.class.php
Log Message:
-----------
Merge pull request #12944 from gti-eu/11.0
Fix mailcollector text format
Commit: 4730da94ab6ae7513a9b96d2272b93ffd478d8d3
https://github.com/Dolibarr/dolibarr/commit/4730da94ab6ae7513a9b96d2272b93ffd478d8d3
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-28 (Tue, 28 Jan 2020)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge pull request #12943 from OPEN-DSI/v10-fix-extrafiled-category-require
FIX require category class in extrafield
Commit: ed8b6f346de41ede72bec62f77b7c5ed15afa4e9
https://github.com/Dolibarr/dolibarr/commit/ed8b6f346de41ede72bec62f77b7c5ed15afa4e9
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-28 (Tue, 28 Jan 2020)
Changed paths:
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Merge pull request #12946 from OPEN-DSI/v10-fix-categorie-full-arbo-match
FIX regex for include or exclude categories in full arbo
Commit: e38069e41b65ff0679d9f1092077cb155f23f407
https://github.com/Dolibarr/dolibarr/commit/e38069e41b65ff0679d9f1092077cb155f23f407
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-28 (Tue, 28 Jan 2020)
Changed paths:
M htdocs/stripe/charge.php
Log Message:
-----------
Merge pull request #12947 from ptibogxiv/patch-296
fix lang for other payment mode available
Commit: d224c711cf3b9015af4131968e6be5bc00fa1ff1
https://github.com/Dolibarr/dolibarr/commit/d224c711cf3b9015af4131968e6be5bc00fa1ff1
Author: oscim <address@hidden>
Date: 2020-01-29 (Wed, 29 Jan 2020)
Changed paths:
M htdocs/compta/resultat/result.php
Log Message:
-----------
Update result.php
fix error for display detail of account 6xxx. this account is < 0, but is not
null
Commit: 5d2130a5aec3ae306d3f323c977b656fa20c18ca
https://github.com/Dolibarr/dolibarr/commit/5d2130a5aec3ae306d3f323c977b656fa20c18ca
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-29 (Wed, 29 Jan 2020)
Changed paths:
M htdocs/resource/class/dolresource.class.php
M htdocs/resource/list.php
Log Message:
-----------
Fix SQL injection
Commit: d650258d3933673304dbca6c523d1c97e0f099b1
https://github.com/Dolibarr/dolibarr/commit/d650258d3933673304dbca6c523d1c97e0f099b1
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-29 (Wed, 29 Jan 2020)
Changed paths:
M htdocs/categories/class/categorie.class.php
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 1e13f6fd0f1819e2c6a3d982ff02a0fbf773970a
https://github.com/Dolibarr/dolibarr/commit/1e13f6fd0f1819e2c6a3d982ff02a0fbf773970a
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-29 (Wed, 29 Jan 2020)
Changed paths:
M htdocs/categories/class/categorie.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/resource/class/dolresource.class.php
M htdocs/resource/list.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/resource/class/dolresource.class.php
htdocs/resource/list.php
Commit: 7c34d97e2d2461c5e438782ac8436a6a5f03c5f0
https://github.com/Dolibarr/dolibarr/commit/7c34d97e2d2461c5e438782ac8436a6a5f03c5f0
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-29 (Wed, 29 Jan 2020)
Changed paths:
M htdocs/admin/mails.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Fix messages for SPF
Commit: 65e8113373231788d4df0e954d33d988a049357a
https://github.com/Dolibarr/dolibarr/commit/65e8113373231788d4df0e954d33d988a049357a
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-29 (Wed, 29 Jan 2020)
Changed paths:
M htdocs/admin/notification.php
Log Message:
-----------
Look and feel v11
Commit: 60f772d28562f73d55d4ccba6f38d65fa0d9ccd6
https://github.com/Dolibarr/dolibarr/commit/60f772d28562f73d55d4ccba6f38d65fa0d9ccd6
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-29 (Wed, 29 Jan 2020)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/modules/modFacture.class.php
M htdocs/exports/class/export.class.php
M htdocs/exports/export.php
M htdocs/langs/en_US/bills.lang
Log Message:
-----------
FIX Pending amount to pay must be zero if invoice close for anticipated
payment.
Commit: 633ba666aa5e1f9dbde4868bffc4f7c0820624ad
https://github.com/Dolibarr/dolibarr/commit/633ba666aa5e1f9dbde4868bffc4f7c0820624ad
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-29 (Wed, 29 Jan 2020)
Changed paths:
M htdocs/admin/mails.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Add info of email reference syntax to help debug.
Commit: 1e879126cd31fca2162d35f4700086626cd0c31c
https://github.com/Dolibarr/dolibarr/commit/1e879126cd31fca2162d35f4700086626cd0c31c
Author: Laurent Destailleur <address@hidden>
Date: 2020-01-29 (Wed, 29 Jan 2020)
Changed paths:
M htdocs/admin/mails.php
M htdocs/admin/notification.php
M htdocs/api/class/api.class.php
M htdocs/categories/class/categorie.class.php
M htdocs/compta/facture/list.php
M htdocs/core/class/commoninvoice.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/modules/modFacture.class.php
M htdocs/emailcollector/class/emailcollector.class.php
M htdocs/expensereport/class/api_expensereports.class.php
M htdocs/exports/class/export.class.php
M htdocs/exports/export.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/bills.lang
M htdocs/resource/class/dolresource.class.php
M htdocs/resource/list.php
M htdocs/stripe/charge.php
Log Message:
-----------
Merge branch '11.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/exports/class/export.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/d255e3b77b09...1e879126cd31