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

14 months agoMerge pull request #27341 from civicrm/5.65
Seamus Lee [Wed, 6 Sep 2023 22:42:36 +0000 (08:42 +1000)]
Merge pull request #27341 from civicrm/5.65

5.65

14 months agoMerge pull request #27321 from eileenmcnaughton/email_api
colemanw [Wed, 6 Sep 2023 22:28:22 +0000 (18:28 -0400)]
Merge pull request #27321 from eileenmcnaughton/email_api

Improve error handling by using civicrm_api3 not civicrm_api

14 months agoMerge pull request #27339 from agh1/5.65.0-releasenotes-final
Seamus Lee [Wed, 6 Sep 2023 22:23:36 +0000 (08:23 +1000)]
Merge pull request #27339 from agh1/5.65.0-releasenotes-final

5.65.0 release notes: added late changes

14 months ago[REF] Regen after civicrm/civicrm-core#27335
Seamus Lee [Wed, 6 Sep 2023 22:15:48 +0000 (08:15 +1000)]
[REF] Regen after civicrm/civicrm-core#27335

14 months ago5.65.0 release notes: added late changes
Andie Hunt [Wed, 6 Sep 2023 22:12:28 +0000 (18:12 -0400)]
5.65.0 release notes: added late changes

14 months agoMerge pull request #27338 from colemanw/crmStatusRevert
Eileen McNaughton [Wed, 6 Sep 2023 22:07:29 +0000 (10:07 +1200)]
Merge pull request #27338 from colemanw/crmStatusRevert

Revert "Update CRM.status for compatability with native js promises"

14 months agoMove regex processing in EmailProcessor to handling class
Eileen McNaughton [Wed, 6 Sep 2023 21:46:10 +0000 (09:46 +1200)]
Move regex processing in EmailProcessor to handling class

This is a partial of https://github.com/civicrm/civicrm-core/pull/27319
and includes moving a big chunk of code but no logic changes

There is good test cover in CRM_Utils_Mail_EmailProcessorTest

I have split this out as it gets some of the 'bulk' out of that PR which
has a lot of more complex changes to grok

14 months agoSearchKit - Use angular helper crmStatus for in-place-edit
colemanw [Wed, 6 Sep 2023 22:02:29 +0000 (18:02 -0400)]
SearchKit - Use angular helper crmStatus for in-place-edit

Followup to #27105 this uses native angular service instead of jQuery-based function

14 months agoRevert "Update CRM.status for compatability with native js promises"
colemanw [Wed, 6 Sep 2023 21:48:41 +0000 (17:48 -0400)]
Revert "Update CRM.status for compatability with native js promises"

This reverts commit 5e6740703f417d2d4d0c3d625bbe0cdfd00cd549.
It was causing loading errors at ext/message_admin/ang/crmMsgadm/User.js#L18

14 months agoMerge pull request #27336 from civicrm/5.65
Eileen McNaughton [Wed, 6 Sep 2023 21:35:04 +0000 (09:35 +1200)]
Merge pull request #27336 from civicrm/5.65

5.65 to master

14 months agoMerge pull request #27334 from colemanw/getCalcFields
Eileen McNaughton [Wed, 6 Sep 2023 21:34:25 +0000 (09:34 +1200)]
Merge pull request #27334 from colemanw/getCalcFields

SearchKit - Don't crash afforms with non-dao entities

14 months agoMerge pull request #27335 from larssandergreen/fix-missing-event-pay-later-receipt...
Eileen McNaughton [Wed, 6 Sep 2023 21:33:44 +0000 (09:33 +1200)]
Merge pull request #27335 from larssandergreen/fix-missing-event-pay-later-receipt-text

Fix missing event pay later receipt text

14 months agoFix missing event pay later receipt text
larssandergreen [Wed, 6 Sep 2023 20:50:13 +0000 (14:50 -0600)]
Fix missing event pay later receipt text

14 months agoSearchKit - Don't crash afforms with non-dao entities
colemanw [Wed, 6 Sep 2023 20:42:48 +0000 (16:42 -0400)]
SearchKit - Don't crash afforms with non-dao entities

14 months agoupdate confirm too
Alice Frumin [Wed, 6 Sep 2023 17:01:49 +0000 (13:01 -0400)]
update confirm too

14 months agoSearchKit - Fix default search columns
colemanw [Wed, 6 Sep 2023 16:14:54 +0000 (12:14 -0400)]
SearchKit - Fix default search columns

14 months agoMerge pull request #27329 from mlutfy/eventDashboardEndDate
colemanw [Wed, 6 Sep 2023 16:22:58 +0000 (12:22 -0400)]
Merge pull request #27329 from mlutfy/eventDashboardEndDate

Event Dashboard: show events that have not ended yet

14 months agodev/core#4555 When using a Contribution Page with a Membership Price Set, the contrib...
Alice Frumin [Wed, 6 Sep 2023 15:40:50 +0000 (11:40 -0400)]
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 agoEvent Dashboard: show events that have not ended yet
Mathieu Lu [Wed, 6 Sep 2023 15:25:09 +0000 (11:25 -0400)]
Event Dashboard: show events that have not ended yet

14 months agoMerge pull request #27305 from eileenmcnaughton/preview
Yashodha Chaku [Wed, 6 Sep 2023 14:47:01 +0000 (20:17 +0530)]
Merge pull request #27305 from eileenmcnaughton/preview

Remove unreachable page

14 months agoMerge pull request #27327 from demeritcowboy/weight
Monish Deb [Wed, 6 Sep 2023 14:36:34 +0000 (20:06 +0530)]
Merge pull request #27327 from demeritcowboy/weight

Set link weight on manage case

14 months agoweight
demeritcowboy [Wed, 6 Sep 2023 13:22:10 +0000 (09:22 -0400)]
weight

14 months agoMerge pull request #27320 from eileenmcnaughton/processor
colemanw [Wed, 6 Sep 2023 12:18:29 +0000 (08:18 -0400)]
Merge pull request #27320 from eileenmcnaughton/processor

Remove unused parameter, pass by reference in private function with one caller

14 months agoMerge pull request #27323 from eileenmcnaughton/weight
colemanw [Wed, 6 Sep 2023 12:17:24 +0000 (08:17 -0400)]
Merge pull request #27323 from eileenmcnaughton/weight

Define weight for links on extensions page, financial types, financial accounts

14 months agoMerge pull request #27326 from civicrm/5.65
Eileen McNaughton [Wed, 6 Sep 2023 11:55:36 +0000 (23:55 +1200)]
Merge pull request #27326 from civicrm/5.65

5.65 to master

14 months agoMerge pull request #27324 from eileenmcnaughton/565
colemanw [Wed, 6 Sep 2023 11:54:07 +0000 (07:54 -0400)]
Merge pull request #27324 from eileenmcnaughton/565

Fix enotice (possible regression)

14 months agoAdd weights to contribution page links
Eileen McNaughton [Wed, 6 Sep 2023 11:48:39 +0000 (23:48 +1200)]
Add weights to contribution page links

14 months agoFix enotice (possible regression)
Eileen McNaughton [Wed, 6 Sep 2023 08:10:20 +0000 (20:10 +1200)]
Fix enotice (possible regression)

It's clear in the function that lineItem is only defined for add - I hit the enotice editing
the participant to be paid. Not sure if this is a regression but there was a related one
fixed in 5.65 or 5.64 so targetting the rc

14 months agoAdd weight to contribution tasks
Eileen McNaughton [Wed, 6 Sep 2023 07:55:57 +0000 (19:55 +1200)]
Add weight to contribution tasks

14 months agoAdd weights to Manage Event links
Eileen McNaughton [Wed, 6 Sep 2023 07:32:49 +0000 (19:32 +1200)]
Add weights to Manage Event links

14 months agoAdd weights on assign financial account page
Eileen McNaughton [Wed, 6 Sep 2023 07:28:10 +0000 (19:28 +1200)]
Add weights on assign financial account page

14 months agoAdd weights to financial type screen
Eileen McNaughton [Wed, 6 Sep 2023 07:26:09 +0000 (19:26 +1200)]
Add weights to financial type screen

14 months agoAdd weights on financial accounts page
Eileen McNaughton [Wed, 6 Sep 2023 07:23:29 +0000 (19:23 +1200)]
Add weights on financial accounts page

14 months agoDefine weight for links on extensions page
Eileen McNaughton [Wed, 6 Sep 2023 07:18:32 +0000 (19:18 +1200)]
Define weight for links on extensions page

14 months agoMerge pull request #27317 from eileenmcnaughton/process
Yashodha Chaku [Wed, 6 Sep 2023 07:04:08 +0000 (12:34 +0530)]
Merge pull request #27317 from eileenmcnaughton/process

Remove long-broken function

14 months agoImprove error handling by using civicrm_api3 not civicrm_api
Eileen McNaughton [Wed, 6 Sep 2023 05:42:44 +0000 (17:42 +1200)]
Improve error handling by using civicrm_api3 not civicrm_api

14 months agoRemove unused parameter, pass by reference in private function with one caller
Eileen McNaughton [Wed, 6 Sep 2023 05:38:15 +0000 (17:38 +1200)]
Remove unused parameter, pass by reference in private function with one caller

14 months agoMerge pull request #27318 from eileenmcnaughton/legacy
colemanw [Wed, 6 Sep 2023 01:37:50 +0000 (21:37 -0400)]
Merge pull request #27318 from eileenmcnaughton/legacy

Finish CiviCRM 2.1 deprecation - old style verp

14 months agoMerge pull request #27259 from eileenmcnaughton/lookup
Eileen McNaughton [Wed, 6 Sep 2023 01:23:37 +0000 (13:23 +1200)]
Merge pull request #27259 from eileenmcnaughton/lookup

Use new lookup trait to eliminate use of undefined properties `userDisplayName`

14 months agoMerge pull request #27315 from colemanw/actionScheduleFix
demeritcowboy [Wed, 6 Sep 2023 00:31:14 +0000 (20:31 -0400)]
Merge pull request #27315 from colemanw/actionScheduleFix

Fix dev/core#4550 - Crash when saving repeating event

14 months agoMerge pull request #27288 from eileenmcnaughton/total
Seamus Lee [Tue, 5 Sep 2023 23:46:35 +0000 (09:46 +1000)]
Merge pull request #27288 from eileenmcnaughton/total

dev/3410#3410 Show 0 rather than nothing when paid amount is zero

14 months agoMerge pull request #27281 from eileenmcnaughton/fin_test
Seamus Lee [Tue, 5 Sep 2023 23:45:09 +0000 (09:45 +1000)]
Merge pull request #27281 from eileenmcnaughton/fin_test

Fix financial transfer test to use form flow, allow all pending to transfer

14 months agoFinish CiviCRM 2.1 deprecation - old style verp
Eileen McNaughton [Tue, 5 Sep 2023 22:30:54 +0000 (10:30 +1200)]
Finish CiviCRM 2.1 deprecation - old style verp

14 months agoRemove long-broken function
wikimediaWfan [Mon, 3 Oct 2022 18:54:03 +0000 (11:54 -0700)]
Remove long-broken function

14 months agoFix dev/core#4550 - Crash when saving repeating event
colemanw [Tue, 5 Sep 2023 21:34:15 +0000 (17:34 -0400)]
Fix dev/core#4550 - Crash when saving repeating event

14 months agoAdminUi - Exclude non-scheduled-reminders from schedule reminders table
colemanw [Tue, 5 Sep 2023 21:32:30 +0000 (17:32 -0400)]
AdminUi - Exclude non-scheduled-reminders from schedule reminders table

The ActionSchedule table is overloaded for use by repeating events & activities.
This hides the things that aren't supposed to be shown.

14 months agoMerge pull request #27173 from larssandergreen/Show-Contribution-Page-receipt-text...
Eileen McNaughton [Tue, 5 Sep 2023 21:10:25 +0000 (09:10 +1200)]
Merge pull request #27173 from larssandergreen/Show-Contribution-Page-receipt-text-in-offline-contribution-receipt

Show Contribution Page receipt text in offline contribution receipt

14 months agoMerge pull request #26243 from eileenmcnaughton/weight
colemanw [Tue, 5 Sep 2023 21:03:47 +0000 (17:03 -0400)]
Merge pull request #26243 from eileenmcnaughton/weight

Let unset weights give an e-notice