Seamus Lee [Mon, 14 Aug 2023 01:43:20 +0000 (21:43 -0400)]
Merge pull request #27067 from eileenmcnaughton/form_test_fix
Test fix, towards full form flow
Eileen McNaughton [Sun, 13 Aug 2023 23:12:17 +0000 (11:12 +1200)]
Test fix, towards full form flow
Rather than set _isQuickConfig it should be loaded from the db by the form
(which this switches to)
Eileen McNaughton [Sun, 13 Aug 2023 23:00:01 +0000 (11:00 +1200)]
Merge pull request #27060 from colemanw/dontGetFields
Api4 - Remove unused key from getFields
Tim Otten [Sun, 13 Aug 2023 21:10:24 +0000 (14:10 -0700)]
Merge pull request #27063 from eileenmcnaughton/context
Do the todo (move the function to the trait as suggested
demeritcowboy [Sun, 13 Aug 2023 11:57:47 +0000 (06:57 -0500)]
Merge pull request #27042 from colemanw/copyPastaFix
[REF] SearchKit - Cleanup upgrade code
Monish Deb [Sun, 13 Aug 2023 05:31:56 +0000 (11:01 +0530)]
Merge pull request #27064 from eileenmcnaughton/remove_notice
Remove line that gives error & does nothing
Monish Deb [Sun, 13 Aug 2023 05:29:13 +0000 (10:59 +0530)]
Merge pull request #27008 from colemanw/booleanSearch
Simplify queries of NOT NULL fields
Eileen McNaughton [Sun, 13 Aug 2023 00:08:35 +0000 (12:08 +1200)]
Remove line that gives error & does nothing
I went back to 5.55 & did receipt testing and
1) this notice is there already back then
2) it results in a resolved value of 'Array - Display name
3) it does not appear anywhere in the final receipt
colemanw [Sun, 13 Aug 2023 00:04:43 +0000 (20:04 -0400)]
Merge pull request #27061 from demeritcowboy/searchevent-title
Manage event - fix too many brackets
Eileen McNaughton [Sat, 12 Aug 2023 22:53:59 +0000 (10:53 +1200)]
Do the todo (move the function to the trait as suggested
This makes the currency of the contribution available to the template
for other templates - notably offline event receipts
Seamus Lee [Sat, 12 Aug 2023 22:30:11 +0000 (18:30 -0400)]
Merge pull request #27062 from civicrm/5.65
5.65
demeritcowboy [Sat, 12 Aug 2023 20:30:45 +0000 (15:30 -0500)]
Merge pull request #27005 from eileenmcnaughton/end_date
Fix event templates to use end_date token
colemanw [Sat, 12 Aug 2023 19:56:26 +0000 (15:56 -0400)]
Api4 - Remove unused key from getFields
demeritcowboy [Sat, 12 Aug 2023 19:52:01 +0000 (15:52 -0400)]
too many brackets
colemanw [Sat, 12 Aug 2023 14:58:30 +0000 (10:58 -0400)]
Merge pull request #27057 from larssandergreen/Fix-event-fee-help
Fix event fee help
larssandergreen [Sat, 12 Aug 2023 04:47:54 +0000 (22:47 -0600)]
Fix event fee help
Eileen McNaughton [Sat, 12 Aug 2023 03:41:48 +0000 (15:41 +1200)]
Merge pull request #27056 from larssandergreen/Use-statusBounce-instead-of-redirect-when-can't-delete-custom-group
dev/core#4094 Use statusBounce instead of redirect when cannot delete custom group
Eileen McNaughton [Sat, 12 Aug 2023 02:23:10 +0000 (14:23 +1200)]
Merge pull request #27052 from totten/master-data-nonphp
(REF) civicrm_data.tpl - Stop using Smarty's {php}
Eileen McNaughton [Sat, 12 Aug 2023 01:44:20 +0000 (13:44 +1200)]
Merge pull request #27055 from totten/nfc-eventtest
(NFC) Test class - Fix inconsistent namespace
Tim Otten [Sat, 12 Aug 2023 00:47:17 +0000 (17:47 -0700)]
Merge pull request #27032 from eileenmcnaughton/dep
Unit tests - replace deprecated function with newer one
larssandergreen [Sat, 12 Aug 2023 00:26:30 +0000 (18:26 -0600)]
Use statusBounce instead of redirect when cannot delete custom group
Tim Otten [Fri, 11 Aug 2023 23:04:59 +0000 (16:04 -0700)]
(NFC) Test class - Fix inconsistent namespace
Most tests in this folder have a namespace...
colemanw [Fri, 11 Aug 2023 18:20:53 +0000 (14:20 -0400)]
Merge pull request #27053 from mlutfy/fixContributionBaseImplode
Fix PHP 8.0 implode on ContributionBase
Mathieu Lu [Fri, 11 Aug 2023 13:32:25 +0000 (09:32 -0400)]
Fix PHP 8.0 implode on ContributionBase
colemanw [Fri, 11 Aug 2023 12:59:12 +0000 (08:59 -0400)]
Merge pull request #27041 from kurund/afform-submission-schema-changes
(dev/core#4232) Afform submission schema changes
colemanw [Fri, 11 Aug 2023 12:57:09 +0000 (08:57 -0400)]
Merge pull request #27051 from eileenmcnaughton/event_price
Clarify doc-block for form variable
colemanw [Fri, 11 Aug 2023 12:55:44 +0000 (08:55 -0400)]
Merge pull request #27047 from eileenmcnaughton/is_required
Remove do-nothing code.
colemanw [Fri, 11 Aug 2023 12:54:36 +0000 (08:54 -0400)]
Merge pull request #27028 from larssandergreen/Show-which-extension-has-a-parse-error-in-info.xml
Show which extension has a parse error in info.xml
colemanw [Fri, 11 Aug 2023 12:52:00 +0000 (08:52 -0400)]
Merge pull request #27038 from bugfolder/80_global_language
Issue dev/backdrop#80: global $language should be an object.
Kurund Jalmi [Wed, 9 Aug 2023 18:55:54 +0000 (19:55 +0100)]
add status column to afform submissions table
Tim Otten [Fri, 11 Aug 2023 09:21:47 +0000 (02:21 -0700)]
(REF) civicrm_data.tpl - Stop using Smarty's {php}
This should make it easier to try out Smarty 4
Eileen McNaughton [Fri, 11 Aug 2023 06:32:33 +0000 (18:32 +1200)]
Clarify doc-block of for form variable
Seamus Lee [Fri, 11 Aug 2023 04:36:32 +0000 (00:36 -0400)]
Merge pull request #27048 from eileenmcnaughton/notices
E-notice fix, don't skip loading NULL fields
Eileen McNaughton [Fri, 11 Aug 2023 03:20:05 +0000 (15:20 +1200)]
E-notice fix, don't skip loading NULL fields
This addresses e-notices (e.g) when help_pre is NULL & assigned to the template
Eileen McNaughton [Fri, 11 Aug 2023 03:14:40 +0000 (15:14 +1200)]
Remove do-nothing code.
This code conditionally adds the field is_required to the array that already
contains the field is_required
larssandergreen [Fri, 11 Aug 2023 03:11:09 +0000 (21:11 -0600)]
Show which extension has a parse error in info.xml
Seamus Lee [Fri, 11 Aug 2023 00:52:37 +0000 (20:52 -0400)]
Merge pull request #27045 from civicrm/5.65
5.65
colemanw [Fri, 11 Aug 2023 00:03:33 +0000 (20:03 -0400)]
Merge pull request #27043 from seamuslee001/dev_core_4492
dev/core#4492 Ensure that when determining if tokens should be show c…
Seamus Lee [Thu, 10 Aug 2023 22:58:24 +0000 (08:58 +1000)]
dev/core#4492 Ensure that when determining if tokens should be show check if the Entity is in list of Avaliable Entities
colemanw [Thu, 10 Aug 2023 19:52:32 +0000 (15:52 -0400)]
Merge pull request #27033 from colemanw/fixSkEditable
Fix dev/core#4483 SearchKit crash when in-place-editing a field in a joined entity
colemanw [Thu, 10 Aug 2023 18:17:54 +0000 (14:17 -0400)]
SearchKit - Cleanup upgrade code
colemanw [Thu, 10 Aug 2023 15:16:41 +0000 (11:16 -0400)]
Merge pull request #27039 from sebalis/contributor-details-sebalis
added details for sebalis in contributor-key.xml
Sebastian Lisken [Thu, 10 Aug 2023 14:22:15 +0000 (16:22 +0200)]
added details for sebalis in contributor.xml
colemanw [Thu, 10 Aug 2023 14:07:08 +0000 (10:07 -0400)]
Merge pull request #27037 from larssandergreen/Fix-paymentBlock-url-concat
dev/core#4487 Alternative option: Fix paymentBlock url concat
Mathieu Lu [Thu, 10 Aug 2023 13:44:52 +0000 (09:44 -0400)]
Merge pull request #27024 from yashodha/dev-4485
(dev/core#4485) Replace Event Total by Total Amount
Robert J. Lang [Thu, 10 Aug 2023 13:42:22 +0000 (06:42 -0700)]
Issue #80: global $language should be an object.
Eileen McNaughton [Thu, 3 Aug 2023 23:55:36 +0000 (11:55 +1200)]
Fix event templates to use end_date token
Eileen McNaughton [Wed, 9 Aug 2023 21:49:49 +0000 (09:49 +1200)]
Unit tests - replace deprecated function with newer one
Also minor clean ups
larssandergreen [Thu, 10 Aug 2023 05:44:35 +0000 (23:44 -0600)]
Fix paymentBlock url concat
Seamus Lee [Thu, 10 Aug 2023 03:31:13 +0000 (23:31 -0400)]
Merge pull request #27036 from eileenmcnaughton/phpunit
Use phpunit when running on php 7.3+
Eileen McNaughton [Thu, 10 Aug 2023 01:11:32 +0000 (13:11 +1200)]
Use phpunit when running on php 7.3+
colemanw [Thu, 10 Aug 2023 00:51:32 +0000 (20:51 -0400)]
Fix dev/core#4483
colemanw [Wed, 9 Aug 2023 17:44:12 +0000 (13:44 -0400)]
Merge pull request #27027 from allinappliadmin/patch-1-AIA
E:: to make it look after the extension's translation
ALL IN APPLI admin [Wed, 9 Aug 2023 14:44:57 +0000 (16:44 +0200)]
E:: to make it look after the extension's translation
colemanw [Wed, 9 Aug 2023 12:31:02 +0000 (08:31 -0400)]
Merge pull request #27026 from aydun/path_fixes
Path fixes
Aidan Saunders [Wed, 9 Aug 2023 11:54:14 +0000 (12:54 +0100)]
Path fixes
yashodha [Wed, 9 Aug 2023 09:52:57 +0000 (15:22 +0530)]
(dev/core#4485) Replace Event Total by Total Amount
Eileen McNaughton [Wed, 9 Aug 2023 06:21:46 +0000 (18:21 +1200)]
Merge pull request #27023 from eileenmcnaughton/test_twice
Re-enable any queues that were disabled for background processing, on end
Eileen McNaughton [Wed, 9 Aug 2023 04:52:36 +0000 (16:52 +1200)]
Add queue runner test
Eileen McNaughton [Wed, 9 Aug 2023 04:30:42 +0000 (16:30 +1200)]
Re-enable any queues that were disabled for background processing, on end
This addresses what is likely an artificial scenario but
essentially if these steps are followed twice within the same function
- create a queue
- run the queue via runAll
The second time will fail because the queue was disabled & no re-enabled, despite
being perisistent
Mathieu Lu [Tue, 8 Aug 2023 00:45:23 +0000 (20:45 -0400)]
Merge pull request #26292 from larssandergreen/Remove-more-unneeded-descriptions---pledges,-etc
Remove unneeded descriptions and clean up on search forms
Seamus Lee [Mon, 7 Aug 2023 21:37:13 +0000 (17:37 -0400)]
Merge pull request #27022 from eileenmcnaughton/unsubscribe
Wording changes in the Unsubscribe form
PhilMB [Thu, 27 Jul 2023 01:10:40 +0000 (20:10 -0500)]
code clean up
ts variable method updated and OptOutURL removed
colemanw [Mon, 7 Aug 2023 20:14:42 +0000 (16:14 -0400)]
Merge pull request #27015 from eileenmcnaughton/extend
Separate getStatusMessage function
Eileen McNaughton [Mon, 7 Aug 2023 20:06:04 +0000 (08:06 +1200)]
Merge pull request #27021 from civicrm/5.65
5.65 to master
Eileen McNaughton [Mon, 7 Aug 2023 20:05:23 +0000 (08:05 +1200)]
Merge pull request #26969 from demeritcowboy/view-only-merge-hook
dev/core#4481 - View-only custom fields should be merged during merges
demeritcowboy [Mon, 7 Aug 2023 16:34:22 +0000 (12:34 -0400)]
Merge pull request #27019 from eileenmcnaughton/user_name
Remove excessive data handling & some unused variables
demeritcowboy [Mon, 7 Aug 2023 13:19:22 +0000 (09:19 -0400)]
Merge pull request #27020 from civicrm/5.65
5.65
demeritcowboy [Mon, 7 Aug 2023 13:17:30 +0000 (09:17 -0400)]
Merge pull request #27004 from eileenmcnaughton/offline_tokens
Update a couple more tpl variables to tokens
Aidan Saunders [Mon, 7 Aug 2023 11:15:04 +0000 (12:15 +0100)]
Merge pull request #27018 from larssandergreen/Fix-MailSettings-add-path
dev/core#4480 Fix MailSettings add path
Eileen McNaughton [Mon, 7 Aug 2023 06:43:58 +0000 (18:43 +1200)]
Remove excessive data handling & some unused variables
larssandergreen [Mon, 7 Aug 2023 05:49:20 +0000 (23:49 -0600)]
Fix MailSettings add path
Eileen McNaughton [Mon, 7 Aug 2023 01:41:00 +0000 (13:41 +1200)]
Separate getStatusMessage function
The CRM_Event_Form_Task_Register form was once part of CRM_Event_Form_Participant
It now extends it & the goal is to disentangle it from the parent.
In general _single is only set for the parent & describes actions for that
whereas the Register form is a task that can act on many
Eileen McNaughton [Mon, 7 Aug 2023 00:15:51 +0000 (12:15 +1200)]
Merge pull request #27014 from civicrm/5.65
5.65 to master
Eileen McNaughton [Mon, 7 Aug 2023 00:15:09 +0000 (12:15 +1200)]
Merge pull request #27010 from demeritcowboy/fintype
dev/core#4473 - Add/edit financial type screen broken
Eileen McNaughton [Thu, 3 Aug 2023 23:38:37 +0000 (11:38 +1200)]
Update a couple more tpl variables to tokens
event.is_public is already converted in the event online template
- event.email_confirm_text is already tested as a token available
in the offline template. The token layer should take
care of the htmlise question
demeritcowboy [Sat, 5 Aug 2023 13:05:58 +0000 (09:05 -0400)]
fix broken add/edit form
demeritcowboy [Sat, 5 Aug 2023 20:19:51 +0000 (16:19 -0400)]
Merge pull request #27011 from larssandergreen/Remove-inbound-email-parse-function
Remove unused parse function for Incoming Mail
larssandergreen [Sat, 5 Aug 2023 19:29:43 +0000 (13:29 -0600)]
Remove unused parse function
demeritcowboy [Sat, 5 Aug 2023 13:39:03 +0000 (09:39 -0400)]
Merge pull request #27009 from civicrm/5.65
5.65
colemanw [Sat, 5 Aug 2023 01:51:45 +0000 (21:51 -0400)]
Simplify queries of NOT NULL fields
colemanw [Fri, 4 Aug 2023 13:14:15 +0000 (09:14 -0400)]
Merge pull request #27007 from colemanw/fixLink
Fix dev/core#4461 missing links causing SK to return no results
demeritcowboy [Sat, 29 Jul 2023 15:15:49 +0000 (11:15 -0400)]
view-only custom fields should be merged
demeritcowboy [Sat, 29 Jul 2023 14:56:23 +0000 (10:56 -0400)]
Revert "hide view only custom fields on merge screen"
revert
3b9d4007540d19d58c1fed209e88a01fd5084026.
demeritcowboy [Fri, 21 Jul 2023 03:34:09 +0000 (23:34 -0400)]
add real-world example test
colemanw [Fri, 4 Aug 2023 12:39:00 +0000 (08:39 -0400)]
Fix dev/core#4461 missing links causing SK to return no results
Eileen McNaughton [Thu, 3 Aug 2023 23:56:16 +0000 (11:56 +1200)]
Merge pull request #27002 from eileenmcnaughton/enotice
Enotice fix
Seamus Lee [Thu, 3 Aug 2023 23:26:58 +0000 (19:26 -0400)]
Merge pull request #27001 from eileenmcnaughton/participant_test
E-notice fix
Eileen McNaughton [Thu, 3 Aug 2023 22:48:29 +0000 (10:48 +1200)]
Another e-notice fix
Eileen McNaughton [Thu, 3 Aug 2023 22:22:40 +0000 (10:22 +1200)]
Enotice fix
Seamus Lee [Thu, 3 Aug 2023 22:35:30 +0000 (18:35 -0400)]
Merge pull request #26985 from colemanw/recPHPver
Bump recommended PHP version to 8.1, min recommendation to 8.0
Eileen McNaughton [Thu, 3 Aug 2023 22:34:46 +0000 (10:34 +1200)]
Merge pull request #24657 from larssandergreen/always-show-change-selections-for-participant-view
dev/core/#3361 Add Change Selections button when viewing price set registrations with no contribution associated
Eileen McNaughton [Thu, 3 Aug 2023 22:15:43 +0000 (10:15 +1200)]
E-notice fix
CiviCRM [Thu, 3 Aug 2023 22:06:37 +0000 (22:06 +0000)]
Set version to 5.66.alpha1
CiviCRM [Thu, 3 Aug 2023 22:06:24 +0000 (22:06 +0000)]
Set version to 5.65.beta1
Eileen McNaughton [Thu, 3 Aug 2023 22:05:53 +0000 (10:05 +1200)]
Merge pull request #26303 from larssandergreen/Allow-multiple-registrations-from-search-actions
Allow multiple registrations from search actions
Seamus Lee [Thu, 3 Aug 2023 21:56:59 +0000 (17:56 -0400)]
Merge pull request #26957 from eileenmcnaughton/price_field
Notice fixes on CiviEvent Component settings form
Tim Otten [Thu, 3 Aug 2023 21:18:48 +0000 (14:18 -0700)]
Merge pull request #26999 from totten/master-snapshot-b
5.65.alpha1 - Define pre-upgrade snapshots (Option B)
Eileen McNaughton [Thu, 3 Aug 2023 20:53:14 +0000 (08:53 +1200)]
Merge pull request #26996 from colemanw/adminTitle
[REF] CRM_Admin_Form - Use metadata instead of boilerplate to set page title
Tim Otten [Thu, 3 Aug 2023 08:34:29 +0000 (01:34 -0700)]
5.65.alpha1.mysql.tpl - Add pre-upgrade snapshots for existing upgrade-steps