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 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:19:51 +0000 (15:19 -0400)]
Merge pull request #22963 from colemanw/fixAfformBlocks
Afform - Fix saving and editing entity blocks
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 [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
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: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
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
Eileen McNaughton [Wed, 16 Mar 2022 01:54:44 +0000 (14:54 +1300)]
Merge pull request #22952 from totten/master-install-sk
Search Kit - Auto-enable during normal installation
Tim Otten [Tue, 15 Mar 2022 22:04:40 +0000 (15:04 -0700)]
(NFC) DefaultExtensions.civi-setup.php - Cleanup boilerplate
Seamus Lee [Tue, 15 Mar 2022 21:24:48 +0000 (08:24 +1100)]
Merge pull request #22948 from pradpnayak/fixfatalerror3
Return array for setdefaults
Tim Otten [Tue, 15 Mar 2022 20:44:36 +0000 (13:44 -0700)]
Search Kit - Auto-enable during normal installation
Coleman Watts [Thu, 10 Mar 2022 01:41:33 +0000 (20:41 -0500)]
Afform Gui - Use af-gui-menu for efficiency
Coleman Watts [Fri, 4 Mar 2022 20:39:08 +0000 (15:39 -0500)]
Afform - Enable multiple search displays in a search form layout
Allows dashboard-like layouts to be composed
Coleman Watts [Fri, 4 Mar 2022 03:39:19 +0000 (22:39 -0500)]
Afform - Refactor toward multiple search displays on an afform
Coleman Watts [Tue, 15 Mar 2022 17:20:36 +0000 (13:20 -0400)]
REF - Split upgrade SQL into multiple tasks
Splits up potentially long-running upgrade SQL which alters table columns to be NOT NULL.
Eileen McNaughton [Tue, 15 Mar 2022 19:15:23 +0000 (08:15 +1300)]
Merge pull request #21473 from mattwire/contributionrecurtplupdate
dev/financial#6 Update the recurring contribution when we edit the template contribution
Monish Deb [Tue, 15 Mar 2022 14:04:56 +0000 (19:34 +0530)]
Merge pull request #22825 from MegaphoneJon/membership-41
get membership type ID and number of terms from price_x fields
Pradeep Nayak [Tue, 15 Mar 2022 11:08:51 +0000 (11:08 +0000)]
Return array for setdefaults
Monish Deb [Tue, 15 Mar 2022 05:11:51 +0000 (10:41 +0530)]
Merge pull request #22925 from colemanw/booleanFields
Schema - Fix boolean fields in civicrm_event and civicrm_contribution
Eileen McNaughton [Mon, 14 Mar 2022 22:28:50 +0000 (11:28 +1300)]
Merge pull request #21470 from mattwire/templatecontributioncreate
dev/financial#6 Fix creating of template contribution when it has custom data
demeritcowboy [Mon, 14 Mar 2022 22:13:23 +0000 (18:13 -0400)]
Merge pull request #22945 from civicrm/5.48
5.48
Eileen McNaughton [Mon, 14 Mar 2022 21:28:46 +0000 (10:28 +1300)]
Merge pull request #22906 from colemanw/searchKitCheckBoxes
SearchKit - Improve checkbox UX for bulk actions
demeritcowboy [Mon, 14 Mar 2022 18:12:06 +0000 (14:12 -0400)]
Merge pull request #22944 from colemanw/SoftDeleteActionTrait
[REF] Rename SoftDeleteEntity -> SoftDeleteActionTrait
Coleman Watts [Mon, 14 Mar 2022 15:18:25 +0000 (11:18 -0400)]
Rename SoftDeleteEntity -> SoftDeleteActionTrait
The trait is used by actions, not by entities.
colemanw [Mon, 14 Mar 2022 12:16:51 +0000 (08:16 -0400)]
Merge pull request #22804 from braders/core-2198-dedupe-rules-ui
Core#2918 Implement new UI for configuring dedupe rule usage.
colemanw [Mon, 14 Mar 2022 12:11:26 +0000 (08:11 -0400)]
Merge pull request #22832 from jmcclelland/ufexport
Enable APIv4 export action on UFGroup and UFField.
colemanw [Mon, 14 Mar 2022 12:04:26 +0000 (08:04 -0400)]
Merge pull request #22943 from ixiam/dev#contactquery_sg
Optimise isCustomDateField
Vangelis Pantazis [Mon, 14 Mar 2022 09:16:38 +0000 (09:16 +0000)]
Optimise isCustomDateField
colemanw [Sun, 13 Mar 2022 20:46:11 +0000 (16:46 -0400)]
Merge pull request #22934 from adriano66/dev/core#2524
Dev/core#2524 Fix seriazliation parameter exception in APIv3
adriano66 [Thu, 16 Dec 2021 22:03:16 +0000 (23:03 +0100)]
dev/core#2524 - Fix missing serialization defaults
This fixes the "'0' is not a valid option for field serialize" exception
in APIv3 as 0 is a valid, default value set in the DB
This allows passing whole custom field data as a parameter
to the custom field update method without getting an exception
Co-authored-by: colemanw <coleman@civicrm.org>
demeritcowboy [Sun, 13 Mar 2022 18:45:30 +0000 (14:45 -0400)]
Merge pull request #22939 from demeritcowboy/log-sql
During upgrade log that it ran the sql when there is just a sql file and no corresponding task
demeritcowboy [Sun, 13 Mar 2022 18:45:17 +0000 (14:45 -0400)]
Merge pull request #22935 from civicrm/5.48
5.48
demeritcowboy [Sun, 13 Mar 2022 17:04:51 +0000 (13:04 -0400)]
Merge pull request #22933 from colemanw/fixQueryHook
Fix backward-compatability for new method in CRM_Contact_BAO_Query_Hook
demeritcowboy [Sun, 13 Mar 2022 16:09:35 +0000 (12:09 -0400)]
log that it ran the sql there is just a sql file and no corresponding task
colemanw [Sun, 13 Mar 2022 15:41:04 +0000 (11:41 -0400)]
Merge pull request #22932 from eileenmcnaughton/upit
dev/core#3112 Clear caches to avoid error on upgrade
Coleman Watts [Sun, 13 Mar 2022 06:26:10 +0000 (01:26 -0500)]
Fix backward-compatability for new method in CRM_Contact_BAO_Query_Hook
The method getDefaultReturnProperties was just added to CRM_Contact_BAO_Query_Hook,
but some extensions do not yet implement it, and also do not extend that class so
cannot inherit the default method.
This adds a guard around calling the new method to avoid crashes.
demeritcowboy [Sun, 13 Mar 2022 13:55:05 +0000 (09:55 -0400)]
Merge pull request #22929 from colemanw/afformELementFix
Afform Gui - Fix selecting html element of text box
Eileen McNaughton [Sun, 13 Mar 2022 05:10:43 +0000 (18:10 +1300)]
dev/core#3112 Clear caches to avoid error on upgrade
There may be a better place for this - but at least here is is clear to the api call that
can fail without it .... if the metadata cache is populated from an earlier version the
table_name key may not exist & hence the api call fails with no table_name
in the from clause
Coleman Watts [Thu, 10 Mar 2022 01:42:09 +0000 (20:42 -0500)]
Afform Gui - Fix selecting html element of text box
Jon Goldberg [Wed, 23 Feb 2022 22:04:50 +0000 (17:04 -0500)]
get membership type ID and number of terms from price_x fields
Rich Lott / Artful Robot [Fri, 11 Mar 2022 09:30:40 +0000 (09:30 +0000)]
Fix double encoding of document title on Contact view form
Eileen McNaughton [Thu, 10 Mar 2022 22:58:33 +0000 (11:58 +1300)]
Merge pull request #22927 from colemanw/pagerSize
SearchKit - Fix page size size
Coleman Watts [Thu, 10 Mar 2022 21:23:01 +0000 (16:23 -0500)]
SearchKit - Fix page size size
Coleman Watts [Thu, 10 Mar 2022 16:26:47 +0000 (11:26 -0500)]
Schema - Fix boolean fields in civicrm_event and civicrm_contribution tables
This fixes 2 tables to ensure boolean fields always have a default value and are always NOT NULL.
colemanw [Thu, 10 Mar 2022 13:17:51 +0000 (08:17 -0500)]
Merge pull request #22808 from colemanw/searchKitMailingTask
SearchKit - Add CiviMail integration
demeritcowboy [Thu, 10 Mar 2022 04:31:14 +0000 (23:31 -0500)]
Merge pull request #22923 from civicrm/5.48
5.48
Eileen McNaughton [Thu, 10 Mar 2022 01:59:33 +0000 (14:59 +1300)]
Merge pull request #22921 from totten/5.48-yml
(NFC) contributor-key.yml - Fix syntax error
Tim Otten [Wed, 9 Mar 2022 23:26:50 +0000 (15:26 -0800)]
contributor-key.yml - Fix syntax error
Matthew Wire [Wed, 9 Mar 2022 22:01:09 +0000 (22:01 +0000)]
Merge pull request #21467 from sunilpawar/dev_2833
dev/core#2833 Fix Contact Type change on Backend Membership Credit Ca…
Matthew Wire [Wed, 9 Mar 2022 21:58:48 +0000 (21:58 +0000)]
Merge pull request #21945 from masetto/profile-data-attribute
Add page id and template type as data attributes in contribution templates
Matthew Wire [Wed, 9 Mar 2022 21:56:17 +0000 (21:56 +0000)]
Merge pull request #22483 from eileenmcnaughton/token1
Fully deprecate `getTokenDetails`
Matthew Wire [Wed, 9 Mar 2022 21:55:35 +0000 (21:55 +0000)]
Merge pull request #22463 from eileenmcnaughton/label
Split mailing label formatting out from main format
Matthew Wire [Wed, 9 Mar 2022 21:54:39 +0000 (21:54 +0000)]
Merge pull request #22316 from braders/core-3003-preserve-tab-between-pageloads
Preserve selected tab when navigating between pages.
Matthew Wire [Wed, 9 Mar 2022 21:53:44 +0000 (21:53 +0000)]
Merge pull request #22291 from eileenmcnaughton/amount_block
[REF] Extract & stdise AmountBlockIsActive
Matthew Wire [Wed, 9 Mar 2022 21:51:50 +0000 (21:51 +0000)]
Merge pull request #22255 from MegaphoneJon/membership-14-2021
Calculate lifetime memberships more accurately