civicrm-core.git
2 years agoAdd release-notes/5.62.1.md
Tim Otten [Fri, 16 Jun 2023 05:10:13 +0000 (22:10 -0700)]
Add release-notes/5.62.1.md

2 years agoAdd release-notes/5.61.4.md
Tim Otten [Wed, 24 May 2023 06:38:56 +0000 (23:38 -0700)]
Add release-notes/5.61.4.md

2 years agoAdd release-notes/5.61.3.md
Tim Otten [Sat, 20 May 2023 00:44:11 +0000 (17:44 -0700)]
Add release-notes/5.61.3.md

2 years agoAdd release-notes/5.61.2.md
Tim Otten [Mon, 8 May 2023 23:10:10 +0000 (16:10 -0700)]
Add release-notes/5.61.2.md

2 years agoAdd release-notes/5.61.1.md
Tim Otten [Fri, 5 May 2023 20:49:51 +0000 (13:49 -0700)]
Add release-notes/5.61.1.md

2 years agoAdd release-notes/5.59.4.md
Tim Otten [Mon, 27 Mar 2023 20:35:57 +0000 (13:35 -0700)]
Add release-notes/5.59.4.md

2 years agoAdd release-notes/5.59.3.md
Tim Otten [Thu, 16 Mar 2023 00:23:52 +0000 (17:23 -0700)]
Add release-notes/5.59.3.md

2 years agoAdd release-notes/5.59.2.md
Tim Otten [Sat, 11 Mar 2023 00:29:22 +0000 (16:29 -0800)]
Add release-notes/5.59.2.md

2 years agoAdd release-notes/5.59.1.md
Tim Otten [Sat, 4 Mar 2023 03:42:11 +0000 (19:42 -0800)]
Add release-notes/5.59.1.md

2 years agoUpdate 5.58.1.md
Tim Otten [Wed, 15 Feb 2023 23:58:14 +0000 (15:58 -0800)]
Update 5.58.1.md

2 years agoAdd release-notes/5.58.1.md
Tim Otten [Wed, 15 Feb 2023 21:54:30 +0000 (13:54 -0800)]
Add release-notes/5.58.1.md

2 years ago5.64.0 release notes: added late changes
Andie Hunt [Wed, 2 Aug 2023 21:40:02 +0000 (17:40 -0400)]
5.64.0 release notes: added late changes

2 years agoMerge pull request #26968 from alifrumin/5.64rn
Seamus Lee [Mon, 31 Jul 2023 03:51:47 +0000 (23:51 -0400)]
Merge pull request #26968 from alifrumin/5.64rn

[NFC] 5.64 release notes

2 years ago[NFC] 5.64 release notes
Alice Frumin [Wed, 12 Jul 2023 02:08:01 +0000 (22:08 -0400)]
[NFC] 5.64 release notes

2 years agoMerge pull request #26953 from eileenmcnaughton/cont_name
Seamus Lee [Fri, 28 Jul 2023 04:11:39 +0000 (00:11 -0400)]
Merge pull request #26953 from eileenmcnaughton/cont_name

dev/core#4453 fix clash over 'name' field on contribution page form

2 years agodev/core#4453 fix clash over 'name' field on contribution page form
Eileen McNaughton [Fri, 28 Jul 2023 02:03:38 +0000 (14:03 +1200)]
dev/core#4453 fix clash over 'name' field on contribution page form

2 years agoMerge pull request #26948 from colemanw/isInstall
colemanw [Fri, 28 Jul 2023 00:39:50 +0000 (17:39 -0700)]
Merge pull request #26948 from colemanw/isInstall

Managed - skip errors in install as well as upgrade mode

2 years agoManaged - skip errors in install as well as upgrade mode
colemanw [Thu, 27 Jul 2023 22:10:32 +0000 (18:10 -0400)]
Managed - skip errors in install as well as upgrade mode

Followup from https://github.com/civicrm/civicrm-core/pull/26891
to exclude install as well as upgrade mode.

2 years agoMerge pull request #26944 from colemanw/fixSkArithmetic
Aidan Saunders [Thu, 27 Jul 2023 21:06:00 +0000 (22:06 +0100)]
Merge pull request #26944 from colemanw/fixSkArithmetic

Fix dev/core#4455 broken SK arithmetic display

2 years agoFix dev/core#4455 broken SK arithmetic display
colemanw [Thu, 27 Jul 2023 19:36:35 +0000 (15:36 -0400)]
Fix dev/core#4455 broken SK arithmetic display

2 years agoMerge pull request #26939 from demeritcowboy/upg-parent-id
Yashodha Chaku [Thu, 27 Jul 2023 05:44:34 +0000 (11:14 +0530)]
Merge pull request #26939 from demeritcowboy/upg-parent-id

dev/core#4451 - fix dangerous delete cascade

2 years agofix dangerous delete cascade
demeritcowboy [Thu, 27 Jul 2023 02:54:37 +0000 (22:54 -0400)]
fix dangerous delete cascade

2 years agoMerge pull request #26902 from seamuslee001/dev_core_4429
demeritcowboy [Tue, 25 Jul 2023 13:01:14 +0000 (09:01 -0400)]
Merge pull request #26902 from seamuslee001/dev_core_4429

dev/core#4429 Fix checking to see if a price option is able to be use…

2 years agoMerge pull request #26891 from colemanw/missingEntity2
colemanw [Mon, 24 Jul 2023 02:32:18 +0000 (19:32 -0700)]
Merge pull request #26891 from colemanw/missingEntity2

Managed - Log errors instead of throwing exceptions unless in debug mode

2 years agoManagedEntityTest - Look for the error... in a place where it will actually be...
Tim Otten [Mon, 24 Jul 2023 00:56:18 +0000 (17:56 -0700)]
ManagedEntityTest - Look for the error... in a place where it will actually be...

2 years agodev/core#4429 Fix checking to see if a price option is able to be used for CiviMember...
Seamus Lee [Sat, 22 Jul 2023 23:37:36 +0000 (09:37 +1000)]
dev/core#4429 Fix checking to see if a price option is able to be used for CiviMember or CiviEvent

2 years agoMerge pull request #26893 from demeritcowboy/mistaken-identity
Eileen McNaughton [Sun, 23 Jul 2023 22:49:27 +0000 (10:49 +1200)]
Merge pull request #26893 from demeritcowboy/mistaken-identity

dev/core#4441 - Incorrect error "There might be a data problem, contribution id could not be loaded from the line item"

2 years agofix
demeritcowboy [Fri, 21 Jul 2023 13:44:02 +0000 (09:44 -0400)]
fix

2 years agoCivi::log() - Show errors via session status-message (under right conditions)
Tim Otten [Fri, 21 Jul 2023 08:33:27 +0000 (01:33 -0700)]
Civi::log() - Show errors via session status-message (under right conditions)

1. The priority is 'error' (or something more severe)
2. The site has enabled debug output
3. The page-request message occurs while the session is available

2 years agoManagedEntities::onApiError - Log extension name and exception details
Tim Otten [Fri, 21 Jul 2023 08:17:36 +0000 (01:17 -0700)]
ManagedEntities::onApiError - Log extension name and exception details

2 years agoManaged - Log errors instead of throwing exceptions unless in debug mode
colemanw [Fri, 21 Jul 2023 01:53:39 +0000 (21:53 -0400)]
Managed - Log errors instead of throwing exceptions unless in debug mode

2 years agoMerge pull request #26882 from seamuslee001/5.64
colemanw [Wed, 19 Jul 2023 23:45:00 +0000 (16:45 -0700)]
Merge pull request #26882 from seamuslee001/5.64

dev/core#4439 Fix price set select broken price attr regression

2 years agoFix price set select broken price attr regression
larssandergreen [Tue, 18 Jul 2023 18:56:15 +0000 (12:56 -0600)]
Fix price set select broken price attr regression

2 years agoMerge pull request #26831 from totten/5.64-icon-path
Seamus Lee [Tue, 18 Jul 2023 22:43:34 +0000 (18:43 -0400)]
Merge pull request #26831 from totten/5.64-icon-path

(dev/core#4414) Greenwich - Fix icon path

2 years ago(dev/core#4414) Greenwich - Fix icon path
Tim Otten [Fri, 14 Jul 2023 23:30:59 +0000 (16:30 -0700)]
(dev/core#4414) Greenwich - Fix icon path

2 years agoMerge pull request #26811 from larssandergreen/Re-add-start-date-for-recurring-contri...
Eileen McNaughton [Fri, 14 Jul 2023 00:02:28 +0000 (12:02 +1200)]
Merge pull request #26811 from larssandergreen/Re-add-start-date-for-recurring-contributions-for-RC

Add start date back to recurring contributions display on contact - RC

2 years agoAdd start date back to recurring contributions display on contact
larssandergreen [Thu, 13 Jul 2023 22:47:43 +0000 (16:47 -0600)]
Add start date back to recurring contributions display on contact

2 years agoMerge pull request #26802 from eileenmcnaughton/564
Tim Otten [Thu, 13 Jul 2023 21:30:37 +0000 (14:30 -0700)]
Merge pull request #26802 from eileenmcnaughton/564

dev/core#4430 Fix regression on searching for emails

2 years agodev/core#4430 Fix regression on searching for emails
Eileen McNaughton [Thu, 13 Jul 2023 03:16:17 +0000 (15:16 +1200)]
dev/core#4430 Fix regression on searching for emails

2 years agoMerge pull request #26799 from totten/5.64-php74
Eileen McNaughton [Thu, 13 Jul 2023 02:19:29 +0000 (14:19 +1200)]
Merge pull request #26799 from totten/5.64-php74

System Requirements - Raise minimum recommended PHP to 7.4

2 years agoSystem Requirements - Raise minimum recommended PHP to 7.4
Tim Otten [Thu, 13 Jul 2023 01:02:54 +0000 (18:02 -0700)]
System Requirements - Raise minimum recommended PHP to 7.4

2 years agoMerge pull request #26796 from demeritcowboy/checkbox
Eileen McNaughton [Wed, 12 Jul 2023 07:47:18 +0000 (19:47 +1200)]
Merge pull request #26796 from demeritcowboy/checkbox

Fix two more broken checkboxes - PCP pages

2 years agofix checkboxes
demeritcowboy [Wed, 12 Jul 2023 03:34:04 +0000 (23:34 -0400)]
fix checkboxes

2 years agoMerge pull request #26790 from demeritcowboy/case-deleted
Eileen McNaughton [Tue, 11 Jul 2023 21:57:17 +0000 (09:57 +1200)]
Merge pull request #26790 from demeritcowboy/case-deleted

dev/core#4427 - Fix broken deleted filter checkbox on Manage Case

2 years agoMerge pull request #26788 from agh1/5.64.0-releasenotes-initial
Eileen McNaughton [Tue, 11 Jul 2023 21:56:08 +0000 (09:56 +1200)]
Merge pull request #26788 from agh1/5.64.0-releasenotes-initial

5.64.0 release notes initial run

2 years agoMerge pull request #26785 from eileenmcnaughton/trans_locale
Tim Otten [Tue, 11 Jul 2023 21:17:37 +0000 (14:17 -0700)]
Merge pull request #26785 from eileenmcnaughton/trans_locale

(dev/core#4409) Fix failure to fall back to site default language, if configured

2 years agofix broken checkbox
demeritcowboy [Tue, 11 Jul 2023 16:30:13 +0000 (12:30 -0400)]
fix broken checkbox

2 years ago5.64.0 release notes: added boilerplate
Andie Hunt [Tue, 11 Jul 2023 15:20:11 +0000 (11:20 -0400)]
5.64.0 release notes: added boilerplate

2 years ago5.64.0 release notes: raw from script
Andie Hunt [Tue, 11 Jul 2023 15:13:28 +0000 (11:13 -0400)]
5.64.0 release notes: raw from script

2 years agomessage_admin - If tpl is translated in default-locale, then it replaces "Standard...
Tim Otten [Tue, 11 Jul 2023 03:35:34 +0000 (20:35 -0700)]
message_admin - If tpl is translated in default-locale, then it replaces "Standard" tpl

2 years agomessage_admin - Fetch 'workflow_name' when displaying list view
Tim Otten [Tue, 11 Jul 2023 03:35:08 +0000 (20:35 -0700)]
message_admin - Fetch 'workflow_name' when displaying list view

2 years agoFix failure to fall back to site default language, if configured
Eileen McNaughton [Tue, 11 Jul 2023 00:16:28 +0000 (12:16 +1200)]
Fix failure to fall back to site default language, if configured

This addresses scenario 6 here
https://github.com/civicrm/civicrm-core/pull/26232#issuecomment-1624455432

2 years agoMerge pull request #26777 from eileenmcnaughton/mem_block
demeritcowboy [Mon, 10 Jul 2023 11:21:11 +0000 (07:21 -0400)]
Merge pull request #26777 from eileenmcnaughton/mem_block

Fix recent breakage on membershipBlock.tpl

2 years agoFix recent breakage on membershipBlock.tpl
Eileen McNaughton [Mon, 10 Jul 2023 01:17:09 +0000 (13:17 +1200)]
Fix recent breakage on membershipBlock.tpl

This was a recent commit of mine that I was working on at the airport.
I meant to come back to it landside but it got merged before I did,
with the result that we merged it in a broken state.

This fixes

2 years agoMerge pull request #26763 from larssandergreen/More-fixes-for-counting-to-ten-in...
demeritcowboy [Fri, 7 Jul 2023 12:45:34 +0000 (08:45 -0400)]
Merge pull request #26763 from larssandergreen/More-fixes-for-counting-to-ten-in-arrays

Fix PHP errors on profiles and custom fields when using options per line

2 years agoSet version to 5.64.beta1
CiviCRM [Fri, 7 Jul 2023 04:35:55 +0000 (04:35 +0000)]
Set version to 5.64.beta1

2 years agoMerge pull request #26232 from eileenmcnaughton/trans_locale
Tim Otten [Fri, 7 Jul 2023 04:23:19 +0000 (21:23 -0700)]
Merge pull request #26232 from eileenmcnaughton/trans_locale

dev/core#4409 Use translation for default language, if exists

2 years agoFix PHP errors on profiles and custom fields when using options per line
larssandergreen [Fri, 7 Jul 2023 03:54:48 +0000 (21:54 -0600)]
Fix PHP errors on profiles and custom fields when using options per line

2 years agoMerge pull request #26760 from seamuslee001/payment_processor_upgrade
Seamus Lee [Fri, 7 Jul 2023 02:33:31 +0000 (22:33 -0400)]
Merge pull request #26760 from seamuslee001/payment_processor_upgrade

dev/core#4418 Add in Upgrade script to fix double json encoding

2 years agoMerge pull request #26758 from seamuslee001/paymentprocessor_unit_test
colemanw [Fri, 7 Jul 2023 01:33:37 +0000 (18:33 -0700)]
Merge pull request #26758 from seamuslee001/paymentprocessor_unit_test

[REF] dev/core#4418 Add in Unit test of submitting the form to ensure…

2 years agoShift to using executeQuery rather than API to perform upgrade
Seamus Lee [Fri, 7 Jul 2023 01:26:52 +0000 (11:26 +1000)]
Shift to using executeQuery rather than API to perform upgrade

2 years ago[REF] dev/core#4418 Add in Unit test of submitting the form to ensure no double handl...
Seamus Lee [Thu, 6 Jul 2023 23:05:55 +0000 (09:05 +1000)]
[REF] dev/core#4418 Add in Unit test of submitting the form to ensure no double handling escaping

Remove deprecation notice as per coleman

Minor fixes to match the form better

2 years ago[REF] Ensure that test payment processors are captured by the test and in the upgrade...
Seamus Lee [Fri, 7 Jul 2023 00:21:48 +0000 (10:21 +1000)]
[REF] Ensure that test payment processors are captured by the test and in the upgrade script and fix upgrade scripts as per dave's comments

2 years agoMerge pull request #26755 from larssandergreen/Fix-Payment-Processor-accepted_credit_...
Seamus Lee [Thu, 6 Jul 2023 23:50:43 +0000 (19:50 -0400)]
Merge pull request #26755 from larssandergreen/Fix-Payment-Processor-accepted_credit_cards-regression

dev/core#4418 Fix Payment Processor accepted_credit_cards regression

2 years ago[REF] dev/core#4418 Add in Upgrade script to fix double json encoding
Seamus Lee [Thu, 6 Jul 2023 23:32:53 +0000 (09:32 +1000)]
[REF] dev/core#4418 Add in Upgrade script to fix double json encoding

2 years agoMerge pull request #26757 from demeritcowboy/index-10
demeritcowboy [Thu, 6 Jul 2023 23:37:53 +0000 (19:37 -0400)]
Merge pull request #26757 from demeritcowboy/index-10

dev/core#4419 - Crash on membership tab of contribution page config (should go into 5.64)

2 years agoMerge pull request #26749 from mlutfy/caseTypeNewLink
demeritcowboy [Thu, 6 Jul 2023 23:18:16 +0000 (19:18 -0400)]
Merge pull request #26749 from mlutfy/caseTypeNewLink

crmCaseType: fix New Case Type link visiblity in obscure circumstances

2 years agothere are no longer 10 non-numeric elements
demeritcowboy [Thu, 6 Jul 2023 22:52:03 +0000 (18:52 -0400)]
there are no longer 10 non-numeric elements

2 years agoFix Payment Processor accepted_credit_cards regression
larssandergreen [Thu, 6 Jul 2023 21:54:55 +0000 (15:54 -0600)]
Fix Payment Processor accepted_credit_cards regression

2 years agoMerge pull request #26753 from seamuslee001/master
Tim Otten [Thu, 6 Jul 2023 21:43:51 +0000 (14:43 -0700)]
Merge pull request #26753 from seamuslee001/master

5.63 late / after release changes

2 years agoMerge pull request #26754 from seamuslee001/revert_message_template_write_record
Seamus Lee [Thu, 6 Jul 2023 21:39:20 +0000 (17:39 -0400)]
Merge pull request #26754 from seamuslee001/revert_message_template_write_record

[REF] Use writeRecord in the revert function of MessageTemplate to en…

2 years agoCIVICRM-2150 CiviCRM 5.63.0 regression, Mailing click tracking now returns: Error...
Justin Freeman [Thu, 6 Jul 2023 07:08:56 +0000 (17:08 +1000)]
CIVICRM-2150 CiviCRM 5.63.0 regression, Mailing click tracking now returns: Error 500 malformed header from script 'url.php': Bad header for all tracked URLs

2 years ago(dev/core#4391) Prohibit uninstallation of core components
Tim Otten [Wed, 5 Jul 2023 19:42:47 +0000 (12:42 -0700)]
(dev/core#4391) Prohibit uninstallation of core components

2 years agoext/civi_*/info.xml - Tag as "component"
Tim Otten [Wed, 5 Jul 2023 19:51:11 +0000 (12:51 -0700)]
ext/civi_*/info.xml - Tag as "component"

2 years ago[REF] Use writeRecord in the revert function of MessageTemplate to ensure that pre...
Seamus Lee [Thu, 6 Jul 2023 20:59:50 +0000 (06:59 +1000)]
[REF] Use writeRecord in the revert function of MessageTemplate to ensure that pre and post hooks are called

2 years agoMerge pull request #26751 from larssandergreen/Remove-weird-profile-field-save-confir...
demeritcowboy [Thu, 6 Jul 2023 18:20:32 +0000 (14:20 -0400)]
Merge pull request #26751 from larssandergreen/Remove-weird-profile-field-save-confirm-message

Remove unneeded and strange profile field save success alert

2 years agoRemove unneeded and strange profile field save confirm alert
larssandergreen [Thu, 6 Jul 2023 17:40:49 +0000 (11:40 -0600)]
Remove unneeded and strange profile field save confirm alert

2 years agocrmCaseType: fix New Case Type link visiblity in obscure circumstances
Mathieu Lutfy [Thu, 6 Jul 2023 15:03:44 +0000 (11:03 -0400)]
crmCaseType: fix New Case Type link visiblity in obscure circumstances

2 years agoMerge pull request #26690 from eileenmcnaughton/block
Yashodha Chaku [Thu, 6 Jul 2023 14:50:33 +0000 (20:20 +0530)]
Merge pull request #26690 from eileenmcnaughton/block

Split MembershipBlock.tpl into 2

2 years agoMerge pull request #26745 from aydun/recur_metadata
colemanw [Thu, 6 Jul 2023 13:54:50 +0000 (06:54 -0700)]
Merge pull request #26745 from aydun/recur_metadata

Make the `recur_id` field of Contributions available to FormBuilder

2 years agoMake the `recur_id` field of Contributions available to FormBuilder
Aidan Saunders [Thu, 6 Jul 2023 06:36:44 +0000 (07:36 +0100)]
Make the `recur_id` field of Contributions available to FormBuilder

2 years agoMerge pull request #26744 from larssandergreen/Don't-remove-core-component-permission...
Tim Otten [Thu, 6 Jul 2023 04:16:32 +0000 (21:16 -0700)]
Merge pull request #26744 from larssandergreen/Don't-remove-core-component-permissions-on-flush

dev/core#4413 Don't remove core component permissions when disabled

2 years agoDon't remove core component permissions when disabled
larssandergreen [Wed, 5 Jul 2023 23:52:40 +0000 (17:52 -0600)]
Don't remove core component permissions when disabled

2 years agoUse translation for default language, if exists
Eileen McNaughton [Tue, 16 May 2023 04:07:14 +0000 (16:07 +1200)]
Use translation for default language, if exists

There is an assumption in the code that for the default language a translation is not used.

However, the features around draft versions are all set up around
translations, so it becomes necessary to create translations
even for the default language. This change ensures they are
used if they exist.

Although we have a lot of complexity in the translation framework
on the rendering side I think assuming that where stuff is configured
people configured it to be used is a good underlying principle.

2 years agoMerge pull request #26741 from artfulrobot/help-debug-afform-submissions
Eileen McNaughton [Wed, 5 Jul 2023 19:23:50 +0000 (07:23 +1200)]
Merge pull request #26741 from artfulrobot/help-debug-afform-submissions

NFC: Add debug level log message when afform submissions catch exceptions

2 years agoMerge pull request #26659 from mattwire/paymenttrxnid
Eileen McNaughton [Wed, 5 Jul 2023 19:08:13 +0000 (07:08 +1200)]
Merge pull request #26659 from mattwire/paymenttrxnid

Fix regression caused by 26620

2 years agoUse afform log channel
Rich Lott [Wed, 5 Jul 2023 16:41:49 +0000 (17:41 +0100)]
Use afform log channel

2 years agoAdd debug level log message when afform submissions catch exceptions
Rich Lott / Artful Robot [Wed, 5 Jul 2023 15:57:47 +0000 (16:57 +0100)]
Add debug level log message when afform submissions catch exceptions

The code comments suggest we don't really know what to do here,
previously we did nothing, which was not helpful to a developer
trying to figure out why their code did nothing.

Now we emit the exception's message to the log file.

2 years agoMerge pull request #26190 from eileenmcnaughton/lang_fallback
colemanw [Wed, 5 Jul 2023 13:01:22 +0000 (06:01 -0700)]
Merge pull request #26190 from eileenmcnaughton/lang_fallback

Fix Translation to load related language more reliably

2 years agoMerge pull request #26740 from eileenmcnaughton/api_fix
colemanw [Wed, 5 Jul 2023 12:59:39 +0000 (05:59 -0700)]
Merge pull request #26740 from eileenmcnaughton/api_fix

Fix apiv4 bug on custom fields with spaces in name

2 years agoMerge pull request #26733 from aydun/adminui_mailsettings
colemanw [Wed, 5 Jul 2023 12:57:27 +0000 (05:57 -0700)]
Merge pull request #26733 from aydun/adminui_mailsettings

AdminUI: Convert Mail Accounts page civicrm/admin/mailSettings

2 years agoMerge pull request #26737 from eileenmcnaughton/trxn
Matthew Wire [Wed, 5 Jul 2023 09:11:59 +0000 (10:11 +0100)]
Merge pull request #26737 from eileenmcnaughton/trxn

Update related contribution trxn_id before sending email [must go into 5.64]

2 years agoAdminUI: Convert Mail Accounts page civicrm/admin/mailSettings
Aidan Saunders [Tue, 4 Jul 2023 23:10:46 +0000 (00:10 +0100)]
AdminUI: Convert Mail Accounts page civicrm/admin/mailSettings
Make MailSettings available to SearchKit

2 years agoFix apiv4 bug on custom fields with spaces in name
Eileen McNaughton [Sat, 1 Jul 2023 04:21:01 +0000 (21:21 -0700)]
Fix apiv4 bug on custom fields with spaces in name

2 years agoMerge pull request #26738 from civicrm/5.63
Eileen McNaughton [Wed, 5 Jul 2023 05:16:09 +0000 (17:16 +1200)]
Merge pull request #26738 from civicrm/5.63

5.63

2 years agoMerge pull request #26735 from eileenmcnaughton/merge_perms
demeritcowboy [Wed, 5 Jul 2023 03:57:08 +0000 (23:57 -0400)]
Merge pull request #26735 from eileenmcnaughton/merge_perms

Fix recent regression - Use consistent value for checkPermissions in merger

2 years agoMerge pull request #26684 from artfulrobot/standalone-login-ux
Tim Otten [Wed, 5 Jul 2023 03:46:57 +0000 (20:46 -0700)]
Merge pull request #26684 from artfulrobot/standalone-login-ux

Standalone login ux

2 years agoMerge pull request #26736 from eileenmcnaughton/weight_3
demeritcowboy [Wed, 5 Jul 2023 03:38:40 +0000 (23:38 -0400)]
Merge pull request #26736 from eileenmcnaughton/weight_3

Fix another place weight is not passed

2 years agoMerge pull request #26734 from eileenmcnaughton/weight_2
colemanw [Wed, 5 Jul 2023 03:02:08 +0000 (20:02 -0700)]
Merge pull request #26734 from eileenmcnaughton/weight_2

Remove unused variables, fix a couple of ==

2 years agoUpdate related contribution trxn_id before sending email
Eileen McNaughton [Wed, 5 Jul 2023 01:39:42 +0000 (13:39 +1200)]
Update related contribution trxn_id before sending email

This will allow https://github.com/civicrm/civicrm-core/pull/26659 to pass & merge