civicrm-core.git
3 years agoAfform - Improve integration with ContactLayout editor
Coleman Watts [Mon, 12 Apr 2021 22:15:49 +0000 (18:15 -0400)]
Afform - Improve integration with ContactLayout editor

- Adds a separate category of ContactLayout block per afform-type
- Adds a helper function to getFields so non-dao entities can load options from an optionGroup
- Renames search display afforms to "Search Form" to distinguish them from actual search displays

3 years agoMerge pull request #20037 from mattwire/amountstandardprop
Seamus Lee [Mon, 12 Apr 2021 00:22:35 +0000 (10:22 +1000)]
Merge pull request #20037 from mattwire/amountstandardprop

Add amount as standard property to PaymentPropertyBag

3 years agoMerge pull request #20039 from civicrm/5.37
Eileen McNaughton [Sun, 11 Apr 2021 22:24:31 +0000 (10:24 +1200)]
Merge pull request #20039 from civicrm/5.37

5.37

3 years agoMerge pull request #20019 from mattwire/recaptchapcp
Seamus Lee [Sun, 11 Apr 2021 22:22:25 +0000 (08:22 +1000)]
Merge pull request #20019 from mattwire/recaptchapcp

Use standard function to add reCAPTCHA to PCPAccount form

3 years agoMerge pull request #20030 from mattwire/paymentdopayment
Eileen McNaughton [Sun, 11 Apr 2021 22:03:23 +0000 (10:03 +1200)]
Merge pull request #20030 from mattwire/paymentdopayment

Initial refactor of PayPal core processor to stop using doDirectPayment/doTransferCheckout

3 years agoAdd amount as standard property
Matthew Wire [Mon, 1 Feb 2021 20:51:16 +0000 (20:51 +0000)]
Add amount as standard property

3 years agoAdd legacy methods to catch old code
Matthew Wire [Sun, 11 Apr 2021 20:16:47 +0000 (21:16 +0100)]
Add legacy methods to catch old code

3 years agoInitial refactor of PayPal core processor to stop using doDirectPayment/doTransferChe...
Matthew Wire [Sat, 10 Apr 2021 09:33:06 +0000 (10:33 +0100)]
Initial refactor of PayPal core processor to stop using doDirectPayment/doTransferCheckout

3 years agoMerge pull request #20023 from mattwire/propertybaginstallments
Eileen McNaughton [Sun, 11 Apr 2021 19:19:18 +0000 (07:19 +1200)]
Merge pull request #20023 from mattwire/propertybaginstallments

Add installments to propertyBag

3 years agoMerge pull request #20034 from civicrm/5.37
Eileen McNaughton [Sun, 11 Apr 2021 19:09:08 +0000 (07:09 +1200)]
Merge pull request #20034 from civicrm/5.37

5.37 to master

3 years agoMerge pull request #20033 from colemanw/searchKitHavingLabel
Eileen McNaughton [Sun, 11 Apr 2021 19:08:35 +0000 (07:08 +1200)]
Merge pull request #20033 from colemanw/searchKitHavingLabel

dev/report#58 SearchKit - Rename 'Filters' to 'Having' for clarity

3 years agoSearchKit - Rename 'Filters' to 'Having' for clarity
Coleman Watts [Sun, 11 Apr 2021 15:51:35 +0000 (11:51 -0400)]
SearchKit - Rename 'Filters' to 'Having' for clarity

3 years agoMerge pull request #20020 from mattwire/deprecateddoXpayment
Eileen McNaughton [Sun, 11 Apr 2021 05:01:02 +0000 (17:01 +1200)]
Merge pull request #20020 from mattwire/deprecateddoXpayment

Make it clear that doDirectPayment/doTransferCheckout are deprecated …

3 years agoMerge pull request #20022 from mattwire/dopaymentpropertybag
Eileen McNaughton [Sun, 11 Apr 2021 04:58:38 +0000 (16:58 +1200)]
Merge pull request #20022 from mattwire/dopaymentpropertybag

Use propertyBag in doPayment

3 years agoMerge pull request #20032 from civicrm/5.37
Eileen McNaughton [Sun, 11 Apr 2021 04:52:54 +0000 (16:52 +1200)]
Merge pull request #20032 from civicrm/5.37

5.37 to master

3 years agoMerge pull request #20031 from colemanw/searchKitFlushCache
Eileen McNaughton [Sun, 11 Apr 2021 04:52:23 +0000 (16:52 +1200)]
Merge pull request #20031 from colemanw/searchKitFlushCache

SearchKit - Flush Angular cache when saving

3 years agoSearchKit - Flush Angular cache when saving
Coleman Watts [Sun, 11 Apr 2021 01:28:20 +0000 (21:28 -0400)]
SearchKit - Flush Angular cache when saving

3 years agoMake it clear that doDirectPayment/doTransferCheckout are deprecated and should not...
Matthew Wire [Fri, 9 Apr 2021 10:13:58 +0000 (11:13 +0100)]
Make it clear that doDirectPayment/doTransferCheckout are deprecated and should not be used

3 years agoMerge pull request #20021 from mattwire/payment_status
Eileen McNaughton [Sat, 10 Apr 2021 00:32:22 +0000 (12:32 +1200)]
Merge pull request #20021 from mattwire/payment_status

Add payment_status in default doPayment per dev/financial#141

3 years agoMerge pull request #20027 from civicrm/5.37
Eileen McNaughton [Sat, 10 Apr 2021 00:26:14 +0000 (12:26 +1200)]
Merge pull request #20027 from civicrm/5.37

5.37 to master

3 years agoMerge pull request #20025 from jitendrapurohit/memsoftcredit-537
Eileen McNaughton [Sat, 10 Apr 2021 00:24:09 +0000 (12:24 +1200)]
Merge pull request #20025 from jitendrapurohit/memsoftcredit-537

Soft credit fails when membership is created using backend form

3 years agoFix soft credit on creating membership using backend form
Jitendra Purohit [Fri, 9 Apr 2021 14:40:37 +0000 (20:10 +0530)]
Fix soft credit on creating membership using backend form

3 years agoMerge pull request #20008 from eileenmcnaughton/pay_fee
Matthew Wire [Fri, 9 Apr 2021 13:15:50 +0000 (14:15 +0100)]
Merge pull request #20008 from eileenmcnaughton/pay_fee

Fix Payment.create to update (recalculate) contribution fee_amount

3 years agoAdd installments to propertyBag
Matthew Wire [Sat, 3 Apr 2021 17:06:00 +0000 (18:06 +0100)]
Add installments to propertyBag

3 years agoAdd in default doPayment per https://lab.civicrm.org/dev/financial/-/issues/141
Matthew Wire [Fri, 9 Apr 2021 10:17:23 +0000 (11:17 +0100)]
Add  in default doPayment per https://lab.civicrm.org/dev/financial/-/issues/141

3 years agoUse propertyBag in doPayment
Matthew Wire [Fri, 9 Apr 2021 10:16:10 +0000 (11:16 +0100)]
Use propertyBag in doPayment

3 years agoUse standard function to add reCAPTCHA to PCPAccount form
Matthew Wire [Fri, 9 Apr 2021 09:07:25 +0000 (10:07 +0100)]
Use standard function to add reCAPTCHA to PCPAccount form

3 years agoMerge pull request #20011 from seamuslee001/migrate_library
Matthew Wire [Fri, 9 Apr 2021 08:35:29 +0000 (09:35 +0100)]
Merge pull request #20011 from seamuslee001/migrate_library

Migrate current recaptcha library into extension and fix a couple of …

3 years agoMerge pull request #19972 from JMAConsulting/issue_2383_unit_test
Eileen McNaughton [Fri, 9 Apr 2021 08:04:39 +0000 (20:04 +1200)]
Merge pull request #19972 from JMAConsulting/issue_2383_unit_test

Add unit test for core#19628

3 years agoAdd unit test for core#19628
Monish Deb [Tue, 6 Apr 2021 05:33:37 +0000 (11:03 +0530)]
Add unit test for core#19628

3 years agoMerge pull request #19903 from eileenmcnaughton/paypal
Monish Deb [Fri, 9 Apr 2021 05:37:11 +0000 (11:07 +0530)]
Merge pull request #19903 from eileenmcnaughton/paypal

[REF] [ipn] Simplification around contributionRecur ID

3 years agoMerge pull request #20007 from eileenmcnaughton/mem_rec
Monish Deb [Fri, 9 Apr 2021 05:18:42 +0000 (10:48 +0530)]
Merge pull request #20007 from eileenmcnaughton/mem_rec

Extract out getReceiveDate

3 years agoFix Payment.create to update (recalculate) contribution fee_amount
eileen [Thu, 8 Apr 2021 22:50:50 +0000 (10:50 +1200)]
Fix Payment.create to update (recalculate) contribution fee_amount

This recalculates the fee amount when a payment is received. Our data integrity expects the fee
amount on the contribution to equal the sum of the fee amount on the payments. However,
it's possible a pending contribution has an 'estimated' fee amount so we can't just add on
the fee_amount and assume it will be right

3 years agoMerge pull request #20012 from eileenmcnaughton/bao_test
Seamus Lee [Fri, 9 Apr 2021 02:21:18 +0000 (12:21 +1000)]
Merge pull request #20012 from eileenmcnaughton/bao_test

[NFC] [Test] Preliminary cleanup

3 years agoMerge pull request #20016 from seamuslee001/unit_test_2502
Eileen McNaughton [Fri, 9 Apr 2021 02:19:49 +0000 (14:19 +1200)]
Merge pull request #20016 from seamuslee001/unit_test_2502

dev/core#2502 Add unit test to lock in fix on tag searching in search…

3 years agoMerge pull request #20013 from eileenmcnaughton/mem_mover
Eileen McNaughton [Fri, 9 Apr 2021 01:36:19 +0000 (13:36 +1200)]
Merge pull request #20013 from eileenmcnaughton/mem_mover

Move tpl assignment to email function

3 years agodev/core#2502 Add unit test to lock in fix on tag searching in search builder
Seamus Lee [Fri, 9 Apr 2021 00:55:57 +0000 (10:55 +1000)]
dev/core#2502 Add unit test to lock in fix on tag searching in search builder

3 years agoMerge pull request #19718 from aydun/wp-login-redirect
Eileen McNaughton [Fri, 9 Apr 2021 00:53:07 +0000 (12:53 +1200)]
Merge pull request #19718 from aydun/wp-login-redirect

dev/core#2436 On WordPress, redirect back to the event registration o…

3 years agoMerge pull request #20015 from civicrm/5.37
Eileen McNaughton [Fri, 9 Apr 2021 00:35:40 +0000 (12:35 +1200)]
Merge pull request #20015 from civicrm/5.37

5.37 to master

3 years agoMerge pull request #20009 from colemanw/caseActivity
Eileen McNaughton [Fri, 9 Apr 2021 00:28:24 +0000 (12:28 +1200)]
Merge pull request #20009 from colemanw/caseActivity

dev/report#53 APIv4 - Add CaseActivity entity

3 years agoMerge pull request #20010 from eileenmcnaughton/mem_ord
Eileen McNaughton [Fri, 9 Apr 2021 00:26:24 +0000 (12:26 +1200)]
Merge pull request #20010 from eileenmcnaughton/mem_ord

[Ref] One more place to use total fn

3 years agoMove tpl assignment to email function
eileen [Fri, 26 Mar 2021 03:26:06 +0000 (16:26 +1300)]
Move tpl assignment to email function

3 years agoMigrate current recaptcha library into extension and fix a couple of ts calls
Seamus Lee [Thu, 8 Apr 2021 23:08:07 +0000 (09:08 +1000)]
Migrate current recaptcha library into extension and fix a couple of ts calls

3 years agoMerge pull request #20006 from eileenmcnaughton/pay_fix
Eileen McNaughton [Thu, 8 Apr 2021 23:54:26 +0000 (11:54 +1200)]
Merge pull request #20006 from eileenmcnaughton/pay_fix

[NFC] [Test] Minor preliminary cleanup

3 years ago[NFC] [Test] Preliminary cleanup
eileen [Thu, 8 Apr 2021 23:52:07 +0000 (11:52 +1200)]
[NFC] [Test] Preliminary cleanup

3 years agoAPIv4 - Add CaseActivity entity
Coleman Watts [Thu, 8 Apr 2021 23:08:11 +0000 (19:08 -0400)]
APIv4 - Add CaseActivity entity

3 years ago[Ref] One more place to use total fn
eileen [Fri, 26 Mar 2021 00:20:44 +0000 (13:20 +1300)]
[Ref] One more place to use total fn

3 years agoExtract out getReceiveDate
eileen [Thu, 25 Mar 2021 23:43:21 +0000 (12:43 +1300)]
Extract out getReceiveDate

3 years ago[NFC] [Test] Minor preliminary cleanup
eileen [Thu, 8 Apr 2021 22:19:55 +0000 (10:19 +1200)]
[NFC] [Test] Minor preliminary cleanup

3 years agoMerge pull request #19902 from eileenmcnaughton/mem_cont
colemanw [Thu, 8 Apr 2021 22:15:06 +0000 (18:15 -0400)]
Merge pull request #19902 from eileenmcnaughton/mem_cont

[REF] [Towards membership api] Simplify determination on contribution recur contact id

3 years agoMerge pull request #20004 from colemanw/searchKitContributionTasks
Eileen McNaughton [Thu, 8 Apr 2021 22:05:40 +0000 (10:05 +1200)]
Merge pull request #20004 from colemanw/searchKitContributionTasks

SearchKit - Make contribution tasks available as actions

3 years agoSearchKit - Make contribution tasks available as actions
Coleman Watts [Thu, 8 Apr 2021 19:03:38 +0000 (15:03 -0400)]
SearchKit - Make contribution tasks available as actions

So far there is only one action (Send Receipt) available,
and it only works for contributions with status=Completed.
SearchKit doesn't yet respect that limitation and shows the action for every record.

3 years agoMerge pull request #20005 from civicrm/5.37
Eileen McNaughton [Thu, 8 Apr 2021 20:43:33 +0000 (08:43 +1200)]
Merge pull request #20005 from civicrm/5.37

5.37 to master

3 years agoMerge pull request #20003 from colemanw/fixSearchKitExport
Eileen McNaughton [Thu, 8 Apr 2021 20:33:21 +0000 (08:33 +1200)]
Merge pull request #20003 from colemanw/fixSearchKitExport

SearchKit - Fix broken export action

3 years agoMerge pull request #19964 from eileenmcnaughton/mem_install
colemanw [Thu, 8 Apr 2021 19:44:06 +0000 (15:44 -0400)]
Merge pull request #19964 from eileenmcnaughton/mem_install

Membership form Remove check for installments as not on the form (copied from shared code)

3 years agoMerge pull request #19965 from eileenmcnaughton/mem_trxn
colemanw [Thu, 8 Apr 2021 19:43:26 +0000 (15:43 -0400)]
Merge pull request #19965 from eileenmcnaughton/mem_trxn

Remove reference to trxn_id, not on form, from previously shared code

3 years agoMerge pull request #19848 from eileenmcnaughton/task2
colemanw [Thu, 8 Apr 2021 18:11:22 +0000 (14:11 -0400)]
Merge pull request #19848 from eileenmcnaughton/task2

Add support for receipt task outside the search process

3 years agoSearchKit - Fix broken export action
Coleman Watts [Thu, 8 Apr 2021 15:12:25 +0000 (11:12 -0400)]
SearchKit - Fix broken export action

3 years agoMerge pull request #19744 from totten/master-upg-cleanup
Monish Deb [Thu, 8 Apr 2021 12:28:20 +0000 (17:58 +0530)]
Merge pull request #19744 from totten/master-upg-cleanup

dev/release#16 - Cleanup empty upgrade steps

3 years agoMerge pull request #19966 from eileenmcnaughton/mem_source
Monish Deb [Thu, 8 Apr 2021 12:27:18 +0000 (17:57 +0530)]
Merge pull request #19966 from eileenmcnaughton/mem_source

[REF] [Towards membership api] extract getContributionSource

3 years agoMerge pull request #19890 from mlutfy/fixEmptyFileField
Monish Deb [Thu, 8 Apr 2021 12:22:36 +0000 (17:52 +0530)]
Merge pull request #19890 from mlutfy/fixEmptyFileField

File CustomField: avoid renaming an empty file

3 years agoMerge pull request #20000 from civicrm/5.37
Seamus Lee [Thu, 8 Apr 2021 10:04:09 +0000 (20:04 +1000)]
Merge pull request #20000 from civicrm/5.37

5.37

3 years agoMerge pull request #19999 from eileenmcnaughton/5.37
Seamus Lee [Thu, 8 Apr 2021 08:37:20 +0000 (18:37 +1000)]
Merge pull request #19999 from eileenmcnaughton/5.37

Add recaptcha to distmaker

3 years agoMerge pull request #19998 from colemanw/afformAssetRefresh
Seamus Lee [Thu, 8 Apr 2021 07:22:55 +0000 (17:22 +1000)]
Merge pull request #19998 from colemanw/afformAssetRefresh

Afform - Refresh assetBuilder when saving a form

3 years agoMerge pull request #19997 from colemanw/afformSearchDisplayDropdown
Seamus Lee [Thu, 8 Apr 2021 06:38:51 +0000 (16:38 +1000)]
Merge pull request #19997 from colemanw/afformSearchDisplayDropdown

Afform - Fix endless spinner on "New Search Display" dropdown

3 years agoAdd recaptcha to distmaker
eileen [Thu, 8 Apr 2021 06:33:20 +0000 (18:33 +1200)]
Add recaptcha to distmaker

3 years agoAfform - Refresh assetBuilder when saving a form
Coleman Watts [Thu, 8 Apr 2021 02:33:47 +0000 (22:33 -0400)]
Afform - Refresh assetBuilder when saving a form

On sites with caching enabled, changes were not showing until a manual flush

3 years agoAfform - Fix endless spinner on "New Search Display" dropdown when there are none
Coleman Watts [Thu, 8 Apr 2021 02:11:03 +0000 (22:11 -0400)]
Afform - Fix endless spinner on "New Search Display" dropdown when there are none

3 years ago(Cleanup) Upgrader - Remove empty steps from 5.0x-series
Tim Otten [Sat, 6 Mar 2021 10:36:08 +0000 (02:36 -0800)]
(Cleanup) Upgrader - Remove empty steps from 5.0x-series

3 years ago(Cleanup) Upgrader - Remove empty steps from 5.10-series
Tim Otten [Sat, 6 Mar 2021 10:08:05 +0000 (02:08 -0800)]
(Cleanup) Upgrader - Remove empty steps from 5.10-series

3 years ago(Cleanup) Upgrader - Remove empty steps from 5.20-series
Tim Otten [Sat, 6 Mar 2021 10:02:25 +0000 (02:02 -0800)]
(Cleanup) Upgrader - Remove empty steps from 5.20-series

3 years ago(Cleanup) Upgrader - Remove empty steps from 5.30-series
Tim Otten [Sat, 6 Mar 2021 09:58:23 +0000 (01:58 -0800)]
(Cleanup) Upgrader - Remove empty steps from 5.30-series

3 years agoSet version to 5.38.alpha1
CiviCRM [Thu, 8 Apr 2021 01:50:19 +0000 (01:50 +0000)]
Set version to 5.38.alpha1

3 years agoMerge pull request #19995 from demeritcowboy/ufgroup-active
Eileen McNaughton [Thu, 8 Apr 2021 01:46:44 +0000 (13:46 +1200)]
Merge pull request #19995 from demeritcowboy/ufgroup-active

dev/core#2501 - api uf_group.create overwrites existing fields when updating if they aren't specified

3 years agoSet version to 5.37.beta1
CiviCRM [Thu, 8 Apr 2021 01:42:10 +0000 (01:42 +0000)]
Set version to 5.37.beta1

3 years agoMerge pull request #19996 from colemanw/misc_admin_settings
Tim Otten [Thu, 8 Apr 2021 01:24:53 +0000 (18:24 -0700)]
Merge pull request #19996 from colemanw/misc_admin_settings

Rename 'Misc' menu item machine name to a safe string

3 years agoMerge pull request #19543 from eileenmcnaughton/msg_tpl
Eileen McNaughton [Thu, 8 Apr 2021 01:22:57 +0000 (13:22 +1200)]
Merge pull request #19543 from eileenmcnaughton/msg_tpl

replaceOrgTokens: Remove broken code

3 years agoUpdate civicrm_generated.mysql
Tim Otten [Thu, 8 Apr 2021 01:13:41 +0000 (18:13 -0700)]
Update civicrm_generated.mysql

3 years agoRename 'Misc' menu item machine name to a safe string
Coleman Watts [Thu, 8 Apr 2021 00:54:55 +0000 (20:54 -0400)]
Rename 'Misc' menu item machine name to a safe string

This renames the machine name to one that doesn't contain special characters

3 years agoMerge pull request #19967 from mattwire/recaptchaextension
Seamus Lee [Wed, 7 Apr 2021 23:32:18 +0000 (09:32 +1000)]
Merge pull request #19967 from mattwire/recaptchaextension

Create reCAPTCHA core extension

3 years agoMerge pull request #19969 from eileenmcnaughton/settingbag
Seamus Lee [Wed, 7 Apr 2021 22:55:31 +0000 (08:55 +1000)]
Merge pull request #19969 from eileenmcnaughton/settingbag

E-notice fix on serialized setting

3 years agoMerge pull request #19994 from civicrm/dependabot/composer/phpseclib/phpseclib-2...
Seamus Lee [Wed, 7 Apr 2021 22:52:25 +0000 (08:52 +1000)]
Merge pull request #19994 from civicrm/dependabot/composer/phpseclib/phpseclib-2.0.31

Bump phpseclib/phpseclib from 2.0.29 to 2.0.31

3 years agoMerge pull request #19992 from demeritcowboy/activity-contact-weights
Eileen McNaughton [Wed, 7 Apr 2021 22:43:09 +0000 (10:43 +1200)]
Merge pull request #19992 from demeritcowboy/activity-contact-weights

dev/core#2442 - Missing sample data update for activity contact weights

3 years agoMerge pull request #19993 from colemanw/apiJoinFix
Eileen McNaughton [Wed, 7 Apr 2021 22:35:39 +0000 (10:35 +1200)]
Merge pull request #19993 from colemanw/apiJoinFix

APIv4 - Prevent api adding default join conditions when it shouldn't

3 years agoMerge pull request #19984 from colemanw/searchKitAddFilterToJoin
Eileen McNaughton [Wed, 7 Apr 2021 22:31:37 +0000 (10:31 +1200)]
Merge pull request #19984 from colemanw/searchKitAddFilterToJoin

SearchKit - Apply filters to ON clause of EXCLUDE joins

3 years agoUpdate CRM/Upgrade/Incremental/php/FiveThirtySeven.php
Tim Otten [Wed, 7 Apr 2021 22:18:51 +0000 (15:18 -0700)]
Update CRM/Upgrade/Incremental/php/FiveThirtySeven.php

3 years agois_active should default to true if missing
demeritcowboy [Wed, 7 Apr 2021 13:10:04 +0000 (09:10 -0400)]
is_active should default to true if missing

3 years agoCreate recaptcha core extension
Matthew Wire [Sat, 3 Apr 2021 22:28:51 +0000 (23:28 +0100)]
Create recaptcha core extension

3 years agoBump phpseclib/phpseclib from 2.0.29 to 2.0.31
dependabot[bot] [Wed, 7 Apr 2021 21:21:09 +0000 (21:21 +0000)]
Bump phpseclib/phpseclib from 2.0.29 to 2.0.31

Bumps [phpseclib/phpseclib](https://github.com/phpseclib/phpseclib) from 2.0.29 to 2.0.31.
- [Release notes](https://github.com/phpseclib/phpseclib/releases)
- [Changelog](https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md)
- [Commits](https://github.com/phpseclib/phpseclib/compare/2.0.29...2.0.31)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoupdate weights for sample data
demeritcowboy [Wed, 7 Apr 2021 20:40:13 +0000 (16:40 -0400)]
update weights for sample data

3 years agoMerge pull request #19987 from kurund/activity-type-weights
colemanw [Wed, 7 Apr 2021 20:33:45 +0000 (16:33 -0400)]
Merge pull request #19987 from kurund/activity-type-weights

Activity type weights

3 years agoAPIv4 - Prevent api adding default join conditions when it shouldn't
Coleman Watts [Wed, 7 Apr 2021 20:16:25 +0000 (16:16 -0400)]
APIv4 - Prevent api adding default join conditions when it shouldn't

When adding an explicit join, the api will search for a default condition unless
an fk field has been explicitly set. This fixes an error when the api thought
no fk field was present when it actually was.

3 years agoMerge pull request #19687 from colemanw/afformShortcodes
Eileen McNaughton [Wed, 7 Apr 2021 19:34:37 +0000 (07:34 +1200)]
Merge pull request #19687 from colemanw/afformShortcodes

Afform - Support embedding forms via WP shortcodes.

3 years agoupdate weights for the activity contact types
Kurund Jalmi [Wed, 7 Apr 2021 11:06:43 +0000 (12:06 +0100)]
update weights for the activity contact types

3 years agoMerge pull request #19978 from demeritcowboy/php74-contribution
Monish Deb [Wed, 7 Apr 2021 17:08:21 +0000 (22:38 +0530)]
Merge pull request #19978 from demeritcowboy/php74-contribution

dev/core#2425 - php 7.4 - E_NOTICE every time you save a contribution

3 years agoMerge pull request #19981 from colemanw/fullScreenDashlet
colemanw [Wed, 7 Apr 2021 13:56:00 +0000 (09:56 -0400)]
Merge pull request #19981 from colemanw/fullScreenDashlet

Fix scrollbars on fullscreen dashboard dashlet

3 years agoMerge pull request #19985 from civicrm/5.36
Eileen McNaughton [Wed, 7 Apr 2021 05:10:58 +0000 (17:10 +1200)]
Merge pull request #19985 from civicrm/5.36

5.36 to master

3 years agoMerge pull request #19983 from alifrumin/5.36rn
Eileen McNaughton [Wed, 7 Apr 2021 05:10:33 +0000 (17:10 +1200)]
Merge pull request #19983 from alifrumin/5.36rn

[NFC] 5.36 release notes

3 years agoMerge pull request #19927 from eileenmcnaughton/etfa
colemanw [Wed, 7 Apr 2021 03:46:23 +0000 (23:46 -0400)]
Merge pull request #19927 from eileenmcnaughton/etfa

Add entity financial account bridge entity

3 years agoSearchKit - Apply filters to ON clause of EXCLUDE joins
Coleman Watts [Wed, 7 Apr 2021 03:38:10 +0000 (23:38 -0400)]
SearchKit - Apply filters to ON clause of EXCLUDE joins

Filters usually get applied to the WHERE clause, but in the case of EXCLUDE joins,
they will never be available (because their results are excluded).
So it makes more sense to add them to the ON clause of the join itself.