ginkgoMZD [Wed, 23 Mar 2022 13:56:38 +0000 (09:56 -0400)]
resolve TypeError: unsupported operand types: string + int;
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
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 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
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 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
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
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
Tim Otten [Tue, 22 Mar 2022 05:54:04 +0000 (22:54 -0700)]
Merge pull request #22985 from demeritcowboy/postupgrademessage-2
dev/core#3119 - Post-upgrade messages no longer being displayed
Seamus Lee [Tue, 22 Mar 2022 03:00:42 +0000 (14:00 +1100)]
Merge pull request #22998 from seamuslee001/update_guzzlehttp_18
[REF] Update Guzzlehttp/psr7 version to be 1.8.5
Seamus Lee [Tue, 22 Mar 2022 00:01:37 +0000 (11:01 +1100)]
[REF] Update Guzzlehttp/psr7 version to be 1.8.5
Coleman Watts [Mon, 21 Mar 2022 23:28:02 +0000 (19:28 -0400)]
Fix deleting afforms when deleting saved search
A typo in the code was preventing afforms from being deleted with a corresponding saved search,
and may have led to afforms being deleted incorrectly!
colemanw [Mon, 21 Mar 2022 23:06:23 +0000 (19:06 -0400)]
Merge pull request #22991 from eileenmcnaughton/adv_select
Do not escape hierarchical select
Tim Otten [Mon, 21 Mar 2022 22:04:08 +0000 (15:04 -0700)]
CRM_Upgrade_Form::doFinish() - Narrower call to session-reset
The main call(s) to `rebuildMenuAndCaches()` do clear out most caches. It's
_just_ the session that has been skipped.
Tim Otten [Mon, 21 Mar 2022 21:38:48 +0000 (14:38 -0700)]
Post-upgrade messages no longer being displayed (part 2)
This line is only hit if the upgrader activates CiviGrant.
demeritcowboy [Mon, 21 Mar 2022 14:37:08 +0000 (10:37 -0400)]
Merge pull request #21514 from mattwire/1624_2319_casedashboard
Fix issues with case sorting/searching from case dashboard
demeritcowboy [Mon, 21 Mar 2022 12:07:37 +0000 (08:07 -0400)]
Merge pull request #22987 from mattwire/notedateform
Make note date required when creating note
Eileen McNaughton [Mon, 21 Mar 2022 01:47:00 +0000 (14:47 +1300)]
Merge pull request #22993 from mattwire/is_templateundefined
Fix undefined index by making sure that is_template is always defined
Matthew Wire [Sun, 20 Mar 2022 20:53:20 +0000 (20:53 +0000)]
Fix undefined index by making sure that is_template is always defined
Eileen McNaughton [Sun, 20 Mar 2022 21:29:28 +0000 (10:29 +1300)]
Do not escape hierarchical select
We already have 'cutouts' in the escape function to not escape assigned html.
It isn't catching the hierarchical select elements - so I have marked a bunch
to not be escaped. I could have handled in 'escape' but I think tpl handling
is actually correct - the cutouts in the escape function was to get it to
a more manageable level
Eileen McNaughton [Sun, 20 Mar 2022 21:17:33 +0000 (10:17 +1300)]
Never escape 'initHideBoxes'
InitHideBoxes is js - fugly as this is we shouldn't escape it - there is
a world in which we would re-write it out of existence but not this one....
Eileen McNaughton [Sun, 20 Mar 2022 21:04:08 +0000 (10:04 +1300)]
Enotice fixes
civicrm/admin/uf/group/add?action=add&reset=1
Eileen McNaughton [Sun, 20 Mar 2022 20:38:17 +0000 (09:38 +1300)]
Enorice fix (grumpy smarty)
Matthew Wire [Sun, 20 Mar 2022 19:11:57 +0000 (19:11 +0000)]
Make note date required when creating note
Eileen McNaughton [Sun, 20 Mar 2022 06:21:06 +0000 (19:21 +1300)]
Merge pull request #22975 from colemanw/afformLayout2
Afform - Easier layout creation with predefined container styles and built-in title
Coleman Watts [Fri, 18 Mar 2022 19:24:34 +0000 (15:24 -0400)]
Afform - Predefined container styles
Adds a predefined "Panel Pane" style, for creating dashboards.
Coleman Watts [Fri, 18 Mar 2022 13:42:49 +0000 (09:42 -0400)]
Afform - add collapsible title as directive
Before: A fieldset `<legend>` was treated as its own element. This was more flexible but more complex.
After: Augenerated `<legend> for fieldsets or `<h4>` for other containers based on new `af-title` directive.
This allows central control of titles for e.g. collapsible styles.
Fixes dev/core#3110
Coleman Watts [Fri, 18 Mar 2022 12:24:46 +0000 (08:24 -0400)]
CrmUI - Improve crmUiEditable to support placeholders, and use its own css
Now this widget supports having a `placeholder`.
Also gave it its own css instead of piggybacking off crm-editable classes,
as that was a bit messy and Shoreditch was applying some extra stuff which
then had to be undone.
Coleman Watts [Thu, 17 Mar 2022 23:12:05 +0000 (19:12 -0400)]
Afform - Fix dragging and dropping search fields and containers, saving blocks
Coleman Watts [Wed, 16 Mar 2022 15:25:12 +0000 (11:25 -0400)]
Afform - Better descriptive labels for text element
Coleman Watts [Wed, 16 Mar 2022 15:11:21 +0000 (11:11 -0400)]
SearchKit - Better default label for new displays
Eileen McNaughton [Sat, 19 Mar 2022 21:42:33 +0000 (10:42 +1300)]
Merge pull request #22902 from mattwire/contributionconfirm
Cleanup variable assigns in ContributionPage confirm
Eileen McNaughton [Sat, 19 Mar 2022 21:34:16 +0000 (10:34 +1300)]
Merge pull request #22984 from civicrm/5.48
5.48
demeritcowboy [Sat, 19 Mar 2022 19:33:56 +0000 (15:33 -0400)]
postupgrade messages no longer being displayed
demeritcowboy [Sat, 19 Mar 2022 19:19:51 +0000 (15:19 -0400)]
Merge pull request #22963 from colemanw/fixAfformBlocks
Afform - Fix saving and editing entity blocks
Bradley Taylor [Sat, 19 Mar 2022 13:59:07 +0000 (13:59 +0000)]
Remove use of FILTER_SANITIZE_STRING,
which is deprecated in PHP 8.1.0.
This follows the fix in \League\Csv\AbstractCsv::sendHeaders,
from which this method is copied.
colemanw [Sat, 19 Mar 2022 13:31:29 +0000 (09:31 -0400)]
Merge pull request #22419 from eileenmcnaughton/gc
Group Contact create -> fix to use post hook for subscription records
Eileen McNaughton [Tue, 8 Mar 2022 01:54:35 +0000 (14:54 +1300)]
Add workflow template for offline event
This locks in availability of participant and event tokens
along with the standard smarty variables of {contactID},
{participantID} and {eventID}
Eileen McNaughton [Sat, 19 Mar 2022 02:09:20 +0000 (15:09 +1300)]
Adapt to HookInterface now being in new location
Eileen McNaughton [Sat, 8 Jan 2022 01:59:08 +0000 (14:59 +1300)]
Add test cover for subscription history create
Coleman Watts [Thu, 6 Jan 2022 20:56:54 +0000 (15:56 -0500)]
Ref - Use writeRecord and hooks in GroupContact BAO
Eileen McNaughton [Sat, 19 Mar 2022 02:05:09 +0000 (15:05 +1300)]
Merge pull request #22978 from colemanw/apiExplorerClearfix
Fix copy button float in APIv4 Explorer
Eileen McNaughton [Sat, 19 Mar 2022 01:27:19 +0000 (14:27 +1300)]
Merge pull request #22980 from civicrm/5.48
5.48 to master
Eileen McNaughton [Sat, 19 Mar 2022 00:30:40 +0000 (13:30 +1300)]
Merge pull request #22976 from demeritcowboy/civireport-false
dev/core#3126 - CiviReport statistics appearing twice on page
Coleman Watts [Sat, 19 Mar 2022 00:30:01 +0000 (20:30 -0400)]
Fix copy button float in APIv4 Explorer
demeritcowboy [Fri, 18 Mar 2022 20:38:06 +0000 (16:38 -0400)]
false is true
demeritcowboy [Fri, 18 Mar 2022 17:24:05 +0000 (13:24 -0400)]
Merge pull request #22969 from eileenmcnaughton/grump
Do not default escape 'create new' links
demeritcowboy [Fri, 18 Mar 2022 17:17:48 +0000 (13:17 -0400)]
Merge pull request #22974 from mattwire/activitytokens
REF Cleanup activity getBespokeTokens()
demeritcowboy [Fri, 18 Mar 2022 14:59:50 +0000 (10:59 -0400)]
Merge pull request #22973 from mattwire/casedetailidsubject
Add case ID and make subject optional for case detail report
Matthew Wire [Fri, 18 Mar 2022 12:11:13 +0000 (12:11 +0000)]
Clean activity getBespokeTokens
Matthew Wire [Fri, 18 Mar 2022 11:43:32 +0000 (11:43 +0000)]
Add case ID and make subject optional for case detail report
Matthew Wire [Fri, 17 Sep 2021 11:32:48 +0000 (12:32 +0100)]
Fix issues with case sorting/searching from case dashboard
Eileen McNaughton [Fri, 18 Mar 2022 04:42:58 +0000 (17:42 +1300)]
Merge pull request #22968 from civicrm/5.48
5.48
Eileen McNaughton [Fri, 18 Mar 2022 04:40:41 +0000 (17:40 +1300)]
Enotice fix in grumpy smarty mode
Eileen McNaughton [Fri, 18 Mar 2022 04:30:29 +0000 (17:30 +1300)]
Do not default escape 'create new' links
These are assigned from the various Info::creatNewShortcut and contain html
so should not be escaped in grumpy mode. This block is
largely only in drupal 7 & is only code-assigned
demeritcowboy [Fri, 18 Mar 2022 02:41:38 +0000 (22:41 -0400)]
Merge pull request #22964 from pradpnayak/fixfatalerror3
(Regression) - fixed tags form field display on New/Edit contact screen
demeritcowboy [Fri, 18 Mar 2022 02:20:40 +0000 (22:20 -0400)]
Merge pull request #22965 from eileenmcnaughton/privat
Fix property declarations
Eileen McNaughton [Thu, 17 Mar 2022 22:36:04 +0000 (11:36 +1300)]
Fix property declarations
colemanw [Thu, 17 Mar 2022 21:52:51 +0000 (17:52 -0400)]
Merge pull request #22960 from totten/master-out-of-curiosity
What if we stopped publishing Drupal 6 releases in 2022?
Pradeep Nayak [Thu, 17 Mar 2022 21:35:54 +0000 (21:35 +0000)]
fixed tags form field display on New/Edit contact screen
Eileen McNaughton [Thu, 17 Mar 2022 21:04:19 +0000 (10:04 +1300)]
Merge pull request #22887 from colemanw/afformLayout
Afform - compose layouts with multiple SearchKit displays
demeritcowboy [Thu, 17 Mar 2022 18:18:13 +0000 (14:18 -0400)]
Merge pull request #22962 from tschuettler/patch-12
[NFC] - Compatibility for PHP-7.4/PHP-8
Coleman Watts [Thu, 17 Mar 2022 18:16:44 +0000 (14:16 -0400)]
Afform - Fix saving and editing entity blocks
Fixes dev/core#3120
Regression caused by #21218
Also fixes undefined variable errors when editing a block.
tschuettler [Thu, 17 Mar 2022 16:14:41 +0000 (17:14 +0100)]
[NFC] - Compatibility for PHP-7.4/PHP-8
There are a few more leftovers under vendor and packages: `find . -name "*.php" -exec php -l {} \; | grep -v "No"`. Not sure how to deal with that.
demeritcowboy [Thu, 17 Mar 2022 13:51:20 +0000 (09:51 -0400)]
Merge pull request #22928 from artfulrobot/artfulrobot-title-double-html-encoding
Fix double encoding of document title on Contact view form
Seamus Lee [Thu, 17 Mar 2022 09:54:37 +0000 (20:54 +1100)]
Merge pull request #22961 from civicrm/5.48
5.48
Seamus Lee [Thu, 17 Mar 2022 09:53:17 +0000 (20:53 +1100)]
Fix issues picked up by stylechecker
Tim Otten [Thu, 17 Mar 2022 05:36:29 +0000 (22:36 -0700)]
What if we stopped publishing Drupal 6 releases in 2022?
demeritcowboy [Thu, 17 Mar 2022 00:45:46 +0000 (20:45 -0400)]
Merge pull request #22956 from eileenmcnaughton/notice4
Notice fixes in advanced search
Coleman Watts [Wed, 16 Mar 2022 21:54:21 +0000 (17:54 -0400)]
Afform - reset managed entities when deleting a dashlet
Fixes dev/core#3122
Seamus Lee [Tue, 1 Mar 2022 03:32:28 +0000 (14:32 +1100)]
security/core#112 Fix viewing contributions when user doesn't have acess to civicontribute or edit contributions permissions
Seamus Lee [Thu, 3 Mar 2022 06:23:19 +0000 (17:23 +1100)]
security/core#113 Apply patch from Mathieu to fix SQLI in participant import
Seamus Lee [Wed, 16 Mar 2022 19:58:23 +0000 (06:58 +1100)]
Upgrade CKEditor to 4.18
Tim Otten [Wed, 16 Mar 2022 09:27:19 +0000 (02:27 -0700)]
(security/core#111) Refine prose/naming
Seamus Lee [Wed, 16 Mar 2022 08:33:54 +0000 (01:33 -0700)]
security/core#111 Add in Status check for if Anonymous Users have edit contributions and or access CiviContribute Permissions
CiviCRM [Wed, 16 Mar 2022 08:30:48 +0000 (01:30 -0700)]
CRM_Core_Permission - Allow checking of anon-perms by authenticated-users
Each CRM_Core_Permission_* adapter allows you to check the permissions on
behalf of some other user. However, if that "other user" is "anonymous",
then they are prone to mishandling.
Tim Otten [Wed, 16 Mar 2022 03:37:33 +0000 (20:37 -0700)]
E2E Tests - Add coverage for variations on `Permission::check($perm,$cid)`
Tim Otten [Wed, 16 Mar 2022 05:33:29 +0000 (22:33 -0700)]
composer.json - Update jquery UI 1.13.0 => 1.13.1
Eileen McNaughton [Wed, 16 Mar 2022 21:59:56 +0000 (10:59 +1300)]
Notice fixes in advanced search
demeritcowboy [Wed, 16 Mar 2022 16:01:39 +0000 (12:01 -0400)]
Merge pull request #22953 from civicrm/5.48
5.48
Monish Deb [Wed, 16 Mar 2022 06:11:25 +0000 (11:41 +0530)]
Merge pull request #22950 from colemanw/refBoolColumns
REF - Split upgrade SQL into multiple tasks