Erik Hommel [Wed, 15 Nov 2023 13:42:38 +0000 (14:42 +0100)]
fix on review
Co-authored-by: demeritcowboy <demeritcowboy@hotmail.com>
Erik Hommel [Tue, 14 Nov 2023 10:04:16 +0000 (11:04 +0100)]
fix issue #4770
Making sure the followup_assignee_contact_id is an array so all assignees are saved, not just the first one
Matthew Wire [Tue, 14 Nov 2023 09:11:22 +0000 (09:11 +0000)]
Merge pull request #28060 from eileenmcnaughton/error_verbose
Use `supportsNoReturn()` instead of contributeMode check
Seamus Lee [Tue, 14 Nov 2023 02:51:48 +0000 (13:51 +1100)]
Merge pull request #28135 from civicrm/5.68
5.68
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
Seamus Lee [Tue, 14 Nov 2023 02:49:53 +0000 (13:49 +1100)]
Merge pull request #28131 from civicrm/5.68
5.68
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
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
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
Seamus Lee [Mon, 13 Nov 2023 23:43:57 +0000 (10:43 +1100)]
Add unit test
Eileen McNaughton [Mon, 13 Nov 2023 22:55:18 +0000 (11:55 +1300)]
Merge pull request #28120 from demeritcowboy/regen
Regen after 28096
Eileen McNaughton [Mon, 13 Nov 2023 22:54:55 +0000 (11:54 +1300)]
Merge pull request #28126 from civicrm/5.68
5.68
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
Seamus Lee [Mon, 13 Nov 2023 20:48:42 +0000 (07:48 +1100)]
Merge pull request #28123 from Damilare1/master
Update the parameters passed to the hook_QueueTaskError
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
colemanw [Mon, 13 Nov 2023 20:42:09 +0000 (15:42 -0500)]
dev/core#4773 - Fix APIv4 query regression
Eileen McNaughton [Mon, 13 Nov 2023 20:30:08 +0000 (09:30 +1300)]
Merge pull request #28080 from MegaphoneJon/badge-layout-another-fix
Updated fix for badge layouts
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
colemanw [Mon, 13 Nov 2023 19:43:40 +0000 (14:43 -0500)]
dev/core#4759 - Respect Autocomplete Contact Search preferences in menubar quicksearch
Jon Goldberg [Thu, 9 Nov 2023 17:01:09 +0000 (12:01 -0500)]
Fix for badge layouts take 3
demeritcowboy [Mon, 13 Nov 2023 19:07:07 +0000 (14:07 -0500)]
regen
demeritcowboy [Mon, 13 Nov 2023 18:58:19 +0000 (13:58 -0500)]
Merge pull request #28096 from eileenmcnaughton/online_cont_notice
Blank out membership_online_receipt - text version
Eileen McNaughton [Fri, 10 Nov 2023 05:23:57 +0000 (18:23 +1300)]
Blank out membership_online_receipt - text version
As with the offline event receipt this reduces the maintenance effort, given that
we generate a text version anyway
demeritcowboy [Mon, 13 Nov 2023 15:34:10 +0000 (10:34 -0500)]
Merge pull request #28116 from demeritcowboy/regen
Regen after 28052
demeritcowboy [Mon, 13 Nov 2023 15:23:39 +0000 (10:23 -0500)]
Merge pull request #28118 from civicrm/5.68
5.68
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
demeritcowboy [Mon, 13 Nov 2023 14:03:39 +0000 (09:03 -0500)]
regen
Seamus Lee [Mon, 13 Nov 2023 06:14:00 +0000 (17:14 +1100)]
Merge pull request #28013 from agileware/CIVICRM-2188
Pass year to mktime as int in CRM_Contribution_Form_ContributionCharts
Francis Whittle [Fri, 3 Nov 2023 03:12:47 +0000 (14:12 +1100)]
CIVICRM-2188 Pass year to mktime as int in CRM_Contribution_Form_ContributionCharts
Prevents fatal error in PHP 8.1
colemanw [Mon, 13 Nov 2023 00:53:05 +0000 (19:53 -0500)]
Merge pull request #28052 from agileware/CIVICRM-2189
Revisit the default Scheduled Jobs. Adjust the frequency…
Eileen McNaughton [Sun, 12 Nov 2023 20:26:41 +0000 (09:26 +1300)]
Merge pull request #28106 from braders/groupcontact-context
[REF][PHP8.2] Declare properties in CRM_Contact_Form_GroupContact
Eileen McNaughton [Sun, 12 Nov 2023 20:26:11 +0000 (09:26 +1300)]
Merge pull request #28107 from braders/badge-context
[REF][PHP8.2] Declare properties in CRM_Event_Form_Task_Badge
Eileen McNaughton [Sun, 12 Nov 2023 20:25:43 +0000 (09:25 +1300)]
Merge pull request #28114 from civicrm/5.68
5.68
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
Jitendra Purohit [Sun, 12 Nov 2023 05:45:47 +0000 (11:15 +0530)]
Fix reminder error with absolute date
Seamus Lee [Sat, 11 Nov 2023 22:54:54 +0000 (09:54 +1100)]
Merge pull request #28108 from braders/php82-membershiptest
[REF][PHP8.2] Fix MembershipTest on PHP 8.2
colemanw [Sat, 11 Nov 2023 22:03:12 +0000 (17:03 -0500)]
Merge pull request #28110 from braders/php8.2-subscription-details-property
[REF][PHP8.2] Ensure _subscriptionDetails is consistently declared
colemanw [Sat, 11 Nov 2023 22:02:21 +0000 (17:02 -0500)]
Merge pull request #28111 from braders/php8.2-batchformentry
[REF][PHP8.2] Update CRM_Batch_Form_Entry
demeritcowboy [Sat, 11 Nov 2023 18:27:04 +0000 (13:27 -0500)]
Merge pull request #28109 from braders/php8.2-self-svc-update
[REF][PHP8.2] Cleanup CRM_Event_Form_SelfSvcUpdate
Bradley Taylor [Sat, 11 Nov 2023 17:51:20 +0000 (17:51 +0000)]
[REF][PHP8.2] Update CRM_Batch_Form_Entry
Bradley Taylor [Sat, 11 Nov 2023 17:22:47 +0000 (17:22 +0000)]
[REF][PHP8.2] Cleanup CRM_Event_Form_SelfSvcUpdate
Bradley Taylor [Sat, 11 Nov 2023 17:35:43 +0000 (17:35 +0000)]
[REF][PHP8.2] Ensure _subscriptionDetails is consistently declared
Bradley Taylor [Sat, 11 Nov 2023 17:12:39 +0000 (17:12 +0000)]
[REF][PHP8.2] Fix MembershipTest on PHP 8.2
Bradley Taylor [Sat, 11 Nov 2023 17:07:41 +0000 (17:07 +0000)]
[REF][PHP8.2] Declare properties in CRM_Event_Form_Task_Badge
Bradley Taylor [Sat, 11 Nov 2023 17:00:49 +0000 (17:00 +0000)]
[REF][PHP8.2] Declare properties in CRM_Contact_Form_GroupContact
colemanw [Fri, 10 Nov 2023 18:59:01 +0000 (13:59 -0500)]
APIv4 - Fix missing tag filer on Individual,Organization,Household entities
demeritcowboy [Fri, 10 Nov 2023 13:11:31 +0000 (08:11 -0500)]
Merge pull request #28098 from eileenmcnaughton/notice_info
Fix notice on intro_text when none configured for the page
Eileen McNaughton [Fri, 10 Nov 2023 07:17:39 +0000 (20:17 +1300)]
Merge pull request #28100 from eileenmcnaughton/smarty3_options
Remove extraneous space, breaks smarty3
Eileen McNaughton [Fri, 10 Nov 2023 07:11:06 +0000 (20:11 +1300)]
Merge pull request #28101 from civicrm/5.68
5.68 to master
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
Eileen McNaughton [Fri, 10 Nov 2023 06:34:40 +0000 (19:34 +1300)]
Remove extraneous space, breaks smarty3
Eileen McNaughton [Fri, 10 Nov 2023 06:23:48 +0000 (19:23 +1300)]
Fix rc-unreleased regression - tax amount not loading
Seamus Lee [Fri, 10 Nov 2023 06:13:45 +0000 (17:13 +1100)]
Merge pull request #28091 from eileenmcnaughton/online_cont_main
Add testing on emails for separate payment,
Eileen McNaughton [Fri, 10 Nov 2023 05:55:35 +0000 (18:55 +1300)]
Fix notice on intro_text when none configured for the page
colemanw [Fri, 10 Nov 2023 04:40:04 +0000 (23:40 -0500)]
Merge pull request #28095 from eileenmcnaughton/online_cont_notice
Fix notice on is_quick_config - Main contribution page
Eileen McNaughton [Fri, 10 Nov 2023 03:41:00 +0000 (16:41 +1300)]
Fix notice on is_quick_config
is_quick_config is only assigned when a payment is being made on an existing
contribution - this was a bit hard to figure out so I switched to using
a variable that explicitly says what it means (rather than guess at ccid)
and ensured that is_quick_config was only accessed within these blocks
Also, I pulled the assignment on the Dummy processor name from out of
the unrelated function
demeritcowboy [Fri, 10 Nov 2023 03:52:39 +0000 (22:52 -0500)]
Merge pull request #28094 from civicrm/5.68
5.68
demeritcowboy [Fri, 10 Nov 2023 03:27:40 +0000 (22:27 -0500)]
Merge pull request #28077 from eileenmcnaughton/csv_columns
[REF] Extract code to determine the column names
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
Eileen McNaughton [Fri, 10 Nov 2023 02:48:10 +0000 (15:48 +1300)]
Add testing on emails for separate payment
Eileen McNaughton [Fri, 10 Nov 2023 02:48:03 +0000 (15:48 +1300)]
Merge pull request #28093 from eileenmcnaughton/confirm_if
Simplify if
Eileen McNaughton [Fri, 10 Nov 2023 02:09:27 +0000 (15:09 +1300)]
Simplify if
Eileen McNaughton [Fri, 10 Nov 2023 02:06:18 +0000 (15:06 +1300)]
Merge pull request #28092 from civicrm/5.68
5.68 to master
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
demeritcowboy [Fri, 10 Nov 2023 00:07:57 +0000 (19:07 -0500)]
Merge pull request #28089 from eileenmcnaughton/CRM/Report
dev/core#3202 Fix incorrect display of join date in membership detail report
demeritcowboy [Thu, 9 Nov 2023 23:43:30 +0000 (18:43 -0500)]
fix source html displaying
Eileen McNaughton [Thu, 9 Nov 2023 23:23:01 +0000 (12:23 +1300)]
dev/core#3202 Fix incorrect display of join date in membership detail report
Eileen McNaughton [Thu, 9 Nov 2023 22:46:16 +0000 (11:46 +1300)]
Merge pull request #28088 from eileenmcnaughton/online_cont_main
Add missing quote
Eileen McNaughton [Thu, 9 Nov 2023 22:11:52 +0000 (11:11 +1300)]
Add missing quote
Eileen McNaughton [Thu, 9 Nov 2023 21:11:23 +0000 (10:11 +1300)]
Add weights to CRM_Mailing_BAO_Mailing::getContactMailingSelector
Eileen McNaughton [Thu, 9 Nov 2023 21:04:52 +0000 (10:04 +1300)]
Merge pull request #28084 from civicrm/5.68
5.68 to master
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
Eileen McNaughton [Thu, 9 Nov 2023 20:57:27 +0000 (09:57 +1300)]
Merge pull request #28081 from colemanw/isPublic
Afform - Fix undefined index warning
Eileen McNaughton [Thu, 9 Nov 2023 20:53:40 +0000 (09:53 +1300)]
Merge pull request #28083 from civicrm/5.68
5.68 to master
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
colemanw [Thu, 9 Nov 2023 19:30:19 +0000 (14:30 -0500)]
Afform - Fix undefined index warning
Fixes a warning caused by
604cca726c6a238e0530b5f660ab0e11596da090
colemanw [Thu, 9 Nov 2023 19:22:01 +0000 (14:22 -0500)]
Merge pull request #28042 from colemanw/angularGlob
[REF] Angular - cleanup core angular module declarations
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
Justin Freeman [Wed, 8 Nov 2023 02:06:44 +0000 (13:06 +1100)]
CIVICRM-2189 Revisit the default Scheduled Jobs. Adjust the frequency. Remove comments from API parameters which cause the Job to not execute. Include documentation URL in job description. Add new jobs.
Eileen McNaughton [Thu, 9 Nov 2023 03:45:33 +0000 (16:45 +1300)]
[REF] Extract code to determine the column names
Eileen McNaughton [Thu, 9 Nov 2023 03:15:37 +0000 (16:15 +1300)]
Merge pull request #28074 from eileenmcnaughton/csv
Follow up fixes on `maxFileSize`
Eileen McNaughton [Thu, 9 Nov 2023 03:15:24 +0000 (16:15 +1300)]
Merge pull request #28075 from civicrm/5.68
5.68
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.
Seamus Lee [Thu, 9 Nov 2023 00:57:19 +0000 (11:57 +1100)]
Merge pull request #28055 from seamuslee001/update_firebase_jwt
Update Firebase JWT to version 6.x
Eileen McNaughton [Thu, 9 Nov 2023 00:55:12 +0000 (13:55 +1300)]
Merge pull request #28071 from mattwire/confirmcleanup
REF: Cleanup to Event Registration Confirm form
Eileen McNaughton [Thu, 9 Nov 2023 00:48:36 +0000 (13:48 +1300)]
Follow up fixes on maxFileSize
This addresses an incorrect mixing of the size in bytes & megabytes that was just merged and extracts
the getting of the maxFileSize to a generic file location
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.
Tim Otten [Wed, 8 Nov 2023 23:37:03 +0000 (15:37 -0800)]
HttpTestTrait - Add more assertion helpers
Eileen McNaughton [Thu, 9 Nov 2023 00:15:34 +0000 (13:15 +1300)]
Merge pull request #28066 from eileenmcnaughton/member_renew
Declare _groupTree on MembershipRenewal form
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.
Matthew Wire [Wed, 8 Nov 2023 23:39:48 +0000 (23:39 +0000)]
Rename loop variables for clarity
Matthew Wire [Wed, 8 Nov 2023 23:37:32 +0000 (23:37 +0000)]
Cleanup to event confirm form
Eileen McNaughton [Wed, 8 Nov 2023 23:34:35 +0000 (12:34 +1300)]
Merge pull request #28067 from braders/topdonor-php8
[REF][PHP8.2] Properties in TopDonor report
Eileen McNaughton [Wed, 8 Nov 2023 21:56:12 +0000 (10:56 +1300)]
Declare _groupTree on MembershipRenewal form
colemanw [Wed, 8 Nov 2023 23:19:56 +0000 (18:19 -0500)]
Merge pull request #28056 from seamuslee001/remove_phantomjs_launcher
Remove karama-phantomjs-launcher as we now use chrome browser for kar…
Seamus Lee [Wed, 8 Nov 2023 06:45:13 +0000 (17:45 +1100)]
[REF] Update Firebase JWT to be version 6.x
Add in Deprecation notice for versions less than 6 and add in compatability layer
demeritcowboy [Wed, 8 Nov 2023 22:53:51 +0000 (17:53 -0500)]
Merge pull request #28063 from eileenmcnaughton/reg
Remove registered_by_id as not set in this flow
Bradley Taylor [Wed, 8 Nov 2023 22:01:50 +0000 (22:01 +0000)]
[REF][PHP8.2] Properties in TopDonor report
Eileen McNaughton [Wed, 8 Nov 2023 21:51:02 +0000 (10:51 +1300)]
Merge pull request #28064 from braders/label-generator-properties
[REF][PHP8.2] Declare properties in CRM_Utils_PDF_Label
Eileen McNaughton [Wed, 8 Nov 2023 21:32:50 +0000 (10:32 +1300)]
Merge pull request #28062 from braders/feature/processor-form-test-remove-line
[REF][PHP8.2] Remove unused id property