civicrm-core.git
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 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 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 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 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 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

14 months agoMerge branch 'master' into up-merge
Eileen McNaughton [Fri, 8 Sep 2023 04:04:50 +0000 (16:04 +1200)]
Merge branch 'master' into up-merge

14 months agoMerge pull request #27372 from larssandergreen/Expose_fee_label_for_event_tokens
Eileen McNaughton [Fri, 8 Sep 2023 04:02:59 +0000 (16:02 +1200)]
Merge pull request #27372 from larssandergreen/Expose_fee_label_for_event_tokens

Expose fee_label for event tokens

14 months agoExpose fee_lable for event tokens
larssandergreen [Fri, 8 Sep 2023 03:26:50 +0000 (21:26 -0600)]
Expose fee_lable for event tokens

14 months agoMerge pull request #27373 from civicrm/5.66
Eileen McNaughton [Fri, 8 Sep 2023 01:15:15 +0000 (13:15 +1200)]
Merge pull request #27373 from civicrm/5.66

5.66 to master

14 months agoMerge pull request #27367 from eileenmcnaughton/566
colemanw [Fri, 8 Sep 2023 01:09:54 +0000 (21:09 -0400)]
Merge pull request #27367 from eileenmcnaughton/566

Fix notice on unpaid event

14 months agoMerge pull request #27370 from civicrm/5.66
Eileen McNaughton [Fri, 8 Sep 2023 00:25:47 +0000 (12:25 +1200)]
Merge pull request #27370 from civicrm/5.66

5.66

14 months agoMerge pull request #27371 from eileenmcnaughton/contribute_mode
Eileen McNaughton [Fri, 8 Sep 2023 00:25:30 +0000 (12:25 +1200)]
Merge pull request #27371 from eileenmcnaughton/contribute_mode

Stop checking contributeMode in ContributionPage confirm.tpl before displaying billingName

14 months agoMerge pull request #27234 from eileenmcnaughton/no_if
colemanw [Thu, 7 Sep 2023 23:34:01 +0000 (19:34 -0400)]
Merge pull request #27234 from eileenmcnaughton/no_if

Cleanup presentation of total to improve code & reduce notices

14 months agoMerge pull request #27293 from colemanw/requireAfform
colemanw [Thu, 7 Sep 2023 23:30:41 +0000 (19:30 -0400)]
Merge pull request #27293 from colemanw/requireAfform

Afform - Make Afform Core extension required

14 months agoStop checking contributeMode in ContributionPage confirm.tpl
Eileen McNaughton [Thu, 7 Sep 2023 23:17:28 +0000 (11:17 +1200)]
Stop checking contributeMode in ContributionPage confirm.tpl

14 months agoMerge pull request #27368 from seamuslee001/5.66
Seamus Lee [Thu, 7 Sep 2023 23:20:39 +0000 (09:20 +1000)]
Merge pull request #27368 from seamuslee001/5.66

[REF] Ensure that any NULL values in the title field are fixed prior …

14 months agoRemove unnecessary contributeMode reference
Eileen McNaughton [Thu, 7 Sep 2023 23:01:01 +0000 (11:01 +1200)]
Remove unnecessary contributeMode reference

If trxn_id is present, then show it.

The variable is always assigned in
https://github.com/civicrm/civicrm-core/blob/2ad38a735f7b26daf99d7b63eb413c6b69f780cb/CRM/Contribute/Form/Contribution/ThankYou.php#L212

So we don't need more (deprecated) conditions

14 months agoMerge pull request #27149 from totten/master-config-param
colemanw [Thu, 7 Sep 2023 22:45:59 +0000 (18:45 -0400)]
Merge pull request #27149 from totten/master-config-param

hook_civicrm_config: Add extra information to distinguish invocations

14 months agoMerge pull request #27365 from civicrm/5.66
Eileen McNaughton [Thu, 7 Sep 2023 22:43:58 +0000 (10:43 +1200)]
Merge pull request #27365 from civicrm/5.66

5.66

14 months agoFix notice on unpaid event
Eileen McNaughton [Thu, 7 Sep 2023 21:50:57 +0000 (09:50 +1200)]
Fix notice on unpaid event

14 months ago[REF] Ensure that any NULL values in the title field are fixed prior to changing...
Seamus Lee [Thu, 7 Sep 2023 22:32:07 +0000 (08:32 +1000)]
[REF] Ensure that any NULL values in the title field are fixed prior to changing the column

14 months agoAfform - Make Afform Core and Authx extensions required
colemanw [Mon, 4 Sep 2023 16:41:39 +0000 (12:41 -0400)]
Afform - Make Afform Core and Authx extensions required

This enables Afform by default (and its dependency Authx) on all CiviCRM installs;
they cannot be disabled.

14 months agoMerge pull request #27128 from christianwach/lang
colemanw [Thu, 7 Sep 2023 21:57:18 +0000 (17:57 -0400)]
Merge pull request #27128 from christianwach/lang

Support retention of locale on links

14 months agoMerge pull request #27364 from seamuslee001/5.66
Seamus Lee [Thu, 7 Sep 2023 21:35:08 +0000 (07:35 +1000)]
Merge pull request #27364 from seamuslee001/5.66

FiveSixtyFour: disable i18n rewrite on cancel_URL

14 months agoMerge pull request #27363 from eileenmcnaughton/event_id
Seamus Lee [Thu, 7 Sep 2023 20:58:40 +0000 (06:58 +1000)]
Merge pull request #27363 from eileenmcnaughton/event_id

Ensure event ID is an integer

14 months agoFiveSixtyFour: disable i18n rewrite on cancel_URL
Mathieu Lu [Thu, 7 Sep 2023 19:24:12 +0000 (15:24 -0400)]
FiveSixtyFour: disable i18n rewrite on cancel_URL

14 months agoEnsure event ID is an integer
Eileen McNaughton [Thu, 7 Sep 2023 20:13:06 +0000 (08:13 +1200)]
Ensure event ID is an integer

14 months agoMerge pull request #27361 from civicrm/5.66
Eileen McNaughton [Thu, 7 Sep 2023 19:59:30 +0000 (07:59 +1200)]
Merge pull request #27361 from civicrm/5.66

5.66

14 months agoMerge pull request #27349 from larssandergreen/event-tokens-clean-up
Eileen McNaughton [Thu, 7 Sep 2023 19:56:35 +0000 (07:56 +1200)]
Merge pull request #27349 from larssandergreen/event-tokens-clean-up

Event tokens clean up

14 months agoMerge pull request #27358 from colemanw/pseudoconstantGuard
colemanw [Thu, 7 Sep 2023 19:19:04 +0000 (15:19 -0400)]
Merge pull request #27358 from colemanw/pseudoconstantGuard

PseudoConstant - Prevent fatal when entity not available

14 months agoPseudoConstant - Prevent fatal when entity not available
colemanw [Thu, 7 Sep 2023 17:38:12 +0000 (13:38 -0400)]
PseudoConstant - Prevent fatal when entity not available

This can happen e.g when Views tries to lookup an option value for a disabled extension.
See https://github.com/civicrm/civicrm-drupal/pull/656#issuecomment-1094362139

14 months agoMerge pull request #27287 from eileenmcnaughton/pay_later
colemanw [Thu, 7 Sep 2023 17:55:40 +0000 (13:55 -0400)]
Merge pull request #27287 from eileenmcnaughton/pay_later

Fix offline event form validation bug when switching events

14 months agoEvent tokens clean up
larssandergreen [Thu, 7 Sep 2023 16:09:42 +0000 (10:09 -0600)]
Event tokens clean up

14 months agoMerge pull request #27357 from colemanw/explorerMulti
colemanw [Thu, 7 Sep 2023 15:29:02 +0000 (11:29 -0400)]
Merge pull request #27357 from colemanw/explorerMulti

APIv4 Explorer - Fix yml input values

14 months agoAPIv4 Explorer - Fix yml input values
colemanw [Thu, 7 Sep 2023 14:07:19 +0000 (10:07 -0400)]
APIv4 Explorer - Fix yml input values

14 months agoMerge pull request #27350 from eileenmcnaughton/incoming_util
colemanw [Thu, 7 Sep 2023 13:09:22 +0000 (09:09 -0400)]
Merge pull request #27350 from eileenmcnaughton/incoming_util

Remove unused variable

14 months agoMerge pull request #27353 from larssandergreen/rtrim-text-to-html-for-tokens
Eileen McNaughton [Thu, 7 Sep 2023 06:13:56 +0000 (18:13 +1200)]
Merge pull request #27353 from larssandergreen/rtrim-text-to-html-for-tokens

rtrim when converting text tokens to html to avoid trailing newlines

14 months agortrim when converting text tokens to html to avoid trailing newlines
larssandergreen [Thu, 7 Sep 2023 03:23:11 +0000 (21:23 -0600)]
rtrim when converting text tokens to html to avoid trailing newlines

14 months agoRemove unused parameter
Eileen McNaughton [Thu, 7 Sep 2023 01:20:49 +0000 (13:20 +1200)]
Remove unused parameter

14 months agoSet version to 5.67.alpha1
CiviCRM [Thu, 7 Sep 2023 02:14:23 +0000 (02:14 +0000)]
Set version to 5.67.alpha1

14 months agoSet version to 5.66.beta1
CiviCRM [Thu, 7 Sep 2023 02:14:09 +0000 (02:14 +0000)]
Set version to 5.66.beta1

14 months agoMerge pull request #27330 from alifrumin/4555
Eileen McNaughton [Thu, 7 Sep 2023 01:39:49 +0000 (13:39 +1200)]
Merge pull request #27330 from alifrumin/4555

dev/core#4555 When using a Contribution Page with a Membership Price Set, the contribution amount information never shows on the thank you page

14 months agoMerge pull request #27345 from eileenmcnaughton/eileen
Eileen McNaughton [Thu, 7 Sep 2023 01:38:05 +0000 (13:38 +1200)]
Merge pull request #27345 from eileenmcnaughton/eileen

Fold deprecated function back into the caller

14 months agoMerge pull request #27344 from seamuslee001/update_zetacomponents
Eileen McNaughton [Thu, 7 Sep 2023 01:10:27 +0000 (13:10 +1200)]
Merge pull request #27344 from seamuslee001/update_zetacomponents

[REF] Update Zetacomponents/mail to be 1.9.5 to fix email validation …

14 months agoFix variable name clash
Eileen McNaughton [Thu, 7 Sep 2023 00:34:57 +0000 (12:34 +1200)]
Fix variable name clash

14 months ago[REF] Update Zetacomponents/mail to be 1.9.5 to fix email validation handling
Seamus Lee [Wed, 6 Sep 2023 23:51:21 +0000 (09:51 +1000)]
[REF] Update Zetacomponents/mail to be 1.9.5 to fix email validation handling

14 months agoMerge pull request #27348 from seamuslee001/master
Seamus Lee [Thu, 7 Sep 2023 00:26:17 +0000 (10:26 +1000)]
Merge pull request #27348 from seamuslee001/master

5.65

14 months agoMerge branch '5.65'
Seamus Lee [Thu, 7 Sep 2023 00:24:48 +0000 (10:24 +1000)]
Merge branch '5.65'

14 months agoUpdate release-notes/5.65.0.md
Tim Otten [Wed, 6 Sep 2023 05:15:51 +0000 (22:15 -0700)]
Update release-notes/5.65.0.md

14 months agoPurify in the social network section as well
Seamus Lee [Sat, 2 Sep 2023 22:18:26 +0000 (08:18 +1000)]
Purify in the social network section as well

14 months agosecurity/core#114 Fix Stored XSS in event title field
Seamus Lee [Tue, 1 Mar 2022 04:52:47 +0000 (15:52 +1100)]
security/core#114 Fix Stored XSS in event title field

14 months agoAdd code comment as per Coleman
Seamus Lee [Sun, 3 Sep 2023 01:07:47 +0000 (11:07 +1000)]
Add code comment as per Coleman

14 months agoMinor fix
Seamus Lee [Sat, 2 Sep 2023 22:49:40 +0000 (08:49 +1000)]
Minor fix

14 months agoAlso fix deleting from PCPAccount form class
Seamus Lee [Sat, 2 Sep 2023 22:28:52 +0000 (08:28 +1000)]
Also fix deleting from PCPAccount form class

14 months agosecurity/core#126 Ensure that QFKey is validated when deleting a contact image
Seamus Lee [Sat, 2 Sep 2023 22:03:19 +0000 (08:03 +1000)]
security/core#126 Ensure that QFKey is validated when deleting a contact image

14 months agoFix security/core#126 csrf bug to delete contact image
colemanw [Sat, 2 Sep 2023 18:52:27 +0000 (14:52 -0400)]
Fix security/core#126 csrf bug to delete contact image

14 months agoFix security/core#125 Stored xss in survey title
colemanw [Sat, 2 Sep 2023 18:28:02 +0000 (14:28 -0400)]
Fix security/core#125 Stored xss in survey title

14 months agoCIVI-SA-2023-12 - jQuery Validation
CiviCRM [Sat, 2 Sep 2023 05:16:48 +0000 (22:16 -0700)]
CIVI-SA-2023-12 - jQuery Validation

14 months agoCIVI-SA-2023-11 - Potential XSS
CiviCRM [Sat, 2 Sep 2023 05:13:40 +0000 (22:13 -0700)]
CIVI-SA-2023-11 - Potential XSS

14 months agoCIVI-SA-2023-10 - Potential SQLI
CiviCRM [Sat, 2 Sep 2023 05:13:39 +0000 (22:13 -0700)]
CIVI-SA-2023-10 - Potential SQLI

14 months agoCIVI-SA-2023-09 - SQLI via API getFields
CiviCRM [Sat, 2 Sep 2023 05:13:38 +0000 (22:13 -0700)]
CIVI-SA-2023-09 - SQLI via API getFields

14 months agoMerge pull request #27346 from seamuslee001/5.65
Seamus Lee [Thu, 7 Sep 2023 00:18:42 +0000 (10:18 +1000)]
Merge pull request #27346 from seamuslee001/5.65

Correct Credit card month description in release notes

14 months agoCorrect Credit card month description in release notes
Seamus Lee [Thu, 7 Sep 2023 00:14:06 +0000 (10:14 +1000)]
Correct Credit card month description in release notes

14 months agoMerge pull request #27343 from seamuslee001/master
Seamus Lee [Wed, 6 Sep 2023 23:55:37 +0000 (09:55 +1000)]
Merge pull request #27343 from seamuslee001/master

5.65

14 months agoMerge pull request #26861 from totten/master-url
colemanw [Wed, 6 Sep 2023 23:54:14 +0000 (19:54 -0400)]
Merge pull request #26861 from totten/master-url

(dev/core#4433) - Implement Civi::url() with prefixes and OOP enhancements

14 months agoFold deprecated function back into the caller
Eileen McNaughton [Wed, 6 Sep 2023 23:53:19 +0000 (11:53 +1200)]
Fold deprecated function back into the caller

We have a situation where the first function called (parseMailingObject) formats stuff weirdly just to be undone by the second.

Moving the handling to a single place (the calling function) will allow us to unravel this

14 months agoMerge branch '5.65'
Seamus Lee [Wed, 6 Sep 2023 23:25:31 +0000 (09:25 +1000)]
Merge branch '5.65'

14 months agoMerge pull request #27333 from eileenmcnaughton/tok
Seamus Lee [Wed, 6 Sep 2023 23:23:36 +0000 (09:23 +1000)]
Merge pull request #27333 from eileenmcnaughton/tok

dev/core#4551 Fix escaping on token event.title

14 months agoMerge pull request #27337 from eileenmcnaughton/email_start
colemanw [Wed, 6 Sep 2023 23:12:42 +0000 (19:12 -0400)]
Merge pull request #27337 from eileenmcnaughton/email_start

Move regex processing in EmailProcessor to handling class

14 months agoFix schema for pay_later_receipt input type
Eileen McNaughton [Wed, 6 Sep 2023 22:59:19 +0000 (10:59 +1200)]
Fix schema for pay_later_receipt input type

14 months agodev/core#4551 Fix escaping on token event.title
Eileen McNaughton [Wed, 6 Sep 2023 19:58:49 +0000 (07:58 +1200)]
dev/core#4551 Fix escaping on token event.title

14 months agoMerge pull request #27342 from seamuslee001/master
Seamus Lee [Wed, 6 Sep 2023 22:56:49 +0000 (08:56 +1000)]
Merge pull request #27342 from seamuslee001/master

5.65

14 months agoMerge branch '5.65'
Seamus Lee [Wed, 6 Sep 2023 22:55:16 +0000 (08:55 +1000)]
Merge branch '5.65'

14 months agoMerge pull request #27340 from seamuslee001/565_regen
Seamus Lee [Wed, 6 Sep 2023 22:50:41 +0000 (08:50 +1000)]
Merge pull request #27340 from seamuslee001/565_regen

[REF] Regen after civicrm/civicrm-core#27335

14 months agoMerge pull request #27331 from colemanw/searchKitDefaults
Eileen McNaughton [Wed, 6 Sep 2023 22:43:15 +0000 (10:43 +1200)]
Merge pull request #27331 from colemanw/searchKitDefaults

SearchKit - Fix default search columns