civicrm-core.git
2 years agofix fatal error on custom data import
Pradeep Nayak [Tue, 30 May 2023 16:25:37 +0000 (17:25 +0100)]
fix fatal error on custom data import

2 years agoMerge pull request #26352 from colemanw/groupChildren
Aidan Saunders [Tue, 30 May 2023 10:57:08 +0000 (11:57 +0100)]
Merge pull request #26352 from colemanw/groupChildren

APIv4 - Add metadata to `Group.children` column and `GroupNesting` entity

2 years agoMerge pull request #26260 from samuelsov/baogroup
colemanw [Mon, 29 May 2023 18:33:19 +0000 (14:33 -0400)]
Merge pull request #26260 from samuelsov/baogroup

Fix problem with group.update api

2 years agoMerge pull request #26371 from mattwire/cleanupvars
demeritcowboy [Mon, 29 May 2023 17:39:45 +0000 (13:39 -0400)]
Merge pull request #26371 from mattwire/cleanupvars

Cleanup unused variables etc on membership form

2 years agoMerge pull request #26370 from braders/getSiteDefaultCountry-property
demeritcowboy [Mon, 29 May 2023 17:31:04 +0000 (13:31 -0400)]
Merge pull request #26370 from braders/getSiteDefaultCountry-property

[REF][PHP8.2] Declare getSiteDefaultCountry property

2 years agoMerge pull request #26369 from braders/php82-website-test
demeritcowboy [Mon, 29 May 2023 17:28:35 +0000 (13:28 -0400)]
Merge pull request #26369 from braders/php82-website-test

[REF][PHP8.2] Avoid unnecessary property in WebsiteTest

2 years agoMerge pull request #26368 from braders/standard-variable
demeritcowboy [Mon, 29 May 2023 17:27:36 +0000 (13:27 -0400)]
Merge pull request #26368 from braders/standard-variable

[REF][PHP8.2] Replace property with variable in OrderTest

2 years agoMerge pull request #26367 from reflexive-communications/statemachine-extra-param
demeritcowboy [Mon, 29 May 2023 17:26:06 +0000 (13:26 -0400)]
Merge pull request #26367 from reflexive-communications/statemachine-extra-param

[REF] CRM_Core_StateMachine::addSequentialPages(): don't pass extra parameter

2 years agoMerge pull request #26358 from larssandergreen/Clean-up-Additional-Payment-forms
demeritcowboy [Mon, 29 May 2023 17:14:31 +0000 (13:14 -0400)]
Merge pull request #26358 from larssandergreen/Clean-up-Additional-Payment-forms

Don't show refund due when balance is owed on Additional Payments

2 years agoMerge pull request #26361 from colemanw/invasive
demeritcowboy [Mon, 29 May 2023 16:57:23 +0000 (12:57 -0400)]
Merge pull request #26361 from colemanw/invasive

[TEST ONLY] APIv4 - Update tests to use new Invasive helper

2 years agoCleanup unused variables etc
Matthew Wire [Mon, 29 May 2023 16:11:37 +0000 (17:11 +0100)]
Cleanup unused variables etc

2 years ago[REF][PHP8.2] Declare siteDefaultCountry property
Bradley Taylor [Mon, 29 May 2023 15:59:13 +0000 (16:59 +0100)]
[REF][PHP8.2] Declare siteDefaultCountry property

2 years ago[REF][PHP8.2] Avoid unnecessary property in WebsiteTest
Bradley Taylor [Mon, 29 May 2023 15:21:48 +0000 (16:21 +0100)]
[REF][PHP8.2] Avoid unnecessary property in WebsiteTest

2 years agoGroupNestingCache refresh for multisites
Samuel Vanhove [Mon, 29 May 2023 15:15:04 +0000 (11:15 -0400)]
GroupNestingCache refresh for multisites

2 years agoReplace property with variable in OrderTest
Bradley Taylor [Mon, 29 May 2023 15:06:53 +0000 (16:06 +0100)]
Replace property with variable in OrderTest

2 years agoCRM_Core_StateMachine::addSequentialPages(): don't pass extra action parameter
Sandor Semsey [Mon, 29 May 2023 09:14:49 +0000 (11:14 +0200)]
CRM_Core_StateMachine::addSequentialPages(): don't pass extra action parameter

2 years agoMerge pull request #25871 from colemanw/searchKitEntity
Eileen McNaughton [Sun, 28 May 2023 22:19:40 +0000 (10:19 +1200)]
Merge pull request #25871 from colemanw/searchKitEntity

SearchKit - Add display of type `entity`

2 years agoMerge pull request #26366 from larssandergreen/Add-NOT-CONTAINS-to-API-v4-and-SK
colemanw [Sun, 28 May 2023 20:58:09 +0000 (16:58 -0400)]
Merge pull request #26366 from larssandergreen/Add-NOT-CONTAINS-to-API-v4-and-SK

Add NOT CONTAINS to API and SK

2 years agoAdd NOT CONTAINS to API and SK
larssandergreen [Sun, 28 May 2023 19:16:38 +0000 (13:16 -0600)]
Add NOT CONTAINS to API and SK

2 years agoMerge pull request #26363 from larssandergreen/Prevent-corruption-of-fee_level-on...
colemanw [Sun, 28 May 2023 15:58:05 +0000 (11:58 -0400)]
Merge pull request #26363 from larssandergreen/Prevent-corruption-of-fee_level-on-Change-Selections

Serialize Participant fee_level when using Change Selections

2 years agoSerialize Participant fee_level when using Change Selections
larssandergreen [Sun, 28 May 2023 05:09:41 +0000 (23:09 -0600)]
Serialize Participant fee_level when using Change Selections

2 years agoMerge pull request #26362 from colemanw/api4Contains
colemanw [Sun, 28 May 2023 02:55:55 +0000 (22:55 -0400)]
Merge pull request #26362 from colemanw/api4Contains

APIv4 - Fix CONTAINS operator to work with more types of serialized fields

2 years agoAPIv4 - Fix CONTAINS operator to work with more types of serialized fields
colemanw [Sat, 27 May 2023 18:08:34 +0000 (14:08 -0400)]
APIv4 - Fix CONTAINS operator to work with more types of serialized fields

2 years agoAPIv4 - Add bridge entity metadata to GroupNesting entity
colemanw [Fri, 26 May 2023 15:47:53 +0000 (11:47 -0400)]
APIv4 - Add bridge entity metadata to GroupNesting entity

2 years agoGroup - Add missing metadata for 'children' column
colemanw [Fri, 26 May 2023 12:15:24 +0000 (08:15 -0400)]
Group - Add missing metadata for 'children' column

2 years agoAPIv4 - Update tests to use new Invasive helper
colemanw [Sat, 27 May 2023 15:38:01 +0000 (11:38 -0400)]
APIv4 - Update tests to use new Invasive helper

2 years agoMerge pull request #25908 from MegaphoneJon/pcp-add-to-group
colemanw [Sat, 27 May 2023 15:07:39 +0000 (11:07 -0400)]
Merge pull request #25908 from MegaphoneJon/pcp-add-to-group

PCP signup form - respect profile 'Add to Group'

2 years agoMerge pull request #26360 from demeritcowboy/regen-tpl
colemanw [Sat, 27 May 2023 15:02:14 +0000 (11:02 -0400)]
Merge pull request #26360 from demeritcowboy/regen-tpl

Regen after 26297

2 years agoregen
demeritcowboy [Sat, 27 May 2023 14:26:42 +0000 (10:26 -0400)]
regen

2 years agoMerge pull request #25543 from demeritcowboy/record-payment
demeritcowboy [Sat, 27 May 2023 14:07:54 +0000 (10:07 -0400)]
Merge pull request #25543 from demeritcowboy/record-payment

dev/financial#214 - Use correct id when creating record payment link for change selections on event

2 years agoMerge pull request #26359 from larssandergreen/correct-contributor-name
demeritcowboy [Sat, 27 May 2023 14:07:06 +0000 (10:07 -0400)]
Merge pull request #26359 from larssandergreen/correct-contributor-name

Update contributor-key to correct name

2 years agoUpdate contributor-key.yml
larssandergreen [Sat, 27 May 2023 04:28:48 +0000 (22:28 -0600)]
Update contributor-key.yml

2 years agoClean up Additional Payment Form
larssandergreen [Sat, 27 May 2023 00:14:49 +0000 (18:14 -0600)]
Clean up Additional Payment Form

2 years agogroup.update Parent omitted in params should do nothing + avoid recursion
Samuel Vanhove [Thu, 18 May 2023 15:05:16 +0000 (11:05 -0400)]
group.update Parent omitted in params should do nothing + avoid recursion

2 years agoMerge pull request #26297 from eileenmcnaughton/event_phone
demeritcowboy [Fri, 26 May 2023 17:43:29 +0000 (13:43 -0400)]
Merge pull request #26297 from eileenmcnaughton/event_phone

dev/core#4287 Fix event_offline template phones & emails

2 years agoMerge pull request #26163 from demeritcowboy/case-search-notices
demeritcowboy [Fri, 26 May 2023 14:43:03 +0000 (10:43 -0400)]
Merge pull request #26163 from demeritcowboy/case-search-notices

[php8] fix Find Cases notices

2 years agoremove another unused copy/paste variable
demeritcowboy [Fri, 5 May 2023 21:46:19 +0000 (17:46 -0400)]
remove another unused copy/paste variable

2 years agoremove copy/paste variable
demeritcowboy [Thu, 4 May 2023 22:44:59 +0000 (18:44 -0400)]
remove copy/paste variable

2 years agofix smarty notices on case search
demeritcowboy [Thu, 4 May 2023 22:42:59 +0000 (18:42 -0400)]
fix smarty notices on case search

2 years agoMerge pull request #26272 from aydun/fix_primary_in_blocks
colemanw [Fri, 26 May 2023 12:07:30 +0000 (08:07 -0400)]
Merge pull request #26272 from aydun/fix_primary_in_blocks

FormBuilder: don't make 'Primary' required

2 years agoMerge pull request #26351 from larssandergreen/Fix-participantlistingURL
Yashodha Chaku [Fri, 26 May 2023 05:45:16 +0000 (11:15 +0530)]
Merge pull request #26351 from larssandergreen/Fix-participantlistingURL

Fix participantListingURL on Manage Event

2 years agoMerge pull request #26346 from eileenmcnaughton/participant_rule
Seamus Lee [Fri, 26 May 2023 04:42:49 +0000 (14:42 +1000)]
Merge pull request #26346 from eileenmcnaughton/participant_rule

Fix enotices in Register task formRule by separating functions

2 years agoMerge pull request #26350 from colemanw/refreshDate
Eileen McNaughton [Fri, 26 May 2023 04:30:55 +0000 (16:30 +1200)]
Merge pull request #26350 from colemanw/refreshDate

Metadata - Tag Group.refresh_date column as deprecated

2 years agoFix participantListingURL on Manage Event
larssandergreen [Fri, 26 May 2023 03:52:46 +0000 (21:52 -0600)]
Fix participantListingURL on Manage Event

2 years agoMetadata - Tag Group.refresh_date column as deprecated
colemanw [Fri, 26 May 2023 02:45:22 +0000 (22:45 -0400)]
Metadata - Tag Group.refresh_date column as deprecated

Field was deprecated as of https://github.com/civicrm/civicrm-core/pull/19287

2 years agoMerge pull request #26349 from colemanw/clarifySpec
Eileen McNaughton [Fri, 26 May 2023 02:10:39 +0000 (14:10 +1200)]
Merge pull request #26349 from colemanw/clarifySpec

APIv4 - Clarify specProvider code

2 years agoAPIv4 - Clarify specProvider code
colemanw [Fri, 26 May 2023 01:35:31 +0000 (21:35 -0400)]
APIv4 - Clarify specProvider code

Some not-well-documented code led to confusion that's been copy-pasted a couple times now.
This removes the unnecessarily-pasted code and adds clarifying comments to the code which
originally caused the confusion.

2 years agoMerge pull request #26294 from eileenmcnaughton/event_location
Seamus Lee [Fri, 26 May 2023 00:14:52 +0000 (10:14 +1000)]
Merge pull request #26294 from eileenmcnaughton/event_location

Declare paid event as example data, call from test

2 years agoMerge pull request #26166 from larssandergreen/Fix-PHP8-warnings-on-participant.tpl
demeritcowboy [Thu, 25 May 2023 22:36:40 +0000 (18:36 -0400)]
Merge pull request #26166 from larssandergreen/Fix-PHP8-warnings-on-participant.tpl

Fix PHP8 warnings in Participant.tpl

2 years agoRemove portions from newly separated function that do not apply
Eileen McNaughton [Thu, 25 May 2023 22:07:31 +0000 (10:07 +1200)]
Remove portions from newly separated function that do not apply

2 years agoOverride rather than share formRule from Register form
Eileen McNaughton [Thu, 25 May 2023 22:05:48 +0000 (10:05 +1200)]
Override rather than share formRule from Register form

2 years agoMerge pull request #26342 from larssandergreen/Add-mailing-paths-to-schema-and-SK
Seamus Lee [Thu, 25 May 2023 21:06:46 +0000 (07:06 +1000)]
Merge pull request #26342 from larssandergreen/Add-mailing-paths-to-schema-and-SK

Add Mailing view and preview paths to schema

2 years agoMerge pull request #26330 from colemanw/stickyHeader
colemanw [Thu, 25 May 2023 21:01:47 +0000 (17:01 -0400)]
Merge pull request #26330 from colemanw/stickyHeader

SearchKit - Add sticky table header style

2 years agoSearchKit - Add display of type `entity`
Coleman Watts [Sun, 19 Mar 2023 22:33:18 +0000 (18:33 -0400)]
SearchKit - Add display of type `entity`

An entity display does not produce user-facing output, instead it writes to a SQL table
which can then be queried from SearchKit, the API, or other SQL-based tools like Drupal Views.

The new table is static; this includes a scheduled job to refresh it (disabled by default).

2 years agoFix PHP8 on participant
larssandergreen [Thu, 25 May 2023 15:55:39 +0000 (09:55 -0600)]
Fix PHP8 on participant

2 years agoMerge pull request #26341 from colemanw/selectNone
colemanw [Thu, 25 May 2023 15:53:50 +0000 (11:53 -0400)]
Merge pull request #26341 from colemanw/selectNone

SearchKit - Clear selection when changing search params

2 years agoMerge pull request #26340 from colemanw/explorerWhitespace
colemanw [Thu, 25 May 2023 15:02:29 +0000 (11:02 -0400)]
Merge pull request #26340 from colemanw/explorerWhitespace

APIv4 Explorer - Fix trailing whitespace

2 years agoAdd mailing paths to schema
larssandergreen [Thu, 25 May 2023 14:59:50 +0000 (08:59 -0600)]
Add mailing paths to schema

2 years agoMerge pull request #25744 from lemniscus/api4-activity-virtual-contact-array-fields
colemanw [Thu, 25 May 2023 13:30:18 +0000 (09:30 -0400)]
Merge pull request #25744 from lemniscus/api4-activity-virtual-contact-array-fields

FormBuilder: load assignees and targets on existing activities, via api4 read-write multivalue virtual fields

2 years agoSearchKit - Clear selection when changing search params
colemanw [Thu, 25 May 2023 11:50:41 +0000 (07:50 -0400)]
SearchKit - Clear selection when changing search params

Fixes dev/core#4274

2 years agoAPIv4 Explorer - Fix trailing whitespace
colemanw [Thu, 25 May 2023 11:40:59 +0000 (07:40 -0400)]
APIv4 Explorer - Fix trailing whitespace

2 years agoMerge pull request #26329 from aydun/custom_field
colemanw [Thu, 25 May 2023 11:36:03 +0000 (07:36 -0400)]
Merge pull request #26329 from aydun/custom_field

AdminUI: updates to Custom Group & Field

2 years agoMain thing is to add a filter and list of fields on the custom field
Aidan Saunders [Wed, 24 May 2023 13:25:21 +0000 (14:25 +0100)]
Main thing is to add a filter and list of fields on the custom field
group page.
A few tweaks/standardisations in line with other AdminUI pages.

2 years agoMerge pull request #26339 from civicrm/5.62
Seamus Lee [Thu, 25 May 2023 08:17:32 +0000 (18:17 +1000)]
Merge pull request #26339 from civicrm/5.62

5.62

2 years agoMerge pull request #26301 from mlutfy/optOutSimpler
Yashodha Chaku [Thu, 25 May 2023 06:20:04 +0000 (11:50 +0530)]
Merge pull request #26301 from mlutfy/optOutSimpler

Simplify opt-out/unsubscribe help texts

2 years agoMerge pull request #26335 from agh1/5.62.0-releasenotes-initial
Eileen McNaughton [Thu, 25 May 2023 03:15:03 +0000 (15:15 +1200)]
Merge pull request #26335 from agh1/5.62.0-releasenotes-initial

5.62.0 release notes initial run

2 years agoMerge pull request #26333 from lemniscus/api3-sql-function-if-description
colemanw [Thu, 25 May 2023 02:11:51 +0000 (22:11 -0400)]
Merge pull request #26333 from lemniscus/api3-sql-function-if-description

[NFC] SearchKit sql function "if": fix description (dev/core#4307)

2 years agoMerge pull request #26336 from demeritcowboy/msgtpl-regen
Seamus Lee [Thu, 25 May 2023 00:59:59 +0000 (10:59 +1000)]
Merge pull request #26336 from demeritcowboy/msgtpl-regen

regen after recent message template updates

2 years agoput the ts all on one line to help scanning for translatable strings
Noah Miller [Thu, 25 May 2023 00:50:21 +0000 (17:50 -0700)]
put the ts all on one line to help scanning for translatable strings

2 years agocorrect a typo
Noah Miller [Wed, 24 May 2023 23:34:56 +0000 (16:34 -0700)]
correct a typo

2 years agoApi4 sql function "if": fix description dev/core#4307
Noah Miller [Wed, 24 May 2023 16:34:22 +0000 (09:34 -0700)]
Api4 sql function "if": fix description dev/core#4307

2 years agoapi4 Activity: add targets & assignees as read-write virtual multi-value fields
Noah Miller [Thu, 25 May 2023 00:46:38 +0000 (17:46 -0700)]
api4 Activity: add targets & assignees as read-write virtual multi-value fields

2 years agoMerge pull request #26237 from colemanw/exportMatchFields
Eileen McNaughton [Thu, 25 May 2023 00:18:33 +0000 (12:18 +1200)]
Merge pull request #26237 from colemanw/exportMatchFields

dev/core#4286 APIv4 - Improve export action handling of $match param

2 years agoregen
demeritcowboy [Wed, 24 May 2023 21:44:55 +0000 (17:44 -0400)]
regen

2 years ago5.62.0 release notes: added boilerplate
Andie Hunt [Wed, 24 May 2023 20:04:41 +0000 (16:04 -0400)]
5.62.0 release notes: added boilerplate

2 years ago5.62.0 release notes: raw from script
Andie Hunt [Wed, 24 May 2023 19:47:07 +0000 (15:47 -0400)]
5.62.0 release notes: raw from script

2 years agoMerge pull request #26332 from colemanw/noTs
colemanw [Wed, 24 May 2023 18:18:47 +0000 (14:18 -0400)]
Merge pull request #26332 from colemanw/noTs

APIv4 Explorer - Don't translate empty strings

2 years agoMerge pull request #26331 from colemanw/caret
Yashodha Chaku [Wed, 24 May 2023 17:18:45 +0000 (22:48 +0530)]
Merge pull request #26331 from colemanw/caret

SearchKit - Add caret icon to dropdown menus, tweak defaults

2 years agoAPIv4 Explorer - Don't translate empty strings
colemanw [Wed, 24 May 2023 15:43:07 +0000 (11:43 -0400)]
APIv4 Explorer - Don't translate empty strings

2 years agoSearchKit - Add caret icon to dropdown menus, tweak defaults
colemanw [Wed, 24 May 2023 15:22:53 +0000 (11:22 -0400)]
SearchKit - Add caret icon to dropdown menus, tweak defaults

Adds a caret icon to dropdown menus to clarify their function, and tweaks the defaults to the standard used by the AdminUI extension (xs size, no text).
Adds css rule to prevent line breaks inside the button.

2 years agoSearchKit - Add sticky table header style
colemanw [Wed, 24 May 2023 14:47:03 +0000 (10:47 -0400)]
SearchKit - Add sticky table header style

2 years agoMerge pull request #26060 from aydun/adminui_sched_job
colemanw [Wed, 24 May 2023 14:05:29 +0000 (10:05 -0400)]
Merge pull request #26060 from aydun/adminui_sched_job

AdminUI - add Scheduled Jobs page

2 years agoAdminUI: Scheduled Jobs page
Aidan Saunders [Thu, 13 Apr 2023 16:09:28 +0000 (17:09 +0100)]
AdminUI: Scheduled Jobs page

2 years agoMerge pull request #26317 from larssandergreen/Clean-up-Scheduled-Jobs-page
colemanw [Wed, 24 May 2023 12:17:42 +0000 (08:17 -0400)]
Merge pull request #26317 from larssandergreen/Clean-up-Scheduled-Jobs-page

Clean up Scheduled Jobs admin page

2 years agoMerge pull request #26315 from stesi561/dev/core/#4305
demeritcowboy [Wed, 24 May 2023 10:41:18 +0000 (06:41 -0400)]
Merge pull request #26315 from stesi561/dev/core/#4305

Refs dev/core#4305 - Update href to ng-href

2 years agoMerge pull request #26322 from civicrm/5.62
Eileen McNaughton [Wed, 24 May 2023 03:48:06 +0000 (15:48 +1200)]
Merge pull request #26322 from civicrm/5.62

5.62

2 years agoMerge pull request #26320 from agileware/CIVICRM-2137
Eileen McNaughton [Wed, 24 May 2023 03:47:42 +0000 (15:47 +1200)]
Merge pull request #26320 from agileware/CIVICRM-2137

dev/core#4310 Fix layout regression in MembershipBlock for Contribution pages

2 years agoCIVICRM-2137 Add closing div and force renewal javascript back to makeContribution...
Francis Whittle [Wed, 24 May 2023 01:07:12 +0000 (11:07 +1000)]
CIVICRM-2137 Add closing div and force renewal javascript back to makeContribution context for Membership block on Contributions

2 years agoMerge pull request #26321 from seamuslee001/5.62
Seamus Lee [Wed, 24 May 2023 02:42:15 +0000 (12:42 +1000)]
Merge pull request #26321 from seamuslee001/5.62

[REF] Bump socket.io-parser to 4.2.3

2 years agoMerge pull request #26319 from larssandergreen/Addt-Fix-PHP8-warnings-on-Participant.tpl
Eileen McNaughton [Wed, 24 May 2023 02:10:52 +0000 (14:10 +1200)]
Merge pull request #26319 from larssandergreen/Addt-Fix-PHP8-warnings-on-Participant.tpl

Addt Fix PHP8 warnings on Participant.tpl

2 years ago[REF] Bump socket.io-parser to 4.2.3
Seamus Lee [Wed, 24 May 2023 01:55:47 +0000 (11:55 +1000)]
[REF] Bump socket.io-parser to 4.2.3

2 years agoFix PHP8 warnings on participant.tpl
larssandergreen [Wed, 24 May 2023 01:15:33 +0000 (19:15 -0600)]
Fix PHP8 warnings on participant.tpl

2 years agoMerge pull request #26276 from totten/master-dispatch-sig
Tim Otten [Wed, 24 May 2023 00:47:28 +0000 (17:47 -0700)]
Merge pull request #26276 from totten/master-dispatch-sig

(NFC) CiviEventDispatcher - Update type declaration. Add test demonstion

2 years agoClean up scheduled jobs
larssandergreen [Tue, 23 May 2023 23:59:04 +0000 (17:59 -0600)]
Clean up scheduled jobs

2 years agorefs: dev/core#4305 update href to ng-href
Luke Stewart [Tue, 23 May 2023 22:26:42 +0000 (10:26 +1200)]
refs: dev/core#4305 update href to ng-href

2 years agoRefs: dev/core#4305 Bulk update of href to ng-href where href value contains '{{'
Luke Stewart [Tue, 23 May 2023 22:22:22 +0000 (10:22 +1200)]
Refs: dev/core#4305 Bulk update of href to ng-href where href value contains '{{'

This was performed using the following:

grep -n -R -o -E -e '<a[^>]*\shref="[^"]*\{\{[^"]*"' -e "<a[^>]*\shref='[^']*\{\{[^']*'"  . | awk -F : '{print "sed -i #"$2"s/href/ng-href/g# "$1}' | tr '#' "'" > updates.sh

Then running the generated script.

This commit excludes a file in tests which I'll add as a separate
commit.

2 years agoMerge pull request #26313 from aydun/group_count
Eileen McNaughton [Tue, 23 May 2023 22:43:47 +0000 (10:43 +1200)]
Merge pull request #26313 from aydun/group_count

Api4: add calculated field `contact_count` to Group

2 years agoMerge pull request #26314 from civicrm/5.62
Eileen McNaughton [Tue, 23 May 2023 22:43:31 +0000 (10:43 +1200)]
Merge pull request #26314 from civicrm/5.62

5.62 to master

2 years agoAPIv4 - Add basic test for Group.contact_count field
colemanw [Tue, 23 May 2023 22:15:21 +0000 (18:15 -0400)]
APIv4 - Add basic test for Group.contact_count field

2 years agoMerge pull request #26308 from eileenmcnaughton/public
Eileen McNaughton [Tue, 23 May 2023 22:12:01 +0000 (10:12 +1200)]
Merge pull request #26308 from eileenmcnaughton/public

Fix show_public regression