Seamus Lee [Wed, 6 Sep 2023 23:55:37 +0000 (09:55 +1000)]
Merge pull request #27343 from seamuslee001/master
5.65
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
Seamus Lee [Wed, 6 Sep 2023 23:25:31 +0000 (09:25 +1000)]
Merge branch '5.65'
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
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
Eileen McNaughton [Wed, 6 Sep 2023 22:59:19 +0000 (10:59 +1200)]
Fix schema for pay_later_receipt input type
Eileen McNaughton [Wed, 6 Sep 2023 19:58:49 +0000 (07:58 +1200)]
dev/core#4551 Fix escaping on token event.title
Seamus Lee [Wed, 6 Sep 2023 22:56:49 +0000 (08:56 +1000)]
Merge pull request #27342 from seamuslee001/master
5.65
Seamus Lee [Wed, 6 Sep 2023 22:55:16 +0000 (08:55 +1000)]
Merge branch '5.65'
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
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
Seamus Lee [Wed, 6 Sep 2023 22:42:36 +0000 (08:42 +1000)]
Merge pull request #27341 from civicrm/5.65
5.65
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
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
Seamus Lee [Wed, 6 Sep 2023 22:15:48 +0000 (08:15 +1000)]
[REF] Regen after civicrm/civicrm-core#27335
Andie Hunt [Wed, 6 Sep 2023 22:12:28 +0000 (18:12 -0400)]
5.65.0 release notes: added late changes
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"
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
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
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
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
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
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
larssandergreen [Wed, 6 Sep 2023 20:50:13 +0000 (14:50 -0600)]
Fix missing event pay later receipt text
colemanw [Wed, 6 Sep 2023 20:42:48 +0000 (16:42 -0400)]
SearchKit - Don't crash afforms with non-dao entities
colemanw [Wed, 6 Sep 2023 16:14:54 +0000 (12:14 -0400)]
SearchKit - Fix default search columns
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
Mathieu Lu [Wed, 6 Sep 2023 15:25:09 +0000 (11:25 -0400)]
Event Dashboard: show events that have not ended yet
Yashodha Chaku [Wed, 6 Sep 2023 14:47:01 +0000 (20:17 +0530)]
Merge pull request #27305 from eileenmcnaughton/preview
Remove unreachable page
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
demeritcowboy [Wed, 6 Sep 2023 13:22:10 +0000 (09:22 -0400)]
weight
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
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
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
colemanw [Wed, 6 Sep 2023 11:54:07 +0000 (07:54 -0400)]
Merge pull request #27324 from eileenmcnaughton/565
Fix enotice (possible regression)
Eileen McNaughton [Wed, 6 Sep 2023 11:48:39 +0000 (23:48 +1200)]
Add weights to contribution page links
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
Eileen McNaughton [Wed, 6 Sep 2023 07:55:57 +0000 (19:55 +1200)]
Add weight to contribution tasks
Eileen McNaughton [Wed, 6 Sep 2023 07:32:49 +0000 (19:32 +1200)]
Add weights to Manage Event links
Eileen McNaughton [Wed, 6 Sep 2023 07:28:10 +0000 (19:28 +1200)]
Add weights on assign financial account page
Eileen McNaughton [Wed, 6 Sep 2023 07:26:09 +0000 (19:26 +1200)]
Add weights to financial type screen
Eileen McNaughton [Wed, 6 Sep 2023 07:23:29 +0000 (19:23 +1200)]
Add weights on financial accounts page
Eileen McNaughton [Wed, 6 Sep 2023 07:18:32 +0000 (19:18 +1200)]
Define weight for links on extensions page
Yashodha Chaku [Wed, 6 Sep 2023 07:04:08 +0000 (12:34 +0530)]
Merge pull request #27317 from eileenmcnaughton/process
Remove long-broken function
Eileen McNaughton [Wed, 6 Sep 2023 05:42:44 +0000 (17:42 +1200)]
Improve error handling by using civicrm_api3 not civicrm_api
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
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
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`
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
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
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
Eileen McNaughton [Tue, 5 Sep 2023 22:30:54 +0000 (10:30 +1200)]
Finish CiviCRM 2.1 deprecation - old style verp
wikimediaWfan [Mon, 3 Oct 2022 18:54:03 +0000 (11:54 -0700)]
Remove long-broken function
colemanw [Tue, 5 Sep 2023 21:34:15 +0000 (17:34 -0400)]
Fix dev/core#4550 - Crash when saving repeating event
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.
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
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
Eileen McNaughton [Tue, 5 Sep 2023 20:26:25 +0000 (08:26 +1200)]
Merge pull request #27304 from eileenmcnaughton/split
Make splitjob function static & private, Remove a couple of unused variables
Eileen McNaughton [Tue, 5 Sep 2023 19:28:18 +0000 (07:28 +1200)]
Merge pull request #27312 from civicrm/5.65
5.65
Eileen McNaughton [Tue, 5 Sep 2023 19:26:57 +0000 (07:26 +1200)]
Merge pull request #27298 from eileenmcnaughton/82_import
Remove some unused undefined properties from participant export
Eileen McNaughton [Tue, 5 Sep 2023 19:25:35 +0000 (07:25 +1200)]
Merge pull request #27255 from seamuslee001/dep_warning_participant_trait
[REF] Convert from session status to deprecation warning
Eileen McNaughton [Tue, 5 Sep 2023 19:15:17 +0000 (07:15 +1200)]
Make split job static & private
This is a pre-requisite to https://github.com/civicrm/civicrm-core/pull/27303
larssandergreen [Tue, 5 Sep 2023 19:03:40 +0000 (13:03 -0600)]
Show Contribution Page receipt text in contribution receipts
Eileen McNaughton [Tue, 5 Sep 2023 03:55:48 +0000 (15:55 +1200)]
Remove a couple of unused variables
Eileen McNaughton [Tue, 5 Sep 2023 19:09:02 +0000 (07:09 +1200)]
Merge pull request #27314 from larssandergreen/Fix-token-consistency-test
Fix token consistency test with new lines and <br>s
colemanw [Tue, 5 Sep 2023 19:08:11 +0000 (15:08 -0400)]
Merge pull request #27295 from eileenmcnaughton/trxn
Switch to using token for trxn_id, online contribution receipt
larssandergreen [Tue, 5 Sep 2023 19:03:34 +0000 (13:03 -0600)]
Fix token consistency test with new lines and <br>s
colemanw [Tue, 5 Sep 2023 18:55:39 +0000 (14:55 -0400)]
Merge pull request #27081 from colemanw/savedSearchReminders
dev/core#2644 Add Scheduled Communications extension
colemanw [Tue, 5 Sep 2023 18:25:00 +0000 (14:25 -0400)]
Merge pull request #27313 from lemniscus/session-set-comment
[NFC] Be more confident and informative in the comment for CRM_Core_Session::set()
Noah Miller [Tue, 5 Sep 2023 17:59:11 +0000 (13:59 -0400)]
Be more confident and informative in the comment for CRM_Core_Session::set()
demeritcowboy [Tue, 5 Sep 2023 17:50:52 +0000 (13:50 -0400)]
Merge pull request #27310 from artfulrobot/artfulrobot-fix-job-log-updater
Fix upgrader SQL (5.60) that updates civicrm_job_log
colemanw [Tue, 5 Sep 2023 16:18:59 +0000 (12:18 -0400)]
ActionSchedule - Don't crash when mapping type is missing
colemanw [Tue, 5 Sep 2023 17:24:45 +0000 (13:24 -0400)]
Merge pull request #27203 from eileenmcnaughton/nl2br
Convert new lines to page breaks when rendering text tokens to html
colemanw [Tue, 5 Sep 2023 14:02:55 +0000 (10:02 -0400)]
ScheduledCommunications - Delete when deleting saved search
demeritcowboy [Tue, 5 Sep 2023 15:18:31 +0000 (11:18 -0400)]
Merge pull request #26051 from eileenmcnaughton/nfc2
Unconditionally assign smarty-var, remove unused variables
Rich Lott / Artful Robot [Tue, 5 Sep 2023 14:50:54 +0000 (15:50 +0100)]
Fix upgrader SQL (5.60) that updates civicrm_job_log
This upgrader has broken SQL, joining civicrm_job.id = civicrm_job_log.id causing
crashes on upgrades.
After: fixed the SQL
colemanw [Tue, 5 Sep 2023 13:12:54 +0000 (09:12 -0400)]
Merge pull request #27307 from eileenmcnaughton/processor
Trivial cleanup in EmailProcessorTest
colemanw [Tue, 5 Sep 2023 13:10:57 +0000 (09:10 -0400)]
Merge pull request #27309 from eileenmcnaughton/private
Make function private, after universe search in EmailProcessor
colemanw [Tue, 5 Sep 2023 13:10:20 +0000 (09:10 -0400)]
Merge pull request #27308 from eileenmcnaughton/no_ref
Make function private to reflect usage
colemanw [Tue, 5 Sep 2023 13:03:26 +0000 (09:03 -0400)]
Merge pull request #27306 from eileenmcnaughton/except
Declare CRM_Core_Exception in cleanDir, add type hints
colemanw [Tue, 5 Sep 2023 12:54:49 +0000 (08:54 -0400)]
Merge pull request #27201 from eileenmcnaughton/page_tokens
Add contribution page tokens to contribution tokens
colemanw [Sat, 19 Aug 2023 22:50:54 +0000 (18:50 -0400)]
SearchKit - Add column for scheduled communications to savedSearch listing
Yashodha Chaku [Tue, 5 Sep 2023 06:45:16 +0000 (12:15 +0530)]
Merge pull request #27299 from eileenmcnaughton/pledge
Move function to only form that calls it
Eileen McNaughton [Tue, 5 Sep 2023 06:38:54 +0000 (18:38 +1200)]
Make function private, after universe search
Eileen McNaughton [Tue, 5 Sep 2023 06:30:31 +0000 (18:30 +1200)]
Make function private to reflect usage
A universe search shows it is only called from this class
Eileen McNaughton [Tue, 5 Sep 2023 05:36:07 +0000 (17:36 +1200)]
Trivial cleanup in EmailProcessorTest
Eileen McNaughton [Tue, 5 Sep 2023 05:20:49 +0000 (17:20 +1200)]
Declare CRM_Core_Exception in cleanDir
The only information our exception imparts is that it is
coming from CiviCRM Core - but we should at least be consistent in that.
Also - I think passing something other than a string here would be bad - so
adding a type hint is good. We were already checking not target so the empty string check is redundant
Eileen McNaughton [Tue, 5 Sep 2023 04:13:11 +0000 (16:13 +1200)]
Remove unreachable page
I searched the code (including universe) and the UI for how to reach
CRM_Mailing_Page_Preview / civicrm/mailing/preview but could not find it
The alternate CRM_Mailing_Page_View civicrm/mailing/view appears to be
what is used now
colemanw [Sat, 19 Aug 2023 20:07:38 +0000 (16:07 -0400)]
APIv4 - Add UNIQUE flag to GROUP_CONCAT
Unlike DISTINCT which dedupes by the value of a field, UNIQUE will dedupe by the id of the record
colemanw [Thu, 17 Aug 2023 21:07:26 +0000 (17:07 -0400)]
APIv4 - Improve dataType handling within GROUP_CONCAT
Supports sqlEquations and function suffixes within the aggregated array
colemanw [Wed, 16 Aug 2023 13:56:11 +0000 (08:56 -0500)]
Add Scheduled Communications extension
Permits scheduled reminders to be created based on a SavedSearch
colemanw [Tue, 5 Sep 2023 02:17:22 +0000 (22:17 -0400)]
Merge pull request #27300 from eileenmcnaughton/mailing_archive
Unconditionally assign smarty variable
Eileen McNaughton [Tue, 5 Sep 2023 01:44:49 +0000 (13:44 +1200)]
Merge pull request #27302 from colemanw/api4RequiredFix
APIv4 - Fix setting nullable/required/default_value field metadata
colemanw [Tue, 5 Sep 2023 01:44:34 +0000 (21:44 -0400)]
Merge pull request #27204 from eileenmcnaughton/br2nl
Pass html text through a formatter when translating it to tokens
colemanw [Wed, 16 Aug 2023 00:17:28 +0000 (19:17 -0500)]
ActionSchedule - Enable `getEntityTable()` to return dynamic values
This functionality is needed for SavedSearch-based reminders, which
do not have a fixed base-table.
Eileen McNaughton [Tue, 5 Sep 2023 01:07:00 +0000 (13:07 +1200)]
Merge pull request #27268 from colemanw/recontact_interval
CiviCampaign - Refactor civicrm_survey.recontact_interval
Eileen McNaughton [Tue, 5 Sep 2023 01:05:54 +0000 (13:05 +1200)]
Merge pull request #27105 from colemanw/inPlaceEdit
SearchKit - In-place edit without refreshing results
colemanw [Tue, 5 Sep 2023 00:56:17 +0000 (20:56 -0400)]
APIv4 - Fix setting nullable/required/default_value field metadata
colemanw [Tue, 5 Sep 2023 00:46:55 +0000 (20:46 -0400)]
Merge pull request #27301 from eileenmcnaughton/mailing_const
Remove unused CONST
Eileen McNaughton [Tue, 5 Sep 2023 00:00:13 +0000 (12:00 +1200)]
Remove unused CONST
I can't see any evidence flexmailer or anything else still uses it...