civicrm-core.git
2 years agoMerge pull request #23266 from colemanw/castToArray
Eileen McNaughton [Thu, 21 Apr 2022 02:52:09 +0000 (14:52 +1200)]
Merge pull request #23266 from colemanw/castToArray

APIv4 - Avoid php error

2 years agoAPIv4 - Avoid php error
Coleman Watts [Thu, 21 Apr 2022 00:21:29 +0000 (20:21 -0400)]
APIv4 - Avoid php error

Prevents a php error when calling `array_merge()` on `null`.

2 years agoMerge pull request #23256 from colemanw/fixDownloadInvoiceButtonPort
Seamus Lee [Wed, 20 Apr 2022 01:37:24 +0000 (11:37 +1000)]
Merge pull request #23256 from colemanw/fixDownloadInvoiceButtonPort

Fix dev/core#3168 broken download contribution invoice button

2 years agoMerge pull request #23247 from colemanw/searchKitAggFix
Eileen McNaughton [Wed, 20 Apr 2022 00:07:04 +0000 (12:07 +1200)]
Merge pull request #23247 from colemanw/searchKitAggFix

SearchKit - Prevent errors trying to orderBy nonaggregated columns

2 years agoFix dev/core#3168 broken download contribution invoice button
Coleman Watts [Tue, 19 Apr 2022 22:43:52 +0000 (18:43 -0400)]
Fix dev/core#3168 broken download contribution invoice button

2 years agoMerge pull request #23202 from eileenmcnaughton/pay_links
colemanw [Tue, 19 Apr 2022 22:46:59 +0000 (18:46 -0400)]
Merge pull request #23202 from eileenmcnaughton/pay_links

Fix button breakage on viewContribution

2 years agoSearchKit - Prevent errors trying to orderBy nonaggregated columns when using groupBy
Coleman Watts [Tue, 19 Apr 2022 14:07:13 +0000 (10:07 -0400)]
SearchKit - Prevent errors trying to orderBy nonaggregated columns when using groupBy

2 years agoMerge pull request #23235 from eileenmcnaughton/acl
Yashodha Chaku [Tue, 19 Apr 2022 12:40:15 +0000 (18:10 +0530)]
Merge pull request #23235 from eileenmcnaughton/acl

Fix sql error on acl user

2 years agoMerge pull request #23228 from eileenmcnaughton/549_m
colemanw [Mon, 18 Apr 2022 02:31:38 +0000 (22:31 -0400)]
Merge pull request #23228 from eileenmcnaughton/549_m

Fix malformed query when user with no access to any financial acls accesses civimember search

2 years agoFix malformed query when user with no access to any financial acls accesses civimembe...
Eileen McNaughton [Fri, 15 Apr 2022 22:26:28 +0000 (10:26 +1200)]
Fix malformed query when user with no access to any financial acls accesses civimember search

2 years agoFix sql error on acl user
Eileen McNaughton [Sun, 17 Apr 2022 23:29:32 +0000 (11:29 +1200)]
Fix sql error on acl user

2 years agoMerge pull request #23226 from MegaphoneJon/individual-employers
Seamus Lee [Sat, 16 Apr 2022 02:41:55 +0000 (12:41 +1000)]
Merge pull request #23226 from MegaphoneJon/individual-employers

restore using non-organizations as employers

2 years agoallow non-organization employers
Jon Goldberg [Fri, 15 Apr 2022 14:24:11 +0000 (10:24 -0400)]
allow non-organization employers

2 years agoMerge pull request #23198 from eileenmcnaughton/549
demeritcowboy [Thu, 14 Apr 2022 22:35:41 +0000 (18:35 -0400)]
Merge pull request #23198 from eileenmcnaughton/549

Move 5.49 update to beta

2 years agoMerge pull request #23177 from JMAConsulting/booleanFields_1
Eileen McNaughton [Thu, 14 Apr 2022 06:41:46 +0000 (18:41 +1200)]
Merge pull request #23177 from JMAConsulting/booleanFields_1

(REF) Schema - Correct boolean fields in various tables

2 years agoFix button breakage on viewContribution
Eileen McNaughton [Thu, 14 Apr 2022 06:20:08 +0000 (18:20 +1200)]
Fix button breakage on viewContribution

2 years agoMerge pull request #23197 from seamuslee001/5.49
Eileen McNaughton [Thu, 14 Apr 2022 05:12:50 +0000 (17:12 +1200)]
Merge pull request #23197 from seamuslee001/5.49

[REF] Regenerate civicrm_generated data

2 years agorevert Menu.is_public requiredness
Monish Deb [Sat, 9 Apr 2022 02:05:54 +0000 (07:35 +0530)]
revert Menu.is_public requiredness

2 years agoMove 5.49 update to beta
Eileen McNaughton [Thu, 14 Apr 2022 03:46:02 +0000 (15:46 +1200)]
Move 5.49 update to beta

2 years ago[REF] Regenerate civicrm_generated data
Seamus Lee [Thu, 14 Apr 2022 03:31:33 +0000 (13:31 +1000)]
[REF] Regenerate civicrm_generated data

2 years agoMerge pull request #23192 from eileenmcnaughton/549
Seamus Lee [Thu, 14 Apr 2022 03:24:39 +0000 (13:24 +1000)]
Merge pull request #23192 from eileenmcnaughton/549

Fix FiveFortyNine is_public to default to 0

2 years agoMerge pull request #23189 from alifrumin/rn5.49
Eileen McNaughton [Thu, 14 Apr 2022 02:30:23 +0000 (14:30 +1200)]
Merge pull request #23189 from alifrumin/rn5.49

[NFC] First Pass at Release notes for 5.49

2 years ago[NFC] 5.49 release notes first pass
Alice Frumin [Wed, 13 Apr 2022 01:16:15 +0000 (21:16 -0400)]
[NFC] 5.49 release notes first pass

2 years agoFix FiveFortyNine is_public to default to 0
Eileen McNaughton [Wed, 13 Apr 2022 23:50:53 +0000 (11:50 +1200)]
Fix FiveFortyNine is_public to default to 0

2 years agoMerge pull request #23179 from totten/5.49-grant-entities
Eileen McNaughton [Tue, 12 Apr 2022 23:50:08 +0000 (11:50 +1200)]
Merge pull request #23179 from totten/5.49-grant-entities

(dev/core#3161) CiviGrant - Cleanup managed entities (5.49-rc)

2 years agoCiviGrant - Remove unused managed entities during upgrade
Coleman Watts [Tue, 12 Apr 2022 15:31:02 +0000 (11:31 -0400)]
CiviGrant - Remove unused managed entities during upgrade

Removes managed entities which may have been added during the 5.47 upgrade,
to prevent the managed system from automatically deleting them.

2 years agoCiviGrant - Cleanup managed entities - fixes dev/core#3161
Coleman Watts [Fri, 8 Apr 2022 13:47:51 +0000 (09:47 -0400)]
CiviGrant - Cleanup managed entities - fixes dev/core#3161

- Ensure labels are translated
- Set stricter cleanup policy for entities that should be removed on uninstall
- Make grant_status options unmanaged. They will not be updated by the system ever,
  but they will be deleted on uninstall because the option group is a managed entity.

2 years agoMerge pull request #23176 from agh1/5.49.0-releasenotes-initial
Eileen McNaughton [Tue, 12 Apr 2022 19:09:58 +0000 (07:09 +1200)]
Merge pull request #23176 from agh1/5.49.0-releasenotes-initial

5.49.0 release notes initial run

2 years agoMerge pull request #23175 from pradpnayak/limitcontacts
Eileen McNaughton [Tue, 12 Apr 2022 19:00:55 +0000 (07:00 +1200)]
Merge pull request #23175 from pradpnayak/limitcontacts

Limit issue when printing pdf from contribution search

2 years ago5.49.0 release notes: added boilerplate
Andie Hunt [Tue, 12 Apr 2022 17:00:31 +0000 (13:00 -0400)]
5.49.0 release notes: added boilerplate

2 years ago5.49.0 release notes: raw from script
Andie Hunt [Tue, 12 Apr 2022 16:23:20 +0000 (12:23 -0400)]
5.49.0 release notes: raw from script

2 years agoFix limit issue
Pradeep Nayak [Tue, 12 Apr 2022 13:13:45 +0000 (14:13 +0100)]
Fix limit issue

2 years agoMerge pull request #23166 from pradpnayak/limitcontacts
Eileen McNaughton [Mon, 11 Apr 2022 23:28:22 +0000 (11:28 +1200)]
Merge pull request #23166 from pradpnayak/limitcontacts

Set limit to 0 when processing send sms task

2 years agoSet limit to 0 when processing send sms task
Pradeep Nayak [Mon, 11 Apr 2022 20:56:30 +0000 (21:56 +0100)]
Set limit to 0 when processing send sms task

2 years agoMerge pull request #23141 from totten/master-mailing-verify
Eileen McNaughton [Sun, 10 Apr 2022 23:26:31 +0000 (11:26 +1200)]
Merge pull request #23141 from totten/master-mailing-verify

(dev/mail#107) CiviMail - Fix validation error (5.49)

2 years agoMerge pull request #23148 from totten/5.48-cache-ver-suffix
demeritcowboy [Sun, 10 Apr 2022 19:17:02 +0000 (15:17 -0400)]
Merge pull request #23148 from totten/5.48-cache-ver-suffix

(dev/core#3166) "Metadata" cache - Strictly separate by version

2 years agoSet version to 5.49.beta1
CiviCRM [Sat, 9 Apr 2022 21:38:59 +0000 (21:38 +0000)]
Set version to 5.49.beta1

2 years ago(dev/core#3166) "Metadata" cache - Strictly separate by version
Tim Otten [Sat, 9 Apr 2022 20:23:56 +0000 (13:23 -0700)]
(dev/core#3166) "Metadata" cache - Strictly separate by version

This addresses some symptoms identified in the discussion of 3166.

Before
------

The "metadata" cache is always stored with the name `metadata`.

If you load a newer codebase, it still reads `metadata` from the older code base (until something explicitly clears the cache).

After
-----

The "metadata" cache is always stored with the name `metadata_{version}`, eg `metadata_5_48_0`.

If you load a newer codebase (eg `5.49.0`), it will ignore the older `metadata_5_48_0` and create a new `metadata_5_49_0`.

Comments
--------

The upgrade system also clears cache, but many users rely on navigating through the site to get to the upgrader.

The change could make sense with other caches, but I only applied the change to the `metadata` cache because there is _some_ risk;
eg if some caller bypasses the cache objects. (I was also slightly concerned about the possibility the some caller relies
on `$cache->getName()` or `$cache->getPrefix()` or similar... but I haven't been able to find any methods like that...). It seems
safer to put that sort of change into a monthly update rather than minor patch.

2 years agoMerge pull request #23146 from colemanw/api4ExplorerIndex
colemanw [Sat, 9 Apr 2022 19:03:01 +0000 (15:03 -0400)]
Merge pull request #23146 from colemanw/api4ExplorerIndex

APIv4 Explorer - Adjust 'Index' field to fit better on narrow screens

2 years agoapi4Explorer.css style fix
Coleman Watts [Sat, 9 Apr 2022 15:30:54 +0000 (11:30 -0400)]
api4Explorer.css style fix

2 years agoMerge pull request #23145 from braders/crm-button-icon-fixes
colemanw [Sat, 9 Apr 2022 13:16:43 +0000 (09:16 -0400)]
Merge pull request #23145 from braders/crm-button-icon-fixes

Fix incorrect use of icon argument for crmButton function

2 years agoFix incorrect use of icon argument for crmButton function
Bradley Taylor [Sat, 9 Apr 2022 08:41:01 +0000 (09:41 +0100)]
Fix incorrect use of icon argument for crmButton function

2 years agoAPIv4 Explorer - Adjust 'Index' field to fit better on narrow screens
Coleman Watts [Sat, 9 Apr 2022 02:08:34 +0000 (22:08 -0400)]
APIv4 Explorer - Adjust 'Index' field to fit better on narrow screens

2 years agoMerge pull request #23132 from eileenmcnaughton/imp
colemanw [Sat, 9 Apr 2022 01:30:57 +0000 (21:30 -0400)]
Merge pull request #23132 from eileenmcnaughton/imp

Remove unnecessary pass-by-ref

2 years agoCiviMail - Fix validation error
Tim Otten [Fri, 8 Apr 2022 22:01:31 +0000 (15:01 -0700)]
CiviMail - Fix validation error

Steps to reproduce:

- Disable Flexmailer
- Use web UI
- Create a new mailing
- Fill out fields
- Submit mailing
- Observe inaccurate error - Mailing cannot be sent. There are missing or invalid fields (subject,name,from_name,from_email,body).

See also: https://civicrm.stackexchange.com/questions/41654/after-upgrade-to-civicrm-5-48-0-all-submissions-say-mailing-cannot-be-sent-th

2 years agoMerge pull request #23138 from eileenmcnaughton/map
colemanw [Fri, 8 Apr 2022 12:37:25 +0000 (08:37 -0400)]
Merge pull request #23138 from eileenmcnaughton/map

Consolidate MapTable.tpl

2 years agoMerge pull request #23136 from eileenmcnaughton/notice_mem_search
Yashodha Chaku [Fri, 8 Apr 2022 07:13:37 +0000 (12:43 +0530)]
Merge pull request #23136 from eileenmcnaughton/notice_mem_search

Enotice fix - membership search

2 years agoMerge pull request #23137 from eileenmcnaughton/unused
Yashodha Chaku [Fri, 8 Apr 2022 07:09:55 +0000 (12:39 +0530)]
Merge pull request #23137 from eileenmcnaughton/unused

Remove unused property

2 years agoConsolidate MapTable.tpl
Eileen McNaughton [Fri, 8 Apr 2022 04:43:07 +0000 (16:43 +1200)]
Consolidate MapTable.tpl

2 years agoRemove unused property
Eileen McNaughton [Fri, 8 Apr 2022 04:26:31 +0000 (16:26 +1200)]
Remove unused property

2 years agoEnotice fix - membership search
Eileen McNaughton [Fri, 8 Apr 2022 03:30:49 +0000 (15:30 +1200)]
Enotice fix - membership search

2 years agoRemove unnecessary pass-by-ref
Eileen McNaughton [Thu, 7 Apr 2022 23:45:09 +0000 (11:45 +1200)]
Remove unnecessary pass-by-ref

2 years agoMerge pull request #23134 from totten/master-buggable
demeritcowboy [Fri, 8 Apr 2022 02:55:05 +0000 (22:55 -0400)]
Merge pull request #23134 from totten/master-buggable

(REF) Schema - Fix boolean fields in various tables - Split commits

2 years agoMerge pull request #23133 from eileenmcnaughton/mem
demeritcowboy [Fri, 8 Apr 2022 02:51:08 +0000 (22:51 -0400)]
Merge pull request #23133 from eileenmcnaughton/mem

Remove 'in-between' class

2 years agoMerge pull request #23129 from colemanw/api4_log_entity
demeritcowboy [Fri, 8 Apr 2022 02:50:47 +0000 (22:50 -0400)]
Merge pull request #23129 from colemanw/api4_log_entity

Add in APIv4 Logging Entity

2 years agoSchema - Boolean blob
Monish Deb [Fri, 8 Apr 2022 01:12:18 +0000 (18:12 -0700)]
Schema - Boolean blob

2 years agoSchema - Fix boolean fields in 'SMS'
Monish Deb [Fri, 8 Apr 2022 01:12:17 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'SMS'

2 years agoSchema - Fix boolean fields in 'Report'
Monish Deb [Fri, 8 Apr 2022 01:12:17 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Report'

2 years agoSchema - Fix boolean fields in 'Pledge'
Monish Deb [Fri, 8 Apr 2022 01:12:17 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Pledge'

2 years agoSchema - Fix boolean fields in 'Price'
Monish Deb [Fri, 8 Apr 2022 01:12:17 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Price'

2 years agoSchema - Fix boolean fields in 'PCP'
Monish Deb [Fri, 8 Apr 2022 01:12:17 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'PCP'

2 years agoSchema - Fix boolean fields in 'Member'
Monish Deb [Fri, 8 Apr 2022 01:12:17 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Member'

2 years agoSchema - Fix boolean fields in 'Mailing'
Monish Deb [Fri, 8 Apr 2022 01:12:17 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Mailing'

2 years agoSchema - Fix boolean fields in 'Friend'
Monish Deb [Fri, 8 Apr 2022 01:12:17 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Friend'

2 years agoSchema - Fix boolean fields in 'Financial'
Monish Deb [Fri, 8 Apr 2022 01:12:16 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Financial'

2 years agoSchema - Fix boolean fields in 'Event'
Monish Deb [Fri, 8 Apr 2022 01:12:16 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Event'

2 years agoSchema - Fix boolean fields in 'Dedupe'
Monish Deb [Fri, 8 Apr 2022 01:12:16 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Dedupe'

2 years agoSchema - Fix boolean fields in 'Cxn'
Monish Deb [Fri, 8 Apr 2022 01:12:16 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Cxn'

2 years agoSchema - Fix boolean fields in 'Core'
Monish Deb [Fri, 8 Apr 2022 01:12:16 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Core'

2 years agoSchema - Fix boolean fields in 'Contribute'
Monish Deb [Fri, 8 Apr 2022 01:12:16 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Contribute'

2 years agoSchema - Fix boolean fields in 'Contact'
Monish Deb [Fri, 8 Apr 2022 01:12:16 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Contact'

2 years agoSchema - Fix boolean fields in 'Case'
Monish Deb [Fri, 8 Apr 2022 01:12:16 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Case'

2 years agoSchema - Fix boolean fields in 'Campaign'
Monish Deb [Fri, 8 Apr 2022 01:12:15 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Campaign'

2 years agoSchema - Fix boolean fields in 'Activity'
Monish Deb [Fri, 8 Apr 2022 01:12:15 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'Activity'

2 years agoSchema - Fix boolean fields in 'ACL'
Monish Deb [Fri, 8 Apr 2022 01:12:15 +0000 (18:12 -0700)]
Schema - Fix boolean fields in 'ACL'

2 years agoSchema - Add base function for FiveFortyNine boolean search
Tim Otten [Fri, 8 Apr 2022 01:12:15 +0000 (18:12 -0700)]
Schema - Add base function for FiveFortyNine boolean search

2 years agoRevert "Schema - Fix boolean fields in various tables"
Tim Otten [Fri, 8 Apr 2022 01:06:52 +0000 (18:06 -0700)]
Revert "Schema - Fix boolean fields in various tables"

This reverts commit c1e814c7ddd3406dbada69de369e07b1eb85c689.

2 years agoAdd in APIv4 Logging Entity
Monish Deb [Tue, 23 Nov 2021 12:32:32 +0000 (18:02 +0530)]
Add in APIv4 Logging Entity

2 years agoRemove 'in-between' class
Eileen McNaughton [Fri, 8 Apr 2022 00:05:41 +0000 (12:05 +1200)]
Remove 'in-between' class

2 years agoMerge pull request #23130 from colemanw/managedOptionValue
Seamus Lee [Thu, 7 Apr 2022 21:12:48 +0000 (07:12 +1000)]
Merge pull request #23130 from colemanw/managedOptionValue

Fix OptionValue BAO to call pre/post hooks to prevent force-reset of managed option values

2 years agoFix OptionValue BAO to call pre/post hooks to prevent force-reset of managed entities
Coleman Watts [Thu, 7 Apr 2022 19:40:30 +0000 (15:40 -0400)]
Fix OptionValue BAO to call pre/post hooks to prevent force-reset of managed entities

Managed entities rely on pre/post hooks being called in order to track whether an entity
has been modified. Without those hooks OptionValues were being force-reverted by the
managed system even when the 'update' mode was set to 'unmodified', which is supposed
to defer to user modifications.

2 years agoMerge pull request #22850 from ixiam/dev_Issue#3080
colemanw [Thu, 7 Apr 2022 18:51:53 +0000 (14:51 -0400)]
Merge pull request #22850 from ixiam/dev_Issue#3080

Fixes issue with duplicate is_billing on inline address forms.

2 years agoFixes style warnings
Vangelis Pantazis [Thu, 7 Apr 2022 14:07:25 +0000 (15:07 +0100)]
Fixes style warnings

2 years agoMerge pull request #22941 from sunilpawar/batch_copy_radio_clear_value
colemanw [Thu, 7 Apr 2022 13:48:05 +0000 (09:48 -0400)]
Merge pull request #22941 from sunilpawar/batch_copy_radio_clear_value

Copy Clear value in batch update process for radio button field

2 years agoMerge pull request #20437 from JMAConsulting/core_2633
colemanw [Thu, 7 Apr 2022 13:43:27 +0000 (09:43 -0400)]
Merge pull request #20437 from JMAConsulting/core_2633

core#2633 : Cannot remove Group Organisation selection in multisite setup

2 years agoMerge pull request #22954 from JMAConsulting/booleanFields
colemanw [Thu, 7 Apr 2022 13:31:17 +0000 (09:31 -0400)]
Merge pull request #22954 from JMAConsulting/booleanFields

[WIP] Schema - Fix boolean fields in various tables

2 years agoSchema - Fix boolean fields in various tables
Monish Deb [Wed, 16 Mar 2022 11:22:59 +0000 (16:52 +0530)]
Schema - Fix boolean fields in various tables

2 years agoMerge pull request #23126 from eileenmcnaughton/imp
Yashodha Chaku [Thu, 7 Apr 2022 05:28:14 +0000 (10:58 +0530)]
Merge pull request #23126 from eileenmcnaughton/imp

Remove good intentions

2 years agoMerge pull request #23127 from civicrm/5.48
Seamus Lee [Thu, 7 Apr 2022 05:10:49 +0000 (15:10 +1000)]
Merge pull request #23127 from civicrm/5.48

5.48

2 years agoMerge pull request #23125 from agh1/5.48.0-releasenotes-final
Tim Otten [Thu, 7 Apr 2022 05:08:22 +0000 (22:08 -0700)]
Merge pull request #23125 from agh1/5.48.0-releasenotes-final

5.48.0 release notes: added late changes

2 years agoRemove good intentions
Eileen McNaughton [Thu, 7 Apr 2022 02:25:55 +0000 (14:25 +1200)]
Remove good intentions

No - this isn't a todo we are about to do all of a sudden....

2 years ago5.48.0 release notes: added late changes
Andie Hunt [Thu, 7 Apr 2022 02:17:01 +0000 (22:17 -0400)]
5.48.0 release notes: added late changes

2 years agoMerge pull request #23124 from eileenmcnaughton/html
Seamus Lee [Thu, 7 Apr 2022 02:06:05 +0000 (12:06 +1000)]
Merge pull request #23124 from eileenmcnaughton/html

Tpl cleanup - whitespace, wrong closing tag

2 years agoMerge pull request #23121 from eileenmcnaughton/imp
colemanw [Thu, 7 Apr 2022 01:47:13 +0000 (21:47 -0400)]
Merge pull request #23121 from eileenmcnaughton/imp

Simplify class inheritance

2 years agoMerge branch '5.48' to master
Coleman Watts [Thu, 7 Apr 2022 01:07:19 +0000 (21:07 -0400)]
Merge branch '5.48' to master

2 years agoMerge pull request #22977 from eileenmcnaughton/issetit
colemanw [Thu, 7 Apr 2022 01:03:58 +0000 (21:03 -0400)]
Merge pull request #22977 from eileenmcnaughton/issetit

Ensure pay_later_text is always assigned

2 years agoMerge pull request #23123 from eileenmcnaughton/private
colemanw [Thu, 7 Apr 2022 00:52:17 +0000 (20:52 -0400)]
Merge pull request #23123 from eileenmcnaughton/private

Remove unused private variables

2 years agoMerge pull request #23122 from eileenmcnaughton/rr
Eileen McNaughton [Thu, 7 Apr 2022 00:36:43 +0000 (12:36 +1200)]
Merge pull request #23122 from eileenmcnaughton/rr

Fix function calls to be non-static

2 years agoMerge pull request #23016 from pradpnayak/optionValue
colemanw [Thu, 7 Apr 2022 00:26:09 +0000 (20:26 -0400)]
Merge pull request #23016 from pradpnayak/optionValue

Respect zero value

2 years agoMerge pull request #23120 from colemanw/contentBlock2
colemanw [Thu, 7 Apr 2022 00:24:28 +0000 (20:24 -0400)]
Merge pull request #23120 from colemanw/contentBlock2

Afform - Ensure upgrade fully converts content blocks