Coleman Watts [Thu, 31 Mar 2022 21:21:45 +0000 (17:21 -0400)]
Add civicrm_contact_type.icon column
Toward dev/user-interface#26
This adds an icon column and populates it with data but does not yet expose it in the UI.
The next step is to switch the UI from using the image_URL column over to using the icon column.
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'
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
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
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
Bradley Taylor [Sat, 19 Mar 2022 11:47:49 +0000 (11:47 +0000)]
Remove bad use of PHP assert, removed in PHP 8.0
Eileen McNaughton [Tue, 22 Mar 2022 21:28:38 +0000 (10:28 +1300)]
E-notice fix on pdfLetter
Reachec by choosing task print/merge letter from search results.
This drives the help text next to the token selector and neither
variable seem to impact on the help popup working....
Eileen McNaughton [Tue, 22 Mar 2022 21:04:52 +0000 (10:04 +1300)]
Fix notices on Task.tpl (grumpy mode)
The addition of group.id to this id dates back to
https://github.com/civicrm/civicrm-core/pull/3191
- a huge PR which attempted to block collisions on the data table id per
https://issues.civicrm.org/jira/browse/CRM-14636
However, I could find no evidence that 'group' would ever be assigned here
and as a rather large PR I suspect there was a bit of pattern replacement
beyond what was confirmed....
Removing 'group' means the selector becomes 'selectedRecords-' - which is
what it is in practice anyway since group is not assigned. This is possibly
accidentally unique anyway because of the trailing '-'
Eileen McNaughton [Mon, 17 Jan 2022 08:35:06 +0000 (21:35 +1300)]
noexpand seems to never be assigned
Eileen McNaughton [Tue, 22 Mar 2022 20:33:06 +0000 (09:33 +1300)]
Remove issets on pay_later_receipt
These issets were added to get tests passing with the later php version
which is now used on PR CI.
I think for these templates the value is always assigned so we can remove.
I am probably going to do a bunch of PRs removing issets to
hone in on which ones are actually still needed for the CI
so that I can put the work into the required ones
colemanw [Tue, 22 Mar 2022 20:20:41 +0000 (16:20 -0400)]
Merge pull request #22904 from eileenmcnaughton/event_msg
Add workflow template for offline event
Coleman Watts [Tue, 22 Mar 2022 20:13:59 +0000 (16:13 -0400)]
SearchKit - Fix "all selected" checkbox when selecting a single page of results
Eileen McNaughton [Tue, 22 Mar 2022 19:46:53 +0000 (08:46 +1300)]
Merge pull request #23000 from colemanw/nfcSampeDataWhitespace
SampleData - Fix missing option value names
colemanw [Tue, 22 Mar 2022 16:57:28 +0000 (12:57 -0400)]
Merge pull request #22957 from colemanw/afformClearCache
Afform - reset managed entities when deleting a dashlet
colemanw [Tue, 22 Mar 2022 16:56:07 +0000 (12:56 -0400)]
Merge pull request #22999 from civicrm/5.48
5.48
Christian Wach [Tue, 22 Mar 2022 16:18:41 +0000 (16:18 +0000)]
Keep "EntityFile" records available until after Symfony "delete" hooks fire
colemanw [Tue, 22 Mar 2022 15:50:51 +0000 (11:50 -0400)]
Merge pull request #22997 from colemanw/fixDeletingAfformWithSavedSearch
Fix deleting afforms when deleting saved search
Andie Hunt [Tue, 22 Mar 2022 15:26:28 +0000 (11:26 -0400)]
5.48.0 release notes: added boilerplate
Andie Hunt [Tue, 22 Mar 2022 15:21:20 +0000 (11:21 -0400)]
5.48.0 release notes: initial run
colemanw [Tue, 22 Mar 2022 13:02:55 +0000 (09:02 -0400)]
Merge pull request #22970 from eileenmcnaughton/grump2
Enotice fix in grumpy smarty mode
colemanw [Tue, 22 Mar 2022 13:02:23 +0000 (09:02 -0400)]
Merge pull request #22982 from braders/filter_sanitize_string-deprecation
Remove use of deprecated FILTER_SANITIZE_STRING
colemanw [Tue, 22 Mar 2022 12:55:59 +0000 (08:55 -0400)]
Merge pull request #22988 from eileenmcnaughton/prof
Enotice fix (grumpy smarty)
colemanw [Tue, 22 Mar 2022 12:54:26 +0000 (08:54 -0400)]
Merge pull request #22989 from eileenmcnaughton/prof2
Enotice fixes
colemanw [Tue, 22 Mar 2022 12:53:41 +0000 (08:53 -0400)]
Merge pull request #22990 from eileenmcnaughton/init
Grumpy smarty - Never escape 'initHideBoxes'
Coleman Watts [Tue, 22 Mar 2022 12:51:06 +0000 (08:51 -0400)]
SampleData - Fix missing option value names
Coleman Watts [Tue, 22 Mar 2022 12:49:14 +0000 (08:49 -0400)]
NFC - cleanup whitespace in sample_custom_data.mysql