colemanw [Fri, 1 Apr 2022 16:41:05 +0000 (12:41 -0400)]
Merge pull request #22996 from colemanw/optionGroupShape
Add option_value_fields metadata
colemanw [Fri, 1 Apr 2022 02:30:15 +0000 (22:30 -0400)]
Merge pull request #23075 from civicrm/5.48
5.48
colemanw [Fri, 1 Apr 2022 02:29:53 +0000 (22:29 -0400)]
Merge pull request #23078 from eileenmcnaughton/ft
Ensure formType is assigned to the template
colemanw [Fri, 1 Apr 2022 01:05:22 +0000 (21:05 -0400)]
Merge pull request #23067 from MegaphoneJon/financial-account-improvements
Add support for financial account custom fields
colemanw [Fri, 1 Apr 2022 00:33:11 +0000 (20:33 -0400)]
Merge pull request #22971 from eileenmcnaughton/pay_later
Ensure pay_later variables assigned to template
colemanw [Fri, 1 Apr 2022 00:32:05 +0000 (20:32 -0400)]
Merge pull request #22972 from eileenmcnaughton/notice_send
Ensure some variables are assigned to the template
colemanw [Fri, 1 Apr 2022 00:29:44 +0000 (20:29 -0400)]
Merge pull request #23037 from eileenmcnaughton/assign2
Ensure soft credit types are assigned to the template
demeritcowboy [Fri, 1 Apr 2022 00:03:45 +0000 (20:03 -0400)]
Merge pull request #23070 from colemanw/searchKitGroupByFix
SearchKit - Fix broken group-by caused by non-aggregated id column
Eileen McNaughton [Thu, 31 Mar 2022 23:31:05 +0000 (12:31 +1300)]
Ensre formType is assigned to the template
demeritcowboy [Thu, 31 Mar 2022 23:05:15 +0000 (19:05 -0400)]
Merge pull request #23072 from eileenmcnaughton/isset
Remove more isset from offline receipt
demeritcowboy [Thu, 31 Mar 2022 22:30:52 +0000 (18:30 -0400)]
Merge pull request #23071 from demeritcowboy/token-time
dev/core#3072 - Put contribution dates in message template back to not including time
Eileen McNaughton [Thu, 31 Mar 2022 21:11:48 +0000 (10:11 +1300)]
Remove more isset from offline receipt
demeritcowboy [Thu, 31 Mar 2022 20:58:55 +0000 (16:58 -0400)]
Merge pull request #23064 from eileenmcnaughton/isset
Remove isset from event registration receipt
demeritcowboy [Thu, 31 Mar 2022 17:21:13 +0000 (13:21 -0400)]
put dates back to not including time
Coleman Watts [Mon, 21 Mar 2022 18:18:10 +0000 (14:18 -0400)]
SearchKit & Afform - Add option_value_fields info to managed option groups
Coleman Watts [Thu, 31 Mar 2022 17:52:23 +0000 (13:52 -0400)]
Add option_value_fields metadata
This allows an optionGroup to declare which columns of the OptionValue table it uses.
Previously this was hard-coded into the form.
Coleman Watts [Thu, 31 Mar 2022 13:49:55 +0000 (09:49 -0400)]
SearchKit - Fix UI to allow aggregation of custom fields
Fixes dev/core#3143
Coleman Watts [Thu, 31 Mar 2022 13:42:42 +0000 (09:42 -0400)]
SearchKit - Fix broken group-by caused by non-aggregated id column
Before: The `id` column was being unconditionally added, breaking FULL_GROUP_BY sql
After: Let the Api4SelectQuery take care of it for DAO entities
colemanw [Thu, 31 Mar 2022 12:03:43 +0000 (08:03 -0400)]
Merge pull request #23066 from colemanw/relationshipCacheJoins
SearchKit - Fix joins when RelationshipCache is base search entity
Seamus Lee [Thu, 31 Mar 2022 01:35:37 +0000 (12:35 +1100)]
Merge pull request #23068 from seamuslee001/master
5.48
Seamus Lee [Thu, 31 Mar 2022 01:33:11 +0000 (12:33 +1100)]
Merge branch '5.48'
Jon Goldberg [Thu, 31 Mar 2022 00:49:56 +0000 (20:49 -0400)]
Add support for financial account custom fields
Coleman Watts [Wed, 30 Mar 2022 23:58:05 +0000 (19:58 -0400)]
SearchKit - Fix joins when RelationshipCache is base search entity
Seamus Lee [Wed, 30 Mar 2022 23:16:18 +0000 (10:16 +1100)]
Merge pull request #23058 from eileenmcnaughton/ext_notice
Do not default-escape upgrade linkes + Enotice fix on Extension screen
demeritcowboy [Wed, 30 Mar 2022 22:55:06 +0000 (18:55 -0400)]
Merge pull request #23063 from demeritcowboy/timezone-multilingual
dev/core#3151 - Don't localize event_tz field when backing up the field during upgrade
Eileen McNaughton [Wed, 30 Mar 2022 21:49:37 +0000 (10:49 +1300)]
Remove isset from event registration receipt
Eileen McNaughton [Wed, 30 Mar 2022 21:47:10 +0000 (10:47 +1300)]
Remove remaining empty checks on pay_later offline receipt
Seamus Lee [Wed, 30 Mar 2022 20:57:59 +0000 (07:57 +1100)]
Merge pull request #23060 from eileenmcnaughton/isset
Remove issets from event_offline_receipt pay_later_text
demeritcowboy [Wed, 30 Mar 2022 19:41:50 +0000 (15:41 -0400)]
don't localize event_tz field when backing up
Eileen McNaughton [Wed, 30 Mar 2022 20:34:48 +0000 (09:34 +1300)]
Merge pull request #23062 from MegaphoneJon/fix-batch-url
[NFC] Fix URL documenting Batch entity
Jon Goldberg [Wed, 30 Mar 2022 16:02:06 +0000 (12:02 -0400)]
[NFC] Fix URL documenting use of Batch entity
demeritcowboy [Wed, 30 Mar 2022 14:40:34 +0000 (10:40 -0400)]
Merge pull request #23006 from eileenmcnaughton/task
Fix notices on Task.tpl (grumpy mode)
Eileen McNaughton [Wed, 30 Mar 2022 03:28:49 +0000 (16:28 +1300)]
Remove issets from event_offline_receipt pay_later_text
Eileen McNaughton [Wed, 30 Mar 2022 03:15:42 +0000 (16:15 +1300)]
Merge pull request #23017 from eileenmcnaughton/second
Remove isset(taxAmount) from membership online receipt
Eileen McNaughton [Wed, 30 Mar 2022 01:58:31 +0000 (14:58 +1300)]
More notice fixes
Eileen McNaughton [Wed, 30 Mar 2022 01:43:54 +0000 (14:43 +1300)]
Escape the upgrade link
Eileen McNaughton [Wed, 30 Mar 2022 01:40:30 +0000 (14:40 +1300)]
Enotice fix on Extension screen
Eileen McNaughton [Tue, 29 Mar 2022 22:03:14 +0000 (11:03 +1300)]
Remove isset(taxAmount) from membership online receipt
Eileen McNaughton [Tue, 29 Mar 2022 21:04:48 +0000 (10:04 +1300)]
Merge pull request #23054 from ginkgomzd/payflow-no-urlencode
do not URL Encode parameters for PayFlowPro
ginkgoMZD [Mon, 28 Mar 2022 22:15:40 +0000 (18:15 -0400)]
do not URL Encode AMT (amount) parameter for PayFlowPro
demeritcowboy [Mon, 28 Mar 2022 23:43:43 +0000 (19:43 -0400)]
Merge pull request #22532 from seamuslee001/dev_core_3034
dev/core#3034 Ensure that filename contains the file extension for PDFs
Eileen McNaughton [Mon, 28 Mar 2022 22:45:37 +0000 (11:45 +1300)]
Merge pull request #23050 from demeritcowboy/upmerge
5.48
Eileen McNaughton [Mon, 28 Mar 2022 22:44:26 +0000 (11:44 +1300)]
Merge pull request #23053 from demeritcowboy/broken-contact
dev/core#3142 - Contact form and summary page completely broken
demeritcowboy [Mon, 28 Mar 2022 21:11:17 +0000 (17:11 -0400)]
contact form/summarypage completely broken
demeritcowboy [Mon, 28 Mar 2022 13:15:07 +0000 (09:15 -0400)]
regen
demeritcowboy [Mon, 28 Mar 2022 13:02:39 +0000 (09:02 -0400)]
upmerge relevant files from 22940
Eileen McNaughton [Mon, 28 Mar 2022 02:50:04 +0000 (15:50 +1300)]
Merge pull request #23045 from braders/chartenabled-var-expected
Add chartEnabled to expectedSmartyVariables for reports
Eileen McNaughton [Mon, 28 Mar 2022 02:49:27 +0000 (15:49 +1300)]
Merge pull request #23046 from braders/pricefield-php-notices
Avoid PHP notices from smarty on pricefield table
Tim Otten [Sun, 27 Mar 2022 21:36:42 +0000 (14:36 -0700)]
Merge pull request #22940 from demeritcowboy/revert-timezone-upgrade
dev/core#2122 - Upgrade scripts for revert event timezones
Eileen McNaughton [Sun, 27 Mar 2022 20:54:45 +0000 (09:54 +1300)]
Merge pull request #23047 from civicrm/5.48
5.48
demeritcowboy [Sun, 27 Mar 2022 18:33:49 +0000 (14:33 -0400)]
Merge pull request #23035 from colemanw/mergeContactsRedirectFix
Dedupe - Fix redirecting to contact after merge
demeritcowboy [Sun, 27 Mar 2022 17:39:46 +0000 (13:39 -0400)]
Merge pull request #23028 from civicrm/5.48
5.48
Bradley Taylor [Sun, 27 Mar 2022 08:44:05 +0000 (09:44 +0100)]
Avoid PHP notices from smarty on pricefield table
Bradley Taylor [Sun, 27 Mar 2022 07:54:35 +0000 (08:54 +0100)]
Add chartEnabled to expectedSmartyVariables for reports
Eileen McNaughton [Sun, 27 Mar 2022 00:11:56 +0000 (13:11 +1300)]
Merge pull request #23044 from braders/https-maps-links
Link to Google Maps over HTTPs
Seamus Lee [Sat, 26 Mar 2022 23:30:20 +0000 (10:30 +1100)]
Merge pull request #23043 from braders/addtotag-class-comment
Replace incorrect class comment
Tim Otten [Fri, 25 Mar 2022 09:39:36 +0000 (02:39 -0700)]
dev/core#2122 - TimezoneRevertTrait - Failsafe to opt-out of TZ converter
Tim Otten [Fri, 25 Mar 2022 05:18:28 +0000 (22:18 -0700)]
dev/core#2122 - TimezoneRevertTrait - Cleanup modified TZ-offsets and DST skews
Bradley Taylor [Sat, 26 Mar 2022 22:08:18 +0000 (22:08 +0000)]
Link to Google Maps over HTTPs
Bradley Taylor [Sat, 26 Mar 2022 21:56:19 +0000 (21:56 +0000)]
Replace incorrect class comment
Eileen McNaughton [Fri, 25 Mar 2022 22:01:10 +0000 (11:01 +1300)]
Ensure soft credit types are assigned to the template
This is in the function that assigns variables to the template for contribution emails
colemanw [Fri, 25 Mar 2022 13:33:21 +0000 (09:33 -0400)]
Merge pull request #22966 from eileenmcnaughton/retrieve
[REF] Deprecate BAO_Contact::retrieve
Coleman Watts [Fri, 25 Mar 2022 13:20:52 +0000 (09:20 -0400)]
Dedupe - Fix redirecting to contact after merge
The final redirect was accidentally changed by
a6f2a80ffbddfc0788199ec824b8aff46ccd1542
Fixes dev/core#3135
Seamus Lee [Fri, 25 Mar 2022 08:21:35 +0000 (19:21 +1100)]
Merge pull request #23030 from alifrumin/releasenotes5.48
[NFC] First Pass at 5.48 release notes
Alice Frumin [Wed, 23 Mar 2022 15:56:29 +0000 (11:56 -0400)]
[NFC] 5.48 Release Notes - First Pass
Eileen McNaughton [Fri, 25 Mar 2022 02:53:59 +0000 (15:53 +1300)]
Merge pull request #22689 from colemanw/removeCiviMailVar
CiviMail - Remove deprecated variable only used by Mosaico
Seamus Lee [Fri, 25 Mar 2022 02:48:50 +0000 (13:48 +1100)]
Merge pull request #23027 from eileenmcnaughton/548
dev/core#3134 Fix regression on unselected lineitem
Monish Deb [Fri, 25 Mar 2022 02:19:12 +0000 (07:49 +0530)]
Merge pull request #23003 from colemanw/fixAllRowsSelected
SearchKit - Fix "all selected" checkbox when selecting a single page …
Tim Otten [Fri, 25 Mar 2022 02:05:12 +0000 (19:05 -0700)]
dev/core#2122 - TimezoneRevertTrait - Downgrade should use same TZ as prior upgrade
Eileen McNaughton [Thu, 24 Mar 2022 23:27:36 +0000 (12:27 +1300)]
dev/core#3134 Fix regression on unselected lineitem
Eileen McNaughton [Thu, 24 Mar 2022 21:47:50 +0000 (10:47 +1300)]
Merge pull request #23021 from yashodha/tpl
add classes to the membership userdashboard page
Tim Otten [Thu, 24 Mar 2022 21:47:39 +0000 (14:47 -0700)]
Merge pull request #22955 from colemanw/schemaTrait
Add utils for managing schema to extension upgrader base class
colemanw [Thu, 24 Mar 2022 13:57:03 +0000 (09:57 -0400)]
Merge pull request #23024 from colemanw/fixSubmitActions
Afform - fix missing submit actions
Coleman Watts [Thu, 24 Mar 2022 11:59:35 +0000 (07:59 -0400)]
Afform - fix missing submit actions
This regressed due to
09a3e37058f393276662301038a6437eaaa346e4 specifying the wrong type.
Seamus Lee [Thu, 24 Mar 2022 10:39:15 +0000 (21:39 +1100)]
Merge pull request #23023 from seamuslee001/master
5.48
Seamus Lee [Thu, 24 Mar 2022 10:36:41 +0000 (21:36 +1100)]
Merge in 5.48
Seamus Lee [Thu, 24 Mar 2022 09:57:26 +0000 (20:57 +1100)]
Merge pull request #23012 from colemanw/fixSearchAfformFilter
SearchKit - Fix multi-valued afform filters
yashodha [Thu, 24 Mar 2022 08:25:48 +0000 (13:55 +0530)]
add classes to the tpl
Tim Otten [Thu, 24 Mar 2022 07:21:29 +0000 (00:21 -0700)]
dev/core#2122 - TimezoneRevertTrait - Tweak messaging
Tim Otten [Wed, 23 Mar 2022 04:46:33 +0000 (21:46 -0700)]
dev/core#2122 - TimezoneRevertTrait - Split out messaging across bullets
Tim Otten [Wed, 23 Mar 2022 00:17:37 +0000 (17:17 -0700)]
dev/core#2122 - For 5.48.beta2, use TimezoneRevertTrait and updates msg tpls
demeritcowboy [Wed, 23 Mar 2022 00:08:01 +0000 (17:08 -0700)]
dev/core#2122 - Add TimezoneRevertTrait (shared by 5.47/5.48)
Based on upgrade-steps from demerit. Adapted to trait by totten.
Tim Otten [Wed, 23 Mar 2022 00:15:10 +0000 (17:15 -0700)]
Set version to 5.48.beta2
Tim Otten [Thu, 24 Mar 2022 03:53:12 +0000 (20:53 -0700)]
Merge pull request #22930 from demeritcowboy/revert-event-timezone
dev/core#2122 - Revert event timezone
Eileen McNaughton [Wed, 23 Mar 2022 22:30:37 +0000 (11:30 +1300)]
Merge pull request #23014 from eileenmcnaughton/second
Remove grumpy-mode-incompatible isset in payment notification
Eileen McNaughton [Wed, 23 Mar 2022 20:58:35 +0000 (09:58 +1300)]
Adjust tests to not expect /bin/bash balance
Yashodha Chaku [Wed, 23 Mar 2022 15:28:30 +0000 (20:58 +0530)]
Merge pull request #23005 from eileenmcnaughton/noex
noexpand seems to never be assigned
Seamus Lee [Wed, 23 Mar 2022 04:51:56 +0000 (15:51 +1100)]
Merge pull request #23010 from colemanw/stableSearchKit
SearchKit - mark stable
Seamus Lee [Wed, 23 Mar 2022 04:51:22 +0000 (15:51 +1100)]
Merge pull request #23011 from colemanw/fixAfCollapsible
Afform - Fix collapsible style
Seamus Lee [Wed, 23 Mar 2022 04:50:27 +0000 (15:50 +1100)]
Merge pull request #22981 from braders/remove-assert
Remove bad use of PHP assert, removed in PHP 8.0
Monish Deb [Wed, 23 Mar 2022 04:19:23 +0000 (09:49 +0530)]
Merge pull request #23002 from christianwach/lab-core-3130-2
Keep "EntityFile" records until after Symfony "delete" hooks fire
Eileen McNaughton [Wed, 23 Mar 2022 02:57:34 +0000 (15:57 +1300)]
Remove grumpy-mode-incompatible isset in payment notification
colemanw [Wed, 23 Mar 2022 01:39:55 +0000 (21:39 -0400)]
Merge pull request #23007 from eileenmcnaughton/is_admin
E-notice fix on pdfLetter
colemanw [Wed, 23 Mar 2022 01:36:52 +0000 (21:36 -0400)]
Merge pull request #23004 from eileenmcnaughton/mem
Remove issets on pay_later_receipt
Eileen McNaughton [Wed, 23 Mar 2022 01:36:19 +0000 (14:36 +1300)]
Merge pull request #23009 from seamuslee001/dev_core_3132
dev/core#3132 Ensure that contacts are not placed in null island if g…
Coleman Watts [Wed, 23 Mar 2022 01:26:16 +0000 (21:26 -0400)]
SearchKit - Fix multi-valued afform filters
Multi-select search filters stopped working as of
007167dfb90eaaeb0c76f2c9e5b0327f0b3e22e9
Coleman Watts [Wed, 23 Mar 2022 00:31:26 +0000 (20:31 -0400)]
Afform - Fix collapsible style
Coleman Watts [Wed, 23 Mar 2022 00:27:00 +0000 (20:27 -0400)]
SearchKit - mark stable
Seamus Lee [Tue, 22 Mar 2022 23:19:35 +0000 (10:19 +1100)]
dev/core#3132 Ensure that contacts are not placed in null island if geocoders return 'null' string for geocodes
Tim Otten [Tue, 22 Mar 2022 22:52:49 +0000 (15:52 -0700)]
Merge pull request #23001 from agh1/5.48.0-releasenotes-initial
5.48.0 release notes initial run