civicrm-core.git
2 years agobring back time field
demeritcowboy [Tue, 21 Nov 2023 01:18:10 +0000 (20:18 -0500)]
bring back time field

2 years agoMerge pull request #28239 from eileenmcnaughton/568_prod
demeritcowboy [Tue, 21 Nov 2023 00:54:14 +0000 (19:54 -0500)]
Merge pull request #28239 from eileenmcnaughton/568_prod

Fix regression in 5.68 on selecting a premium (when at least one is unavailable)

2 years agoMerge pull request #28237 from eileenmcnaughton/568
demeritcowboy [Tue, 21 Nov 2023 00:42:51 +0000 (19:42 -0500)]
Merge pull request #28237 from eileenmcnaughton/568

Add weight to premium config (tab on contribution page edit)

2 years agoFix regression in 5.68 on premium
Eileen McNaughton [Mon, 20 Nov 2023 23:07:27 +0000 (12:07 +1300)]
Fix regression in 5.68 on premium

2 years agoAdd weight to premium config (tab on contribution page edit)
Eileen McNaughton [Mon, 20 Nov 2023 22:33:40 +0000 (11:33 +1300)]
Add weight to premium config (tab on contribution page edit)

2 years agoMerge pull request #28231 from agh1/5.68.0-releasenotes-initial
Eileen McNaughton [Mon, 20 Nov 2023 22:05:38 +0000 (11:05 +1300)]
Merge pull request #28231 from agh1/5.68.0-releasenotes-initial

5.68.0 release notes initial run

2 years ago5.68.0 release notes: added boilerplate
Andie Hunt [Mon, 20 Nov 2023 15:27:38 +0000 (10:27 -0500)]
5.68.0 release notes: added boilerplate

2 years ago5.68.0 release notes: raw from script
Andie Hunt [Mon, 20 Nov 2023 15:24:11 +0000 (10:24 -0500)]
5.68.0 release notes: raw from script

2 years agoMerge pull request #28192 from lcdservices/civicrm-core-4780b
Eileen McNaughton [Fri, 17 Nov 2023 20:39:30 +0000 (09:39 +1300)]
Merge pull request #28192 from lcdservices/civicrm-core-4780b

dev/core#4780 handle bounce processing when verp unverified

2 years agoMerge pull request #28187 from colemanw/groupConcatUiFix
demeritcowboy [Fri, 17 Nov 2023 19:57:20 +0000 (14:57 -0500)]
Merge pull request #28187 from colemanw/groupConcatUiFix

SearchKit - Fix missing label on group concat distinct dropdown

2 years agotrying again to fix conflict
demeritcowboy [Fri, 17 Nov 2023 19:27:21 +0000 (14:27 -0500)]
trying again to fix conflict

2 years agotry to fix merge conflict
demeritcowboy [Fri, 17 Nov 2023 19:25:56 +0000 (14:25 -0500)]
try to fix merge conflict

2 years agoMerge pull request #28189 from aydun/adminui_cp_fix_rc
demeritcowboy [Fri, 17 Nov 2023 18:37:17 +0000 (13:37 -0500)]
Merge pull request #28189 from aydun/adminui_cp_fix_rc

dev/core#4783 Fix ability to clone and delete Contribution Pages when AdminUI enabled

2 years agodev/core#4780 handle bounce processing when verp unverified
Brian Shaughnessy [Fri, 17 Nov 2023 18:23:38 +0000 (13:23 -0500)]
dev/core#4780 handle bounce processing when verp unverified

2 years agoMove civicrm/contribute/manage to civicrm/admin/contribute/manage
Aidan Saunders [Thu, 16 Nov 2023 21:46:41 +0000 (21:46 +0000)]
Move civicrm/contribute/manage to civicrm/admin/contribute/manage
Update one reference to old path
Change Contribution Page clone and delete to use new path

2 years agoSearchKit - Fix missing label on group concat distinct dropdown
colemanw [Fri, 17 Nov 2023 14:17:39 +0000 (09:17 -0500)]
SearchKit - Fix missing label on group concat distinct dropdown

2 years agoMerge pull request #28171 from eileenmcnaughton/568_tax
colemanw [Fri, 17 Nov 2023 13:33:00 +0000 (08:33 -0500)]
Merge pull request #28171 from eileenmcnaughton/568_tax

Fix tax total not showing on thank you

2 years agoFix tests to not notice when faking form flow
Eileen McNaughton [Thu, 16 Nov 2023 22:59:01 +0000 (11:59 +1300)]
Fix tests to not notice when faking form flow

2 years agoFix tax total not showing on thank you
Eileen McNaughton [Thu, 16 Nov 2023 20:53:38 +0000 (09:53 +1300)]
Fix tax total not showing on thank you

2 years agoMerge pull request #28170 from totten/5.68-mixin-since
Eileen McNaughton [Thu, 16 Nov 2023 23:02:02 +0000 (12:02 +1300)]
Merge pull request #28170 from totten/5.68-mixin-since

(NFC) setting-admin@1 - Fix the `@since` metadata

2 years agosetting-admin@1 - Raise version to 1.1.0
Tim Otten [Thu, 16 Nov 2023 20:00:00 +0000 (12:00 -0800)]
setting-admin@1 - Raise version to 1.1.0

The original implementation uses some small niceties that don't backport well. Let's call this 1.1.x.

I've got a separate variant that backports better. We'll call that 1.0.x.

2 years ago(NFC) setting-admin@1 - Fix the `@since` metadata
Tim Otten [Thu, 16 Nov 2023 19:33:13 +0000 (11:33 -0800)]
(NFC) setting-admin@1 - Fix the `@since` metadata

The code was originally written during 5.67.alpha1 and then merged during
5.68.alpha. So the `@since` is slightly off.

2 years agoMerge pull request #28137 from colemanw/havingFix
Seamus Lee [Thu, 16 Nov 2023 00:00:37 +0000 (11:00 +1100)]
Merge pull request #28137 from colemanw/havingFix

APIv4 - Fix index interfering with HAVING

2 years agoMerge pull request #28153 from demeritcowboy/menu-missing
Seamus Lee [Wed, 15 Nov 2023 20:10:59 +0000 (07:10 +1100)]
Merge pull request #28153 from demeritcowboy/menu-missing

dev/core#4778 - php notice causes civi menu to go missing

2 years agoAPIv4 - Fix index interfering with HAVING
colemanw [Tue, 14 Nov 2023 18:40:29 +0000 (13:40 -0500)]
APIv4 - Fix index interfering with HAVING

It's not always safe to delete items from the SELECT clause... so let's not.
Fixes dev/core#4017

2 years agophp notice
demeritcowboy [Wed, 15 Nov 2023 19:10:28 +0000 (14:10 -0500)]
php notice

2 years agoMerge pull request #28145 from colemanw/parentNames
colemanw [Wed, 15 Nov 2023 16:11:12 +0000 (11:11 -0500)]
Merge pull request #28145 from colemanw/parentNames

dev/core#4740 - Fix missing tagsets when label doesn't match name

2 years agodev/core#4740 - Fix missing tagsets when label doesn't match name
colemanw [Wed, 15 Nov 2023 01:10:38 +0000 (20:10 -0500)]
dev/core#4740 - Fix missing tagsets when label doesn't match name

CRM_Core_Form_Tag::buildQuickForm was previously being passed an array of [id => name]
but it was wastefully ignoring the passed ids and looking it up from the name.

Now due to bcf668d is being passed an array of [id => label] which is all it needs,
just had to remove the wasteful id lookup when it's already there.

2 years agoMerge pull request #28133 from colemanw/civiCasePerms
colemanw [Wed, 15 Nov 2023 00:48:55 +0000 (19:48 -0500)]
Merge pull request #28133 from colemanw/civiCasePerms

dev/core#4769 APIv4 - Fix access to case activities for administrators

2 years agoMerge pull request #28130 from eileenmcnaughton/568
Seamus Lee [Tue, 14 Nov 2023 02:50:02 +0000 (13:50 +1100)]
Merge pull request #28130 from eileenmcnaughton/568

Update the parameters passed to the hook_QueueTaskError

2 years agoAPIv4 - Fix access to case activities for administrators
colemanw [Tue, 14 Nov 2023 01:57:26 +0000 (20:57 -0500)]
APIv4 - Fix access to case activities for administrators

Fixes dev/core#4769

Before: Case administrators with 'access deleted contacts' permission blocked from viewing Case activities in APIv4
After: Permissions work correctly.

The problem was the hook logic was incorrectly interpreting empty permissions to mean "no access"
when it actually means "unrestricted access".

2 years agoMerge pull request #28128 from seamuslee001/dev_core_4768_568
demeritcowboy [Tue, 14 Nov 2023 01:23:27 +0000 (20:23 -0500)]
Merge pull request #28128 from seamuslee001/dev_core_4768_568

dev/core#4768 Fix validating contact when using checksum url

2 years agoUpdate the parameters passed to the hook_QueueTaskError
Adedoyin Damilare [Mon, 13 Nov 2023 19:59:27 +0000 (19:59 +0000)]
Update the parameters passed to the hook_QueueTaskError

Issue: https://lab.civicrm.org/dev/core/-/issues/4774

2 years agoMerge pull request #28124 from colemanw/fixApi4QueryRegression
colemanw [Tue, 14 Nov 2023 00:16:53 +0000 (19:16 -0500)]
Merge pull request #28124 from colemanw/fixApi4QueryRegression

dev/core#4773 - Fix APIv4 query regression

2 years agoAdd unit test
Seamus Lee [Mon, 13 Nov 2023 23:43:57 +0000 (10:43 +1100)]
Add unit test

2 years agodev/core#4768 Fix validating contact when using checksum url
Seamus Lee [Mon, 13 Nov 2023 21:58:09 +0000 (08:58 +1100)]
dev/core#4768 Fix validating contact when using checksum url

Fix type error failures

2 years agoMerge pull request #28121 from colemanw/contact_autocomplete_options
Seamus Lee [Mon, 13 Nov 2023 20:46:38 +0000 (07:46 +1100)]
Merge pull request #28121 from colemanw/contact_autocomplete_options

dev/core#4759 - Respect Autocomplete Contact Search preferences in menubar quicksearch

2 years agodev/core#4773 - Fix APIv4 query regression
colemanw [Mon, 13 Nov 2023 20:42:09 +0000 (15:42 -0500)]
dev/core#4773 - Fix APIv4 query regression

2 years agodev/core#4759 - Respect Autocomplete Contact Search preferences in menubar quicksearch
colemanw [Mon, 13 Nov 2023 19:43:40 +0000 (14:43 -0500)]
dev/core#4759 - Respect Autocomplete Contact Search preferences in menubar quicksearch

2 years agoMerge pull request #28103 from colemanw/tagIndividuals
demeritcowboy [Mon, 13 Nov 2023 14:19:52 +0000 (09:19 -0500)]
Merge pull request #28103 from colemanw/tagIndividuals

APIv4 - Fix missing tag filer on Individual,Organization,Household

2 years agoMerge pull request #28113 from jitendrapurohit/reminder-error-rc
colemanw [Sun, 12 Nov 2023 13:31:15 +0000 (08:31 -0500)]
Merge pull request #28113 from jitendrapurohit/reminder-error-rc

Schedule Job fails with a fatal error if configured with an absolute date

2 years agoFix reminder error with absolute date
Jitendra Purohit [Sun, 12 Nov 2023 05:45:47 +0000 (11:15 +0530)]
Fix reminder error with absolute date

2 years agoAPIv4 - Fix missing tag filer on Individual,Organization,Household entities
colemanw [Fri, 10 Nov 2023 18:59:01 +0000 (13:59 -0500)]
APIv4 - Fix missing tag filer on Individual,Organization,Household entities

2 years agoMerge pull request #28099 from eileenmcnaughton/568
Eileen McNaughton [Fri, 10 Nov 2023 07:10:28 +0000 (20:10 +1300)]
Merge pull request #28099 from eileenmcnaughton/568

Fix rc-unreleased regression - tax amount not loading

2 years agoFix rc-unreleased regression - tax amount not loading
Eileen McNaughton [Fri, 10 Nov 2023 06:23:48 +0000 (19:23 +1300)]
Fix rc-unreleased regression - tax amount not loading

2 years agoMerge pull request #28085 from eileenmcnaughton/mailing
demeritcowboy [Fri, 10 Nov 2023 03:20:20 +0000 (22:20 -0500)]
Merge pull request #28085 from eileenmcnaughton/mailing

Add weights to CRM_Mailing_BAO_Mailing::getContactMailingSelector

2 years agoMerge pull request #28090 from demeritcowboy/eggscape
Eileen McNaughton [Fri, 10 Nov 2023 01:18:55 +0000 (14:18 +1300)]
Merge pull request #28090 from demeritcowboy/eggscape

Fix source html displaying when editing price option

2 years agofix source html displaying
demeritcowboy [Thu, 9 Nov 2023 23:43:30 +0000 (18:43 -0500)]
fix source html displaying

2 years agoAdd weights to CRM_Mailing_BAO_Mailing::getContactMailingSelector
Eileen McNaughton [Thu, 9 Nov 2023 21:11:23 +0000 (10:11 +1300)]
Add weights to CRM_Mailing_BAO_Mailing::getContactMailingSelector

2 years agoMerge pull request #28072 from colemanw/advSearchQuickSearchMatch
Eileen McNaughton [Thu, 9 Nov 2023 21:03:45 +0000 (10:03 +1300)]
Merge pull request #28072 from colemanw/advSearchQuickSearchMatch

QuickSearch - Fix redirect to adv search with prepopulated criteria

2 years agoMerge pull request #28079 from chriscant/civi-api-kernel-error2
Eileen McNaughton [Thu, 9 Nov 2023 20:51:57 +0000 (09:51 +1300)]
Merge pull request #28079 from chriscant/civi-api-kernel-error2

Ensure api/v3/utils.php required before civicrm_api3_create_error 5.68

2 years agoEnsure api/v3/utils.php required before civicrm_api3_create_error 5.68
Chris Cant [Thu, 9 Nov 2023 14:37:50 +0000 (14:37 +0000)]
Ensure api/v3/utils.php required before civicrm_api3_create_error 5.68

2 years agoMerge pull request #28073 from totten/master568-http-log
Seamus Lee [Thu, 9 Nov 2023 01:23:56 +0000 (12:23 +1100)]
Merge pull request #28073 from totten/master568-http-log

(NFC) MenuXmlTest - Improve debug output. Use richer helpers.

2 years agoMenuXmlTest - Improve debug output. Use richer helpers.
Tim Otten [Wed, 8 Nov 2023 23:37:36 +0000 (15:37 -0800)]
MenuXmlTest - Improve debug output. Use richer helpers.

In automated test-runs, the e2e test for `mixin/menu-xml@1` (`MenuXmlTest`) has been failing sporadically.
The failure always involves one of the HTTP sub-requests, but it's never clear what actually happened
in the HTTP sub-request. This patch improves debug info.

Before
-------

Send HTTP sub-request with simple primitives (`cv` + `file_get_contents`).  No detailed information about the failed request.

After
-----

Send HTTP sub-request with `HttpTestTrait` (`guzzle`). Use rich assertions that log more detailed information.

2 years agoHttpTestTrait - Add more assertion helpers
Tim Otten [Wed, 8 Nov 2023 23:37:03 +0000 (15:37 -0800)]
HttpTestTrait - Add more assertion helpers

2 years agoQuickSearch - Fix redirect to adv search with prepopulated criteria
colemanw [Thu, 9 Nov 2023 00:12:34 +0000 (19:12 -0500)]
QuickSearch - Fix redirect to adv search with prepopulated criteria

Fixes dev/core#4624

Bridges the mismatch between APIv4-style field names and AdvSearch-style field names
with a good ol-fashioned mapper.

2 years agoMerge pull request #28051 from eileenmcnaughton/import_568
demeritcowboy [Wed, 8 Nov 2023 15:20:42 +0000 (10:20 -0500)]
Merge pull request #28051 from eileenmcnaughton/import_568

dev/core#4554  Delete related Queue when user job deleted

2 years agodev/core#4554 Delete related Queue when user job deleted
Eileen McNaughton [Wed, 8 Nov 2023 01:37:44 +0000 (14:37 +1300)]
dev/core#4554  Delete related Queue when user job deleted

2 years agoMerge pull request #28040 from colemanw/angularDepNotice
Seamus Lee [Tue, 7 Nov 2023 21:17:29 +0000 (08:17 +1100)]
Merge pull request #28040 from colemanw/angularDepNotice

[NFC] More descriptive deprecation notice for Angular settings

2 years agoMore descriptive deprecation notice for Angular settings
colemanw [Tue, 7 Nov 2023 19:49:30 +0000 (14:49 -0500)]
More descriptive deprecation notice for Angular settings

2 years agoMerge pull request #28036 from demeritcowboy/case-edit
colemanw [Tue, 7 Nov 2023 18:41:30 +0000 (13:41 -0500)]
Merge pull request #28036 from demeritcowboy/case-edit

dev/core#4755 - typo causes activity type to go missing on case activity edit

2 years agotypo
demeritcowboy [Tue, 7 Nov 2023 14:51:54 +0000 (09:51 -0500)]
typo

2 years agoMerge pull request #28018 from colemanw/searchFunctionZeroBugFix
demeritcowboy [Tue, 7 Nov 2023 13:59:25 +0000 (08:59 -0500)]
Merge pull request #28018 from colemanw/searchFunctionZeroBugFix

SearchKit - Fix field transformation UI to handle number 0

2 years agoMerge pull request #28029 from MegaphoneJon/deprecated-part-token
Eileen McNaughton [Mon, 6 Nov 2023 22:48:38 +0000 (11:48 +1300)]
Merge pull request #28029 from MegaphoneJon/deprecated-part-token

Add check for deprecated token in event online receipt

2 years agoAdd check for deprecated token in event online receipt
Jon Goldberg [Mon, 6 Nov 2023 20:28:45 +0000 (15:28 -0500)]
Add check for deprecated token in event online receipt

2 years agoSearchKit - Fix field transformation UI to handle number 0
colemanw [Sat, 4 Nov 2023 02:29:15 +0000 (22:29 -0400)]
SearchKit - Fix field transformation UI to handle number 0

This is the old number 0 is falsey bug.
To reproduce, add a field transformation such as if/else,
clear the field values and select numbers.
The number zero will be treated as empty and not work.

2 years agoMerge pull request #28010 from eileenmcnaughton/notice_568
colemanw [Fri, 3 Nov 2023 11:36:17 +0000 (07:36 -0400)]
Merge pull request #28010 from eileenmcnaughton/notice_568

Fix unreleased regression - notice on undefined variable

2 years agoFix unreleased regression - notice on undefined variable
Eileen McNaughton [Fri, 3 Nov 2023 02:50:38 +0000 (15:50 +1300)]
Fix unreleased regression - notice on undefined variable

This notice is in recently extracted code

2 years agoMerge pull request #28002 from eileenmcnaughton/568
Seamus Lee [Fri, 3 Nov 2023 03:29:43 +0000 (14:29 +1100)]
Merge pull request #28002 from eileenmcnaughton/568

Smarty3 - fix space breaking syntax

2 years agoMerge pull request #28004 from eileenmcnaughton/568_price
colemanw [Fri, 3 Nov 2023 02:07:54 +0000 (22:07 -0400)]
Merge pull request #28004 from eileenmcnaughton/568_price

Fix 5.68 unreleased regression - repeattransaction fails if CiviMember not installed

2 years agoFix 5.68 unreleased regression - repeattransaction fails if CiviMember not installed
Eileen McNaughton [Fri, 3 Nov 2023 00:01:18 +0000 (13:01 +1300)]
Fix 5.68 unreleased regression - repeattransaction fails if CiviMember not installed

2 years agoSmarty3 - fix space breaking syntax
Eileen McNaughton [Thu, 2 Nov 2023 22:51:26 +0000 (11:51 +1300)]
Smarty3 - fix space breaking syntax

2 years agoMerge pull request #27992 from artfulrobot/artfulrobot-issue-4746-php73
Seamus Lee [Thu, 2 Nov 2023 21:26:25 +0000 (08:26 +1100)]
Merge pull request #27992 from artfulrobot/artfulrobot-issue-4746-php73

standaloneusers: remove property type declarations to make php7.3 compat

2 years agoMerge pull request #27990 from seamuslee001/regex_test_failure
Seamus Lee [Thu, 2 Nov 2023 21:26:11 +0000 (08:26 +1100)]
Merge pull request #27990 from seamuslee001/regex_test_failure

[REF] dev/core#4747 Fix Binary Regex by casting field to Binary

2 years agoMerge pull request #27922 from colemanw/setVersionStableOnly
Tim Otten [Thu, 2 Nov 2023 20:59:36 +0000 (13:59 -0700)]
Merge pull request #27922 from colemanw/setVersionStableOnly

Releaser - Only update core extensions for stable versions

2 years agoMerge pull request #27993 from colemanw/fillEntityDefaults
Seamus Lee [Thu, 2 Nov 2023 20:54:59 +0000 (07:54 +1100)]
Merge pull request #27993 from colemanw/fillEntityDefaults

APIv4 - Ensure 'search_fields' defaults to 'label_field' for Entity.get

2 years agoMerge pull request #27996 from mlutfy/flagsTypeError
Seamus Lee [Thu, 2 Nov 2023 20:53:59 +0000 (07:53 +1100)]
Merge pull request #27996 from mlutfy/flagsTypeError

PHP 8.x: fix TypeError in config hook

2 years agoPHP 8.x: fix TypeError in config hook
Mathieu Lu [Thu, 2 Nov 2023 19:50:41 +0000 (15:50 -0400)]
PHP 8.x: fix TypeError in config hook

2 years agostandaloneusers: remove property type declarations to make php7.3 compatible dev...
Rich Lott / Artful Robot [Thu, 2 Nov 2023 11:24:36 +0000 (11:24 +0000)]
standaloneusers: remove property type declarations to make php7.3 compatible dev/core/4746

2 years agoSet version to 5.68.beta1
CiviCRM [Thu, 2 Nov 2023 01:06:03 +0000 (01:06 +0000)]
Set version to 5.68.beta1

2 years agoAPIv4 - Ensure 'search_fields' defaults to 'label_field' for Entity.get
colemanw [Thu, 2 Nov 2023 00:59:35 +0000 (20:59 -0400)]
APIv4 - Ensure 'search_fields' defaults to 'label_field' for Entity.get

This default is set in the AbstractEntity class, but not every entity inherits from that class,
e.g. ECK does not.
So it needs to be filled in by the Entity.get action

2 years agoset-version - Yes increment for 5.68.x=>5.69.alpha. But OK to skip alpha2, beta2...
Tim Otten [Thu, 2 Nov 2023 00:53:06 +0000 (17:53 -0700)]
set-version - Yes increment for 5.68.x=>5.69.alpha. But OK to skip alpha2, beta2, beta3, etc

2 years ago[REF] dev/core#4747 Fix Binary Regex by casting field to Binary
Seamus Lee [Wed, 1 Nov 2023 23:20:11 +0000 (10:20 +1100)]
[REF] dev/core#4747 Fix Binary Regex by casting field to Binary

2 years agoMerge pull request #27982 from eileenmcnaughton/price_field
Eileen McNaughton [Wed, 1 Nov 2023 23:31:37 +0000 (12:31 +1300)]
Merge pull request #27982 from eileenmcnaughton/price_field

Fix master-only-over-aggressive escaping

2 years agoMerge pull request #27984 from eileenmcnaughton/options_m
demeritcowboy [Wed, 1 Nov 2023 23:20:26 +0000 (19:20 -0400)]
Merge pull request #27984 from eileenmcnaughton/options_m

Notice fixes on price field options

2 years agoMerge pull request #27912 from ranjit-git/master
Eileen McNaughton [Wed, 1 Nov 2023 22:55:30 +0000 (11:55 +1300)]
Merge pull request #27912 from ranjit-git/master

Improve template handling in report

2 years agoMerge pull request #27977 from JMAConsulting/improve-geocoding-for-address
Eileen McNaughton [Wed, 1 Nov 2023 22:54:34 +0000 (11:54 +1300)]
Merge pull request #27977 from JMAConsulting/improve-geocoding-for-address

Improve Geocoding for addresses

2 years agoMerge pull request #27979 from colemanw/unconfirmed
Eileen McNaughton [Wed, 1 Nov 2023 22:53:34 +0000 (11:53 +1300)]
Merge pull request #27979 from colemanw/unconfirmed

Add label & color to CiviPetition 'Unconfirmed' tag

2 years agoMerge pull request #27943 from colemanw/fixDownload
Eileen McNaughton [Wed, 1 Nov 2023 22:51:19 +0000 (11:51 +1300)]
Merge pull request #27943 from colemanw/fixDownload

dev/core#4731 - Fix column index error in SearchKit download

2 years agoMerge pull request #27924 from demeritcowboy/tag-name
Eileen McNaughton [Wed, 1 Nov 2023 22:50:21 +0000 (11:50 +1300)]
Merge pull request #27924 from demeritcowboy/tag-name

dev/core#4727 - Tags displaying name instead of label in various places

2 years agoMerge pull request #27613 from eileenmcnaughton/part_trait
Eileen McNaughton [Wed, 1 Nov 2023 22:46:16 +0000 (11:46 +1300)]
Merge pull request #27613 from eileenmcnaughton/part_trait

Move participant-form-specific defaults back to participant form

2 years agoMerge pull request #27987 from seamuslee001/master
Seamus Lee [Wed, 1 Nov 2023 22:44:34 +0000 (09:44 +1100)]
Merge pull request #27987 from seamuslee001/master

5.67

2 years agoMerge branch '5.67'
Seamus Lee [Wed, 1 Nov 2023 22:42:58 +0000 (09:42 +1100)]
Merge branch '5.67'

2 years agoMerge pull request #27983 from eileenmcnaughton/options
Eileen McNaughton [Wed, 1 Nov 2023 22:39:06 +0000 (11:39 +1300)]
Merge pull request #27983 from eileenmcnaughton/options

Add a few more weights - price field options page

2 years agoMerge pull request #27965 from eileenmcnaughton/567
demeritcowboy [Wed, 1 Nov 2023 22:16:45 +0000 (18:16 -0400)]
Merge pull request #27965 from eileenmcnaughton/567

rc only regression - price set validation on participant form

2 years agoMerge pull request #27981 from totten/5.67-log-locale
Tim Otten [Wed, 1 Nov 2023 22:15:58 +0000 (15:15 -0700)]
Merge pull request #27981 from totten/5.67-log-locale

Logging - If valid, then set a locale

2 years agoNotice fixes on price field options
Eileen McNaughton [Wed, 1 Nov 2023 21:06:48 +0000 (10:06 +1300)]
Notice fixes on price field options

Fixes smarty notices on
https://dmaster.localhost:32353/civicrm/admin/price/field/option?action=browse&reset=1&sid=3&fid=2

2 years agoAdd a few more weights - price field page
Eileen McNaughton [Wed, 1 Nov 2023 20:57:50 +0000 (09:57 +1300)]
Add a few more weights - price field page

2 years agoFix master-only-over-aggressive escaping
Eileen McNaughton [Wed, 1 Nov 2023 20:48:26 +0000 (09:48 +1300)]
Fix master-only-over-aggressive escaping

2 years agocomposer.json - Lock in a snapshot of the patch file
Tim Otten [Wed, 1 Nov 2023 20:40:19 +0000 (13:40 -0700)]
composer.json - Lock in a snapshot of the patch file