civicrm-core.git
14 months agoFix EmailMode
Eileen McNaughton [Fri, 15 Sep 2023 00:01:13 +0000 (12:01 +1200)]
Fix EmailMode

14 months agoFix customData Include notice
Eileen McNaughton [Thu, 14 Sep 2023 23:59:40 +0000 (11:59 +1200)]
Fix customData Include notice

14 months agoAdd getEventID() - this is part of an effort to ensure consistency
Eileen McNaughton [Thu, 14 Sep 2023 23:42:32 +0000 (11:42 +1200)]
Add getEventID() - this is part of an effort to ensure consistency

All event & participant forms should have public api functions for
getParticipantID() and getEventID() (participant ID
not so relevant here

14 months agoRemove unused variable
Eileen McNaughton [Thu, 14 Sep 2023 23:37:05 +0000 (11:37 +1200)]
Remove unused variable

14 months agoFix another EventInfo notice
Eileen McNaughton [Thu, 14 Sep 2023 23:32:48 +0000 (11:32 +1200)]
Fix another EventInfo notice

14 months agoMerge pull request #27423 from eileenmcnaughton/notice_it
Eileen McNaughton [Thu, 14 Sep 2023 23:15:39 +0000 (11:15 +1200)]
Merge pull request #27423 from eileenmcnaughton/notice_it

Fix notice on phone_ext

14 months agoFix notice on phone_ext
Eileen McNaughton [Thu, 14 Sep 2023 21:52:06 +0000 (09:52 +1200)]
Fix notice on phone_ext

14 months agoMerge pull request #27294 from colemanw/afformDataType
Kurund Jalmi [Thu, 14 Sep 2023 16:16:00 +0000 (17:16 +0100)]
Merge pull request #27294 from colemanw/afformDataType

Afform - Fix getting and setting boolean/numeric types

14 months agoMerge pull request #27366 from eileenmcnaughton/CRM
Yashodha Chaku [Thu, 14 Sep 2023 06:55:21 +0000 (12:25 +0530)]
Merge pull request #27366 from eileenmcnaughton/CRM

Remove always true if for required role_id field, add test for value

14 months agoMerge pull request #27421 from demeritcowboy/desc
Seamus Lee [Thu, 14 Sep 2023 00:55:30 +0000 (10:55 +1000)]
Merge pull request #27421 from demeritcowboy/desc

Revert just merged 27412

14 months agoRevert "Fix notice on Membership Component Settings page"
demeritcowboy [Thu, 14 Sep 2023 00:37:11 +0000 (20:37 -0400)]
Revert "Fix notice on Membership Component Settings page"

This reverts commit e3f43b1ab5af0d3cf1063ee45805b3c6b66b6c4c.

14 months agoMerge pull request #27412 from eileenmcnaughton/admin_notice
Seamus Lee [Thu, 14 Sep 2023 00:09:50 +0000 (10:09 +1000)]
Merge pull request #27412 from eileenmcnaughton/admin_notice

Fix notice on Membership Component Settings page

14 months agoMerge pull request #27419 from eileenmcnaughton/no_push
demeritcowboy [Wed, 13 Sep 2023 21:02:25 +0000 (17:02 -0400)]
Merge pull request #27419 from eileenmcnaughton/no_push

Remove legacy error handling

14 months agoMerge pull request #27420 from larssandergreen/follow-up-to-add-comment-on-custom...
demeritcowboy [Wed, 13 Sep 2023 21:01:44 +0000 (17:01 -0400)]
Merge pull request #27420 from larssandergreen/follow-up-to-add-comment-on-custom-field-move

(NFC) Add comment for IS NOT NULL in moving custom fields

14 months agoMerge pull request #27418 from demeritcowboy/reg
colemanw [Wed, 13 Sep 2023 20:57:54 +0000 (16:57 -0400)]
Merge pull request #27418 from demeritcowboy/reg

regen

14 months agoAdd comment for IS NOT NULL in moving custom fields
larssandergreen [Wed, 13 Sep 2023 20:23:42 +0000 (14:23 -0600)]
Add comment for IS NOT NULL in moving custom fields

14 months agoRemove legacy error handling
Eileen McNaughton [Wed, 13 Sep 2023 19:43:27 +0000 (07:43 +1200)]
Remove legacy error handling

Our practice now is to throw exceptions - this results in a hard
fatal within apiv4 usage

14 months agoMerge pull request #27413 from larssandergreen/Don't-copy-nulls-when-moving-custom...
demeritcowboy [Wed, 13 Sep 2023 19:38:40 +0000 (15:38 -0400)]
Merge pull request #27413 from larssandergreen/Don't-copy-nulls-when-moving-custom-fields

dev/core#4568 Don't copy nulls when moving custom fields

14 months agoregen
demeritcowboy [Wed, 13 Sep 2023 19:24:52 +0000 (15:24 -0400)]
regen

14 months agoMerge pull request #27400 from eileenmcnaughton/legacy
demeritcowboy [Wed, 13 Sep 2023 19:15:06 +0000 (15:15 -0400)]
Merge pull request #27400 from eileenmcnaughton/legacy

dev/core#4112 stop installing legacycustomsearches on new installs

14 months agoMerge pull request #27416 from larssandergreen/Weights-for-custom-field-sets-page
demeritcowboy [Wed, 13 Sep 2023 19:04:49 +0000 (15:04 -0400)]
Merge pull request #27416 from larssandergreen/Weights-for-custom-field-sets-page

Weights for custom field groups page

14 months agoWeights for custom field groups page
larssandergreen [Wed, 13 Sep 2023 16:43:39 +0000 (10:43 -0600)]
Weights for custom field groups page

14 months agoMerge pull request #27415 from PrzemyslawTabor/india-provinces
colemanw [Wed, 13 Sep 2023 16:02:35 +0000 (12:02 -0400)]
Merge pull request #27415 from PrzemyslawTabor/india-provinces

India-provinces update outdated provinces abbreviations

14 months agoMerge pull request #27411 from colemanw/civiGrantCleanup
colemanw [Wed, 13 Sep 2023 14:44:53 +0000 (10:44 -0400)]
Merge pull request #27411 from colemanw/civiGrantCleanup

CiviGrant - Cleanup and simplify grant form, remove unused tab code

14 months agoIndia-provinces update outdated provinces abbreviations
ptabor [Wed, 13 Sep 2023 14:43:02 +0000 (16:43 +0200)]
India-provinces update outdated provinces abbreviations

14 months agoMerge pull request #27414 from pradpnayak/entitybatch
colemanw [Wed, 13 Sep 2023 14:21:07 +0000 (10:21 -0400)]
Merge pull request #27414 from pradpnayak/entitybatch

Add Entity batch to Search kit

14 months agoAdd Entity batch to Search kit
Pradeep Nayak [Wed, 13 Sep 2023 13:10:11 +0000 (14:10 +0100)]
Add Entity batch to Search kit

14 months agoDon't copy nulls when moving custom fields
larssandergreen [Wed, 13 Sep 2023 04:41:30 +0000 (22:41 -0600)]
Don't copy nulls when moving custom fields

14 months agoFix notice on Membership Component Settings page
Eileen McNaughton [Wed, 13 Sep 2023 02:51:14 +0000 (14:51 +1200)]
Fix notice on Membership Component Settings page

14 months agoCiviGrant - Cleanup and simplify grant form, remove unused tab code
colemanw [Wed, 13 Sep 2023 01:24:32 +0000 (21:24 -0400)]
CiviGrant - Cleanup and simplify grant form, remove unused tab code

Deletes unused code for the contact summary tab (now handled by SearchKit).
Simplifies overcomplicated form context and detangles form embedded in page.

14 months agoCiviGrant - Add missing note_used_for metadata
colemanw [Wed, 13 Sep 2023 01:22:55 +0000 (21:22 -0400)]
CiviGrant - Add missing note_used_for metadata

14 months agoMerge pull request #27406 from larssandergreen/Fix-MoveField-PHP-error
Eileen McNaughton [Tue, 12 Sep 2023 19:13:49 +0000 (07:13 +1200)]
Merge pull request #27406 from larssandergreen/Fix-MoveField-PHP-error

Fix MoveField PHP notice

14 months agoMerge pull request #27396 from colemanw/addNoteNote
colemanw [Tue, 12 Sep 2023 18:41:33 +0000 (14:41 -0400)]
Merge pull request #27396 from colemanw/addNoteNote

Metadata - Add "civicrm_note" to "note_used_for" option group

14 months agoFix MoveField PHP error
larssandergreen [Tue, 12 Sep 2023 17:28:01 +0000 (11:28 -0600)]
Fix MoveField PHP error

14 months agoDAO - Prevent recursion adding acl clause to entity that references itself
colemanw [Tue, 12 Sep 2023 16:30:01 +0000 (12:30 -0400)]
DAO - Prevent recursion adding acl clause to entity that references itself

14 months agoMetadata - Add "civicrm_note" to "note_used_for" option group
colemanw [Tue, 12 Sep 2023 01:45:41 +0000 (21:45 -0400)]
Metadata - Add "civicrm_note" to "note_used_for" option group

14 months agoMerge pull request #27389 from colemanw/coreManaged
colemanw [Tue, 12 Sep 2023 14:45:30 +0000 (10:45 -0400)]
Merge pull request #27389 from colemanw/coreManaged

Scan core `civicrm/managed` directory for entity declarations

14 months agoMerge pull request #27402 from eileenmcnaughton/pledge_pay
colemanw [Tue, 12 Sep 2023 14:45:06 +0000 (10:45 -0400)]
Merge pull request #27402 from eileenmcnaughton/pledge_pay

Smarty notices - Fix a couple more templates to look for elements not a variable that says the element is present

14 months agoMerge pull request #27403 from eileenmcnaughton/php8
colemanw [Tue, 12 Sep 2023 14:30:55 +0000 (10:30 -0400)]
Merge pull request #27403 from eileenmcnaughton/php8

dev/core#4421 Fix some attempts to count NULL (php8.x)

14 months agoScan core `civicrm/managed` directory for entity declarations
colemanw [Sun, 10 Sep 2023 22:51:58 +0000 (18:51 -0400)]
Scan core `civicrm/managed` directory for entity declarations

Switch to a more complete module option list using CRM_Core_Module::getAll()

14 months agoMerge pull request #27392 from totten/master-module-label
colemanw [Tue, 12 Sep 2023 14:04:45 +0000 (10:04 -0400)]
Merge pull request #27392 from totten/master-module-label

CRM_Core_Module - Generate optional `$label` property

14 months agodev/core#4421 Fix some attempts to count NULL (php8.x)
Eileen McNaughton [Tue, 12 Sep 2023 05:29:00 +0000 (17:29 +1200)]
dev/core#4421 Fix some attempts to count NULL (php8.x)

14 months agoGenerate `$label`s for modules in `Drupal8` (D8/9/10)
Tim Otten [Tue, 12 Sep 2023 00:22:21 +0000 (17:22 -0700)]
Generate `$label`s for modules in `Drupal8` (D8/9/10)

14 months agoGenerate `$label`s for modules in `DrupalBase` (D7/Backdrop)
Tim Otten [Tue, 12 Sep 2023 00:09:17 +0000 (17:09 -0700)]
Generate `$label`s for modules in `DrupalBase` (D7/Backdrop)

14 months agoFix a couple more templates to look for elements not a variable that says the element...
Eileen McNaughton [Tue, 12 Sep 2023 03:43:15 +0000 (15:43 +1200)]
Fix a couple more templates to look for elements not a variable that says the element is present

14 months agoMerge pull request #27401 from civicrm/5.66
Eileen McNaughton [Tue, 12 Sep 2023 03:16:21 +0000 (15:16 +1200)]
Merge pull request #27401 from civicrm/5.66

5.66 to master

14 months agoMerge pull request #27399 from colemanw/fixContactJoin
Eileen McNaughton [Tue, 12 Sep 2023 03:15:37 +0000 (15:15 +1200)]
Merge pull request #27399 from colemanw/fixContactJoin

APIv4: Implicit joins for email_primary, etc cause error

14 months agoMerge pull request #27398 from eileenmcnaughton/noticey
Eileen McNaughton [Tue, 12 Sep 2023 03:12:20 +0000 (15:12 +1200)]
Merge pull request #27398 from eileenmcnaughton/noticey

Add test cover for handling of returnPath

14 months agodev/core#4112 stop installing legacycustomsearches on new installs
Eileen McNaughton [Tue, 12 Sep 2023 03:09:12 +0000 (15:09 +1200)]
dev/core#4112 stop installing legacycustomsearches on new installs

14 months agoGenerate $label for module-extensions
Tim Otten [Tue, 12 Sep 2023 00:08:41 +0000 (17:08 -0700)]
Generate $label for module-extensions

14 months agoCRM_Core_Module - Add optional $label property
Tim Otten [Tue, 12 Sep 2023 00:08:22 +0000 (17:08 -0700)]
CRM_Core_Module - Add optional $label property

14 months agoMerge pull request #27379 from colemanw/fileApi
Eileen McNaughton [Tue, 12 Sep 2023 02:46:10 +0000 (14:46 +1200)]
Merge pull request #27379 from colemanw/fileApi

Api4 - Enable file attachments to be displayed in SearchKit

14 months agoAdd test cover for handling of returnPath
Eileen McNaughton [Tue, 12 Sep 2023 02:29:00 +0000 (14:29 +1200)]
Add test cover for handling of returnPath

14 months agoFix dev/core#4562 - APIv4: Implicit joins for email_primary, etc cause error
colemanw [Tue, 12 Sep 2023 02:32:06 +0000 (22:32 -0400)]
Fix dev/core#4562 - APIv4: Implicit joins for email_primary, etc cause error

14 months agoMerge pull request #27241 from eileenmcnaughton/type_2
colemanw [Tue, 12 Sep 2023 02:25:51 +0000 (22:25 -0400)]
Merge pull request #27241 from eileenmcnaughton/type_2

php 8.x Use internal property rather than undefined _type

14 months agoMerge pull request #27397 from civicrm/5.66
Eileen McNaughton [Tue, 12 Sep 2023 02:15:03 +0000 (14:15 +1200)]
Merge pull request #27397 from civicrm/5.66

5.66 to master

14 months agoMerge pull request #27395 from eileenmcnaughton/weight
Eileen McNaughton [Tue, 12 Sep 2023 02:14:53 +0000 (14:14 +1200)]
Merge pull request #27395 from eileenmcnaughton/weight

Fix weight notices on ActivityType (option values) pages

14 months agoMerge pull request #27394 from eileenmcnaughton/zet
Eileen McNaughton [Tue, 12 Sep 2023 02:12:40 +0000 (14:12 +1200)]
Merge pull request #27394 from eileenmcnaughton/zet

Revert "[REF] Update Zetacomponents/mail to be 1.9.5 to fix email validation handling"

14 months agoAPIv4 - Giving up on fine-grained File ACLs for now
colemanw [Mon, 11 Sep 2023 23:17:40 +0000 (19:17 -0400)]
APIv4 - Giving up on fine-grained File ACLs for now

14 months agoAPIv4 - Fix rendering GROUP_CONTACT(UNIQUE) with field suffix
colemanw [Mon, 11 Sep 2023 20:58:51 +0000 (16:58 -0400)]
APIv4 - Fix rendering GROUP_CONTACT(UNIQUE) with field suffix

14 months agoSearchKit - Support aggregated styles in links
colemanw [Mon, 11 Sep 2023 19:52:14 +0000 (15:52 -0400)]
SearchKit - Support aggregated styles in links

14 months agoSearchKit - Support aggregated icon fields
colemanw [Mon, 11 Sep 2023 19:04:56 +0000 (15:04 -0400)]
SearchKit - Support aggregated icon fields

14 months agoAPIv4 - Support output_formatters with aggregated columns
colemanw [Sun, 10 Sep 2023 22:39:31 +0000 (18:39 -0400)]
APIv4 - Support output_formatters with aggregated columns

14 months agoAPIv4 - Enforce ACLs for File entity, dedupe ACL clauses for bridge entities
colemanw [Sun, 10 Sep 2023 17:57:12 +0000 (13:57 -0400)]
APIv4 - Enforce ACLs for File entity, dedupe ACL clauses for bridge entities

14 months agoAPIv4 - Improve performance with explicit join ACL query deduping
colemanw [Fri, 8 Sep 2023 19:11:43 +0000 (15:11 -0400)]
APIv4 - Improve performance with explicit join ACL query deduping

14 months agoApi4 - Enable file attachments to be displayed in SearchKit
colemanw [Thu, 7 Sep 2023 17:32:04 +0000 (13:32 -0400)]
Api4 - Enable file attachments to be displayed in SearchKit

14 months agoFile - Update completely wrong docblock.
colemanw [Wed, 6 Sep 2023 18:31:12 +0000 (14:31 -0400)]
File - Update completely wrong docblock.

Before: Function does the opposite of what the docblock says it does with .unknown suffixes.
After: Docblock accurately says what the function does.

14 months agoFix weight notices on ActivityType (option values) pages
Eileen McNaughton [Tue, 12 Sep 2023 01:45:35 +0000 (13:45 +1200)]
Fix weight notices on ActivityType (option values) pages

14 months agoMerge pull request #27393 from colemanw/conformanceTestFix
Eileen McNaughton [Tue, 12 Sep 2023 01:39:44 +0000 (13:39 +1200)]
Merge pull request #27393 from colemanw/conformanceTestFix

APIv4 - Fix conformance test for entities with multiple primary keys

14 months agoMerge pull request #27356 from eileenmcnaughton/body
colemanw [Tue, 12 Sep 2023 01:16:37 +0000 (21:16 -0400)]
Merge pull request #27356 from eileenmcnaughton/body

dev/core#2800 Fix bounce processing to handle verp emails

14 months agoRevert "[REF] Update Zetacomponents/mail to be 1.9.5 to fix email validation handling"
Eileen McNaughton [Tue, 12 Sep 2023 01:10:28 +0000 (13:10 +1200)]
Revert "[REF] Update Zetacomponents/mail to be 1.9.5 to fix email validation handling"

This reverts commit 020a1178ac869e64691c4e5fd49ee09f01d8f194.

14 months agoAPIv4 - Fix conformance test for entities with multiple primary keys
colemanw [Tue, 12 Sep 2023 01:04:30 +0000 (21:04 -0400)]
APIv4 - Fix conformance test for entities with multiple primary keys

14 months agoMerge pull request #27385 from mlutfy/versionCheckSid
demeritcowboy [Tue, 12 Sep 2023 00:28:43 +0000 (20:28 -0400)]
Merge pull request #27385 from mlutfy/versionCheckSid

VersionCheck: replace hash by sid, add the environment

14 months agoAfform - Fix js error when setting default value for the first time
colemanw [Mon, 11 Sep 2023 23:58:50 +0000 (19:58 -0400)]
Afform - Fix js error when setting default value for the first time

14 months agoAfform - Fix getting and setting boolean/numeric types
colemanw [Mon, 4 Sep 2023 20:12:44 +0000 (16:12 -0400)]
Afform - Fix getting and setting boolean/numeric types

Fixes dev/core#4465
Replaces https://github.com/civicrm/civicrm-core/pull/27006

14 months agoAdd detail about bounce to activity
Eileen McNaughton [Mon, 11 Sep 2023 22:13:10 +0000 (10:13 +1200)]
Add detail about bounce to activity

Note adding fetch_activities to the test exposed a mysql error so I had
to add handling there

14 months agoUse bounce activity type, if exists
Eileen McNaughton [Mon, 11 Sep 2023 20:33:33 +0000 (08:33 +1200)]
Use bounce activity type, if exists

We can look at adding in upgrade script in later version after bedding in

14 months agoMerge pull request #27240 from eileenmcnaughton/type
colemanw [Mon, 11 Sep 2023 20:46:25 +0000 (16:46 -0400)]
Merge pull request #27240 from eileenmcnaughton/type

Use internal variable rather than undeclared property

14 months agoMove handling of empty from obscure function to main email handler class
Eileen McNaughton [Thu, 7 Sep 2023 08:47:59 +0000 (20:47 +1200)]
Move handling of empty from obscure function to main email handler class

I wondered if the zeta components update would make this fix obsolete but adding
a test  says not...

So this locks in the fix on
https://issues.civicrm.org/jira/browse/CRM-19215

14 months agoMove from handling to processor, test
Eileen McNaughton [Thu, 7 Sep 2023 02:17:05 +0000 (14:17 +1200)]
Move from handling to processor, test

14 months agodev/core#2800 Fix bounce processing to handle verp emails
Eileen McNaughton [Thu, 7 Sep 2023 08:08:17 +0000 (20:08 +1200)]
dev/core#2800 Fix bounce processing to handle verp emails

This fixes 2 issues when combining bounce processing with verp emails

1) the emails being processed are being matched to email they come from -
ie the verp email. Hence the created activities are not linked to the
actual contact and instead create endless variants of the sender.
This happens with both the job.process_activities job and with
job.fetch_bounces with is_create_activities = TRUE.
This fix adapts the handling to identify verp emails (using existing regex)
and look up the contact ID from the mailing_event_queue. This is
used as the source (I didn't add a target or assignee at this stage cos
I wasn't sure if that was just data-cruft or useful stuff - but it would
be retrieved from the mailing)

2) this second one is a doozy & probably only showed up in tests because the
tests mostly cover obscure email formats. The create activities code does
a call to get the body and attachments using a function that looks like it
came from a tutorial on how to best use ezcmail. It seems to parse
all the email variants and attachments and, importantly, moves those attachments
to the civicrm files as part of creating the activity.

The code used to getBody() for bounces looks like it was ... written by us.
It does a subset of the processing in earlier call to get body and in
many of our test cases falls back on a blunt generateBody(). This call parses the
email, including the attachments, which are no longer there cos they got moved....
so it fatals.

I dug into the 2 functions and I feel pretty sure the bounce one doesn't add any
additional value but DOES have less capability than the other. So I removed that code,

Unfortunately the person received weird email from Exchange 2003 did not log
the headers https://issues.civicrm.org/jira/browse/CRM-9361 - but even if the
preferred version of the function doesn't parse that there is default text so
it won't fail & it seems like the risk of having a bit less info about an (untested)
obscure email bounce body is not that probematic

14 months agoMerge pull request #27332 from larssandergreen/Show-payment-block-if-payment_instrume...
Yashodha Chaku [Mon, 11 Sep 2023 18:17:03 +0000 (23:47 +0530)]
Merge pull request #27332 from larssandergreen/Show-payment-block-if-payment_instrument_id

dev/core #4556 Show payment block if payment_instrument_id already set

14 months agoAdd test for participant role, check mail
Eileen McNaughton [Thu, 7 Sep 2023 21:45:39 +0000 (09:45 +1200)]
Add test for participant role, check mail

14 months agoRemove always true if
Eileen McNaughton [Thu, 7 Sep 2023 21:13:26 +0000 (09:13 +1200)]
Remove always true if

This removes an if that is always true

role_id is a required field on the participant form and the register from
search that extends it - so we don't need to check if it is filled out.

In addition we know that it is always an array because that's just the type of field it is.

Removing handling for pre-select 2 makes the code clearer...

14 months agoMerge pull request #27388 from colemanw/disableGetForCheckAccess
Seamus Lee [Mon, 11 Sep 2023 00:54:22 +0000 (10:54 +1000)]
Merge pull request #27388 from colemanw/disableGetForCheckAccess

Disable broken unit test

14 months agoDocument that civi.api4.authorizeRecord does not work for get actions
colemanw [Mon, 11 Sep 2023 00:20:35 +0000 (20:20 -0400)]
Document that civi.api4.authorizeRecord does not work for get actions

14 months agoMerge pull request #27386 from civicrm/5.66
Eileen McNaughton [Sun, 10 Sep 2023 21:29:45 +0000 (09:29 +1200)]
Merge pull request #27386 from civicrm/5.66

5.66

14 months agoMerge pull request #27384 from eileenmcnaughton/566test
Seamus Lee [Sun, 10 Sep 2023 20:54:40 +0000 (06:54 +1000)]
Merge pull request #27384 from eileenmcnaughton/566test

Add email helper to new form test helper

14 months agoVersionCheck: replace hash by sid
Mathieu Lu [Sun, 10 Sep 2023 15:07:06 +0000 (11:07 -0400)]
VersionCheck: replace hash by sid

14 months agoMerge pull request #27383 from larssandergreen/Fix-SearchDisplay-totals
colemanw [Sun, 10 Sep 2023 15:04:38 +0000 (11:04 -0400)]
Merge pull request #27383 from larssandergreen/Fix-SearchDisplay-totals

dev/core#4559 Don't include test, template, deleted entities in SearchDisplay totals

14 months agoMerge pull request #27381 from sebalis/dev_core_4542_sebalis
colemanw [Sun, 10 Sep 2023 14:55:19 +0000 (10:55 -0400)]
Merge pull request #27381 from sebalis/dev_core_4542_sebalis

dev/core#4542 Fix priority handling in ACLs when dealing with objects…

14 months agoAdd email helper to new form test helper
Eileen McNaughton [Sat, 9 Sep 2023 23:39:16 +0000 (11:39 +1200)]
Add email helper to new form test helper

14 months agoDon't include test, template, deleted entities in searchdisplay totals
larssandergreen [Sun, 10 Sep 2023 00:48:39 +0000 (18:48 -0600)]
Don't include test, template, deleted entities in searchdisplay totals

14 months agoMerge pull request #27382 from mlutfy/getStartedStatus
Eileen McNaughton [Sat, 9 Sep 2023 23:00:36 +0000 (11:00 +1200)]
Merge pull request #27382 from mlutfy/getStartedStatus

GettingStarted: add token for System Status

14 months agoGettingStarted: add token for System Status
Mathieu Lu [Sat, 9 Sep 2023 18:44:38 +0000 (14:44 -0400)]
GettingStarted: add token for System Status

14 months agoadd change to ACLPermissionTest.php from original pull request
sebalis [Sat, 9 Sep 2023 01:19:13 +0000 (03:19 +0200)]
add change to ACLPermissionTest.php from original pull request

Co-authored-by: Seamus Lee <seamuslee001@gmail.com>
14 months agodev/core#4542 Fix priority handling in ACLs when dealing with objects other than...
sebalis [Sat, 9 Sep 2023 00:56:50 +0000 (02:56 +0200)]
dev/core#4542 Fix priority handling in ACLs when dealing with objects other than contacts, and remove code duplication

Co-authored-by: Seamus Lee <seamuslee001@gmail.com>
14 months agoMerge pull request #27369 from eileenmcnaughton/contribute
Yashodha Chaku [Fri, 8 Sep 2023 17:05:53 +0000 (22:35 +0530)]
Merge pull request #27369 from eileenmcnaughton/contribute

Remove unnecessary contributeMode reference - just present trxn_id if defined

14 months agoMerge pull request #27325 from eileenmcnaughton/fee_label
Eileen McNaughton [Fri, 8 Sep 2023 04:30:53 +0000 (16:30 +1200)]
Merge pull request #27325 from eileenmcnaughton/fee_label

Standardise fee_label in event workflow messages

14 months agoMerge pull request #27376 from civicrm/up-merge
Eileen McNaughton [Fri, 8 Sep 2023 04:05:39 +0000 (16:05 +1200)]
Merge pull request #27376 from civicrm/up-merge

5.66 to master