civicrm-core.git
3 years agowithout this you need administer CiviCRM permission to use api4 CaseActivity
demeritcowboy [Wed, 28 Apr 2021 01:16:36 +0000 (21:16 -0400)]
without this you need administer CiviCRM permission to use api4 CaseActivity

3 years agoMerge pull request #20148 from seamuslee001/dev_core_2564
Seamus Lee [Tue, 27 Apr 2021 00:45:40 +0000 (10:45 +1000)]
Merge pull request #20148 from seamuslee001/dev_core_2564

dev/core#2564 Fix class constants for when using phpseclib v1

3 years agoMerge pull request #20142 from colemanw/fixMultiValueContactRefFieldDedupe
Eileen McNaughton [Mon, 26 Apr 2021 23:20:34 +0000 (11:20 +1200)]
Merge pull request #20142 from colemanw/fixMultiValueContactRefFieldDedupe

Fix hard crash when deduping if any multiValued ContactRef fields exist

3 years agoFix hard crash when deduping if any multiValued ContactRef fields exist
Coleman Watts [Sun, 25 Apr 2021 18:58:00 +0000 (14:58 -0400)]
Fix hard crash when deduping if any multiValued ContactRef fields exist

Fixes https://lab.civicrm.org/dev/core/-/issues/2561

3 years agodev/core#2564 - PhpseclibCipherSuite - Support v1 constants
Tim Otten [Mon, 26 Apr 2021 21:05:45 +0000 (14:05 -0700)]
dev/core#2564 - PhpseclibCipherSuite - Support v1 constants

3 years agodev/core#2564 Fix class constants for when using phpseclib v1
Seamus Lee [Mon, 26 Apr 2021 07:56:55 +0000 (17:56 +1000)]
dev/core#2564 Fix class constants for when using phpseclib v1

3 years agoMerge pull request #20127 from agileware/CIVICRM-1718
Matthew Wire [Sun, 25 Apr 2021 10:21:42 +0000 (11:21 +0100)]
Merge pull request #20127 from agileware/CIVICRM-1718

Set default terms = 1 in (edit) Membership form javascript

3 years agoCIVICRM-1718: Default terms = 1 in (edit) Membership form javascript
Francis Whittle [Fri, 23 Apr 2021 03:17:18 +0000 (13:17 +1000)]
CIVICRM-1718: Default terms = 1 in (edit) Membership form javascript

3 years agoAdd release notes for 5.36.1, 5.35.2
CiviCRM [Fri, 16 Apr 2021 23:56:41 +0000 (09:56 +1000)]
Add release notes for 5.36.1, 5.35.2

3 years agoAPIv4 - Fix gatekeeper checks across joins
Coleman Watts [Tue, 13 Apr 2021 12:17:01 +0000 (08:17 -0400)]
APIv4 - Fix gatekeeper checks across joins

3 years agoAPIv4 - Add test to ensure gatekeeper permissions are checked across joins
Coleman Watts [Tue, 13 Apr 2021 12:14:59 +0000 (08:14 -0400)]
APIv4 - Add test to ensure gatekeeper permissions are checked across joins

3 years agoMerge pull request #20094 from seamuslee001/fix_install_search_display_table_56
colemanw [Mon, 19 Apr 2021 16:35:51 +0000 (12:35 -0400)]
Merge pull request #20094 from seamuslee001/fix_install_search_display_table_56

[REF] Fix installation of the search display table on MySQL 5.36 in t…

3 years ago[REF] Fix installation of the search display table on MySQL 5.36 in tests
Seamus Lee [Sun, 18 Apr 2021 00:52:01 +0000 (10:52 +1000)]
[REF] Fix installation of the search display table on MySQL 5.36 in tests

3 years agoMerge pull request #20083 from mlutfy/dev2543on537
Seamus Lee [Fri, 16 Apr 2021 21:57:59 +0000 (07:57 +1000)]
Merge pull request #20083 from mlutfy/dev2543on537

dev/core#2543 Fix Membership Edit PHP fatal when no recorded payment

3 years agoMerge pull request #20084 from agh1/5.37.0-releasenotes-initial
Seamus Lee [Fri, 16 Apr 2021 21:56:37 +0000 (07:56 +1000)]
Merge pull request #20084 from agh1/5.37.0-releasenotes-initial

5.37.0 release notes initial run

3 years ago5.37.0 release notes: added boilerplate
Andrew Hunt [Fri, 16 Apr 2021 17:40:00 +0000 (13:40 -0400)]
5.37.0 release notes: added boilerplate

3 years ago5.37.0 release notes: raw from script
Andrew Hunt [Fri, 16 Apr 2021 17:36:48 +0000 (13:36 -0400)]
5.37.0 release notes: raw from script

3 years agodev/core#2543 Fix Membership Edit PHP fatal when no recorded payment
Mathieu Lutfy [Fri, 16 Apr 2021 12:51:48 +0000 (08:51 -0400)]
dev/core#2543 Fix Membership Edit PHP fatal when no recorded payment

3 years agoMerge pull request #20018 from seamuslee001/dev_core_2522
colemanw [Fri, 16 Apr 2021 12:38:29 +0000 (08:38 -0400)]
Merge pull request #20018 from seamuslee001/dev_core_2522

dev/core#2522 Add in Submit Action and redirect handling post form su…

3 years agodev/core#2522 Add in Submit Action and redirect handling post form submit
Seamus Lee [Fri, 9 Apr 2021 08:21:05 +0000 (18:21 +1000)]
dev/core#2522 Add in Submit Action and redirect handling post form submit

Move fields to the bottom of the config form and also rework the submission code as per suggestion from coleman and also ensure that the submit_action and redirect are exposed in the front end metadata

Remove debugging

Revmoe submit action field as no longer required

Make improvements as per Coleman's review

Update text as per Coleamn and fix regex to allos for ? = # & options in urls

Fix Regex to do some wildcard matching

3 years agoMerge pull request #20071 from eileenmcnaughton/537d
Seamus Lee [Fri, 16 Apr 2021 00:35:19 +0000 (10:35 +1000)]
Merge pull request #20071 from eileenmcnaughton/537d

dev/core#2498 dedupe rule saving fix

3 years agoMerge pull request #20074 from seamuslee001/fix_format_money
Seamus Lee [Thu, 15 Apr 2021 23:29:58 +0000 (09:29 +1000)]
Merge pull request #20074 from seamuslee001/fix_format_money

REF Ensure that getAmount includes 0s in decimal places up to 2 places

3 years agoMerge pull request #20073 from seamuslee001/dev_event_53
Seamus Lee [Thu, 15 Apr 2021 23:15:31 +0000 (09:15 +1000)]
Merge pull request #20073 from seamuslee001/dev_event_53

dev/event#53 Fix issue where by Sold out option was not being properl…

3 years agoREF Ensure that getAmount includes 0s in decimal places up to 2 places
Seamus Lee [Thu, 15 Apr 2021 22:01:23 +0000 (08:01 +1000)]
REF Ensure that getAmount includes 0s in decimal places up to 2 places

3 years agodev/event#53 Fix issue where by Sold out option was not being properly frozen
Seamus Lee [Thu, 15 Apr 2021 21:33:23 +0000 (07:33 +1000)]
dev/event#53 Fix issue where by Sold out option was not being properly frozen

3 years agodev/core#2498 dedupe rule saving fix
eileen [Thu, 15 Apr 2021 19:37:48 +0000 (07:37 +1200)]
dev/core#2498 dedupe rule saving fix

3 years agoMerge pull request #20040 from eileenmcnaughton/537
colemanw [Thu, 15 Apr 2021 04:04:27 +0000 (00:04 -0400)]
Merge pull request #20040 from eileenmcnaughton/537

dev/core#2493 Stop attempting to format money in the processor class

3 years agoMerge pull request #20066 from seamuslee001/dev_core_2528
Seamus Lee [Thu, 15 Apr 2021 04:00:47 +0000 (14:00 +1000)]
Merge pull request #20066 from seamuslee001/dev_core_2528

dev/core#2528 Set Modified date to be current timestamp in civicrm_co…

3 years agoAdd in deprecated warning if amount is not numeric and use filter var to return appro...
Seamus Lee [Thu, 15 Apr 2021 01:34:44 +0000 (11:34 +1000)]
Add in deprecated warning if amount is not numeric and use filter var to return appropriate amount in that case otherwise just return amount

3 years agodev/core#2528 Set Modified date to be current timestamp in civicrm_contribution_recur...
Seamus Lee [Thu, 15 Apr 2021 01:28:55 +0000 (11:28 +1000)]
dev/core#2528 Set Modified date to be current timestamp in civicrm_contribution_recur if it is null before setting the field to NOT NULL

3 years agoMerge pull request #20057 from christianwach/lab-wp-82
Eileen McNaughton [Wed, 14 Apr 2021 18:59:47 +0000 (06:59 +1200)]
Merge pull request #20057 from christianwach/lab-wp-82

Fix issues with "Create User Record" process

3 years agoFix issues with "Create User Record" process
Christian Wach [Wed, 14 Apr 2021 13:31:03 +0000 (14:31 +0100)]
Fix issues with "Create User Record" process

3 years agoMerge pull request #20050 from colemanw/fixEntityRef37
Eileen McNaughton [Wed, 14 Apr 2021 02:11:51 +0000 (14:11 +1200)]
Merge pull request #20050 from colemanw/fixEntityRef37

Fix entity-ref search by id & update search prompt

3 years agoFix entity-ref search by id & update search prompt
Coleman Watts [Tue, 13 Apr 2021 20:39:36 +0000 (16:39 -0400)]
Fix entity-ref search by id & update search prompt

Fixes a bug where searching by id wasn't working.
Also updates search prompt to indicate that searching by id is possible.

3 years agodev/core#2493 Stop attempting to format money in the processor class
eileen [Mon, 12 Apr 2021 03:23:07 +0000 (15:23 +1200)]
dev/core#2493 Stop attempting to format money in the processor class

We've said this is wrong before but it has survived until now because it seemed scarier to change it. However,
now the reverse seems true.

The value in amount should always be machine friendly and there are no known processors
that expect locale specific formatting.

On the other hand the format() function is intended to prepare money for DISPLAY which
is not what is going on here

3 years agoMerge pull request #20019 from mattwire/recaptchapcp
Seamus Lee [Sun, 11 Apr 2021 22:22:25 +0000 (08:22 +1000)]
Merge pull request #20019 from mattwire/recaptchapcp

Use standard function to add reCAPTCHA to PCPAccount form

3 years agoMerge pull request #20033 from colemanw/searchKitHavingLabel
Eileen McNaughton [Sun, 11 Apr 2021 19:08:35 +0000 (07:08 +1200)]
Merge pull request #20033 from colemanw/searchKitHavingLabel

dev/report#58 SearchKit - Rename 'Filters' to 'Having' for clarity

3 years agoSearchKit - Rename 'Filters' to 'Having' for clarity
Coleman Watts [Sun, 11 Apr 2021 15:51:35 +0000 (11:51 -0400)]
SearchKit - Rename 'Filters' to 'Having' for clarity

3 years agoMerge pull request #20031 from colemanw/searchKitFlushCache
Eileen McNaughton [Sun, 11 Apr 2021 04:52:23 +0000 (16:52 +1200)]
Merge pull request #20031 from colemanw/searchKitFlushCache

SearchKit - Flush Angular cache when saving

3 years agoSearchKit - Flush Angular cache when saving
Coleman Watts [Sun, 11 Apr 2021 01:28:20 +0000 (21:28 -0400)]
SearchKit - Flush Angular cache when saving

3 years agoMerge pull request #20025 from jitendrapurohit/memsoftcredit-537
Eileen McNaughton [Sat, 10 Apr 2021 00:24:09 +0000 (12:24 +1200)]
Merge pull request #20025 from jitendrapurohit/memsoftcredit-537

Soft credit fails when membership is created using backend form

3 years agoFix soft credit on creating membership using backend form
Jitendra Purohit [Fri, 9 Apr 2021 14:40:37 +0000 (20:10 +0530)]
Fix soft credit on creating membership using backend form

3 years agoUse standard function to add reCAPTCHA to PCPAccount form
Matthew Wire [Fri, 9 Apr 2021 09:07:25 +0000 (10:07 +0100)]
Use standard function to add reCAPTCHA to PCPAccount form

3 years agoMerge pull request #20011 from seamuslee001/migrate_library
Matthew Wire [Fri, 9 Apr 2021 08:35:29 +0000 (09:35 +0100)]
Merge pull request #20011 from seamuslee001/migrate_library

Migrate current recaptcha library into extension and fix a couple of …

3 years agoMerge pull request #20009 from colemanw/caseActivity
Eileen McNaughton [Fri, 9 Apr 2021 00:28:24 +0000 (12:28 +1200)]
Merge pull request #20009 from colemanw/caseActivity

dev/report#53 APIv4 - Add CaseActivity entity

3 years agoMigrate current recaptcha library into extension and fix a couple of ts calls
Seamus Lee [Thu, 8 Apr 2021 23:08:07 +0000 (09:08 +1000)]
Migrate current recaptcha library into extension and fix a couple of ts calls

3 years agoAPIv4 - Add CaseActivity entity
Coleman Watts [Thu, 8 Apr 2021 23:08:11 +0000 (19:08 -0400)]
APIv4 - Add CaseActivity entity

3 years agoMerge pull request #20003 from colemanw/fixSearchKitExport
Eileen McNaughton [Thu, 8 Apr 2021 20:33:21 +0000 (08:33 +1200)]
Merge pull request #20003 from colemanw/fixSearchKitExport

SearchKit - Fix broken export action

3 years agoSearchKit - Fix broken export action
Coleman Watts [Thu, 8 Apr 2021 15:12:25 +0000 (11:12 -0400)]
SearchKit - Fix broken export action

3 years agoMerge pull request #19999 from eileenmcnaughton/5.37
Seamus Lee [Thu, 8 Apr 2021 08:37:20 +0000 (18:37 +1000)]
Merge pull request #19999 from eileenmcnaughton/5.37

Add recaptcha to distmaker

3 years agoMerge pull request #19998 from colemanw/afformAssetRefresh
Seamus Lee [Thu, 8 Apr 2021 07:22:55 +0000 (17:22 +1000)]
Merge pull request #19998 from colemanw/afformAssetRefresh

Afform - Refresh assetBuilder when saving a form

3 years agoMerge pull request #19997 from colemanw/afformSearchDisplayDropdown
Seamus Lee [Thu, 8 Apr 2021 06:38:51 +0000 (16:38 +1000)]
Merge pull request #19997 from colemanw/afformSearchDisplayDropdown

Afform - Fix endless spinner on "New Search Display" dropdown

3 years agoAdd recaptcha to distmaker
eileen [Thu, 8 Apr 2021 06:33:20 +0000 (18:33 +1200)]
Add recaptcha to distmaker

3 years agoAfform - Refresh assetBuilder when saving a form
Coleman Watts [Thu, 8 Apr 2021 02:33:47 +0000 (22:33 -0400)]
Afform - Refresh assetBuilder when saving a form

On sites with caching enabled, changes were not showing until a manual flush

3 years agoAfform - Fix endless spinner on "New Search Display" dropdown when there are none
Coleman Watts [Thu, 8 Apr 2021 02:11:03 +0000 (22:11 -0400)]
Afform - Fix endless spinner on "New Search Display" dropdown when there are none

3 years agoSet version to 5.37.beta1
CiviCRM [Thu, 8 Apr 2021 01:42:10 +0000 (01:42 +0000)]
Set version to 5.37.beta1

3 years agoMerge pull request #19996 from colemanw/misc_admin_settings
Tim Otten [Thu, 8 Apr 2021 01:24:53 +0000 (18:24 -0700)]
Merge pull request #19996 from colemanw/misc_admin_settings

Rename 'Misc' menu item machine name to a safe string

3 years agoMerge pull request #19543 from eileenmcnaughton/msg_tpl
Eileen McNaughton [Thu, 8 Apr 2021 01:22:57 +0000 (13:22 +1200)]
Merge pull request #19543 from eileenmcnaughton/msg_tpl

replaceOrgTokens: Remove broken code

3 years agoUpdate civicrm_generated.mysql
Tim Otten [Thu, 8 Apr 2021 01:13:41 +0000 (18:13 -0700)]
Update civicrm_generated.mysql

3 years agoRename 'Misc' menu item machine name to a safe string
Coleman Watts [Thu, 8 Apr 2021 00:54:55 +0000 (20:54 -0400)]
Rename 'Misc' menu item machine name to a safe string

This renames the machine name to one that doesn't contain special characters

3 years agoMerge pull request #19967 from mattwire/recaptchaextension
Seamus Lee [Wed, 7 Apr 2021 23:32:18 +0000 (09:32 +1000)]
Merge pull request #19967 from mattwire/recaptchaextension

Create reCAPTCHA core extension

3 years agoMerge pull request #19969 from eileenmcnaughton/settingbag
Seamus Lee [Wed, 7 Apr 2021 22:55:31 +0000 (08:55 +1000)]
Merge pull request #19969 from eileenmcnaughton/settingbag

E-notice fix on serialized setting

3 years agoMerge pull request #19994 from civicrm/dependabot/composer/phpseclib/phpseclib-2...
Seamus Lee [Wed, 7 Apr 2021 22:52:25 +0000 (08:52 +1000)]
Merge pull request #19994 from civicrm/dependabot/composer/phpseclib/phpseclib-2.0.31

Bump phpseclib/phpseclib from 2.0.29 to 2.0.31

3 years agoMerge pull request #19992 from demeritcowboy/activity-contact-weights
Eileen McNaughton [Wed, 7 Apr 2021 22:43:09 +0000 (10:43 +1200)]
Merge pull request #19992 from demeritcowboy/activity-contact-weights

dev/core#2442 - Missing sample data update for activity contact weights

3 years agoMerge pull request #19993 from colemanw/apiJoinFix
Eileen McNaughton [Wed, 7 Apr 2021 22:35:39 +0000 (10:35 +1200)]
Merge pull request #19993 from colemanw/apiJoinFix

APIv4 - Prevent api adding default join conditions when it shouldn't

3 years agoMerge pull request #19984 from colemanw/searchKitAddFilterToJoin
Eileen McNaughton [Wed, 7 Apr 2021 22:31:37 +0000 (10:31 +1200)]
Merge pull request #19984 from colemanw/searchKitAddFilterToJoin

SearchKit - Apply filters to ON clause of EXCLUDE joins

3 years agoUpdate CRM/Upgrade/Incremental/php/FiveThirtySeven.php
Tim Otten [Wed, 7 Apr 2021 22:18:51 +0000 (15:18 -0700)]
Update CRM/Upgrade/Incremental/php/FiveThirtySeven.php

3 years agoCreate recaptcha core extension
Matthew Wire [Sat, 3 Apr 2021 22:28:51 +0000 (23:28 +0100)]
Create recaptcha core extension

3 years agoBump phpseclib/phpseclib from 2.0.29 to 2.0.31
dependabot[bot] [Wed, 7 Apr 2021 21:21:09 +0000 (21:21 +0000)]
Bump phpseclib/phpseclib from 2.0.29 to 2.0.31

Bumps [phpseclib/phpseclib](https://github.com/phpseclib/phpseclib) from 2.0.29 to 2.0.31.
- [Release notes](https://github.com/phpseclib/phpseclib/releases)
- [Changelog](https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md)
- [Commits](https://github.com/phpseclib/phpseclib/compare/2.0.29...2.0.31)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoupdate weights for sample data
demeritcowboy [Wed, 7 Apr 2021 20:40:13 +0000 (16:40 -0400)]
update weights for sample data

3 years agoMerge pull request #19987 from kurund/activity-type-weights
colemanw [Wed, 7 Apr 2021 20:33:45 +0000 (16:33 -0400)]
Merge pull request #19987 from kurund/activity-type-weights

Activity type weights

3 years agoAPIv4 - Prevent api adding default join conditions when it shouldn't
Coleman Watts [Wed, 7 Apr 2021 20:16:25 +0000 (16:16 -0400)]
APIv4 - Prevent api adding default join conditions when it shouldn't

When adding an explicit join, the api will search for a default condition unless
an fk field has been explicitly set. This fixes an error when the api thought
no fk field was present when it actually was.

3 years agoMerge pull request #19687 from colemanw/afformShortcodes
Eileen McNaughton [Wed, 7 Apr 2021 19:34:37 +0000 (07:34 +1200)]
Merge pull request #19687 from colemanw/afformShortcodes

Afform - Support embedding forms via WP shortcodes.

3 years agoupdate weights for the activity contact types
Kurund Jalmi [Wed, 7 Apr 2021 11:06:43 +0000 (12:06 +0100)]
update weights for the activity contact types

3 years agoMerge pull request #19978 from demeritcowboy/php74-contribution
Monish Deb [Wed, 7 Apr 2021 17:08:21 +0000 (22:38 +0530)]
Merge pull request #19978 from demeritcowboy/php74-contribution

dev/core#2425 - php 7.4 - E_NOTICE every time you save a contribution

3 years agoMerge pull request #19981 from colemanw/fullScreenDashlet
colemanw [Wed, 7 Apr 2021 13:56:00 +0000 (09:56 -0400)]
Merge pull request #19981 from colemanw/fullScreenDashlet

Fix scrollbars on fullscreen dashboard dashlet

3 years agoMerge pull request #19985 from civicrm/5.36
Eileen McNaughton [Wed, 7 Apr 2021 05:10:58 +0000 (17:10 +1200)]
Merge pull request #19985 from civicrm/5.36

5.36 to master

3 years agoMerge pull request #19983 from alifrumin/5.36rn
Eileen McNaughton [Wed, 7 Apr 2021 05:10:33 +0000 (17:10 +1200)]
Merge pull request #19983 from alifrumin/5.36rn

[NFC] 5.36 release notes

3 years agoMerge pull request #19927 from eileenmcnaughton/etfa
colemanw [Wed, 7 Apr 2021 03:46:23 +0000 (23:46 -0400)]
Merge pull request #19927 from eileenmcnaughton/etfa

Add entity financial account bridge entity

3 years agoSearchKit - Apply filters to ON clause of EXCLUDE joins
Coleman Watts [Wed, 7 Apr 2021 03:38:10 +0000 (23:38 -0400)]
SearchKit - Apply filters to ON clause of EXCLUDE joins

Filters usually get applied to the WHERE clause, but in the case of EXCLUDE joins,
they will never be available (because their results are excluded).
So it makes more sense to add them to the ON clause of the join itself.

3 years ago5.36 release notes first pass
Alice Frumin [Tue, 6 Apr 2021 17:47:32 +0000 (13:47 -0400)]
5.36 release notes first pass

3 years agoAfform - Support embedding afforms in WP shortcodes
Coleman Watts [Sun, 28 Feb 2021 04:35:42 +0000 (23:35 -0500)]
Afform - Support embedding afforms in WP shortcodes

This implements the necessary hooks & callbacks for picking an afform from the Civi shortcode popup,
and displaying the afform when viewing a single WP post/page or list of posts.

Note that unlike traditional Civi shortcodes, afform does not rely on invoking a civi page request,
but simply outputs the AngularJS directive.

3 years agoAfform - add entityRef widget support.
Coleman Watts [Sun, 28 Feb 2021 04:33:49 +0000 (23:33 -0500)]
Afform - add entityRef widget support.

Adds a v3 Afform api solely for the purpose of enabling entityRef widgets, which use APIv3.

3 years agoMerge pull request #19887 from colemanw/afformContactSummary
Seamus Lee [Wed, 7 Apr 2021 02:36:04 +0000 (12:36 +1000)]
Merge pull request #19887 from colemanw/afformContactSummary

Embed afforms & search displays on contact summary screen as blocks and tabs

3 years agoMerge pull request #19980 from eileenmcnaughton/deduper
Seamus Lee [Wed, 7 Apr 2021 02:35:13 +0000 (12:35 +1000)]
Merge pull request #19980 from eileenmcnaughton/deduper

[REF] Minor cleanup - remove unused variables

3 years agoAdd entity financial account
eileen [Sun, 28 Mar 2021 02:39:33 +0000 (15:39 +1300)]
Add entity financial account

3 years agoMerge pull request #19934 from eileenmcnaughton/recur
colemanw [Wed, 7 Apr 2021 01:45:01 +0000 (21:45 -0400)]
Merge pull request #19934 from eileenmcnaughton/recur

dev/core#2487 Update defaults for civicrm_contribution_recur table

3 years agoMerge pull request #19946 from MikeyMJCO/patch-9
Tim Otten [Wed, 7 Apr 2021 01:16:13 +0000 (18:16 -0700)]
Merge pull request #19946 from MikeyMJCO/patch-9

(NFC) Add FUNDING.yml to display a SPONSOR link that directs to c.o

3 years agoFix scrollbars on fullscreen dashboard dashlet
Coleman Watts [Wed, 7 Apr 2021 01:13:40 +0000 (21:13 -0400)]
Fix scrollbars on fullscreen dashboard dashlet

Apparently angular dialogService expects templates to be wrapped in an outer div,
as that becomes the .ui-dialog-content element.

3 years ago[REF] Minor cleanup - remove unused variables
eileen [Wed, 7 Apr 2021 00:53:01 +0000 (12:53 +1200)]
[REF] Minor cleanup - remove unused variables

This also removes the use of mergeHandler in place of this - which is usually an interim
refactoring step when a function is moved

3 years agoSearchKit - display count in tab header if embedded in contact summary tab
Coleman Watts [Wed, 24 Mar 2021 13:30:39 +0000 (09:30 -0400)]
SearchKit - display count in tab header if embedded in contact summary tab

3 years agoAfform - Enable embedded forms on contact summary screen as blocks and tabs
Coleman Watts [Wed, 24 Mar 2021 03:09:35 +0000 (23:09 -0400)]
Afform - Enable embedded forms on contact summary screen as blocks and tabs

3 years agoMerge pull request #19976 from jitendrapurohit/pledgepayment
Eileen McNaughton [Tue, 6 Apr 2021 23:15:40 +0000 (11:15 +1200)]
Merge pull request #19976 from jitendrapurohit/pledgepayment

Fix re-calculation of payment dates on pledge

3 years agoMerge pull request #19550 from eileenmcnaughton/msg_tpl_convert
colemanw [Tue, 6 Apr 2021 22:02:07 +0000 (18:02 -0400)]
Merge pull request #19550 from eileenmcnaughton/msg_tpl_convert

 Convert token processing to use token processor

3 years agoMerge pull request #19970 from colemanw/optionValueDomain
Eileen McNaughton [Tue, 6 Apr 2021 21:26:26 +0000 (09:26 +1200)]
Merge pull request #19970 from colemanw/optionValueDomain

dev/core#2488 - When setting default optionValue, limit query to specified domain

3 years agoMerge pull request #19974 from eileenmcnaughton/setup
Seamus Lee [Tue, 6 Apr 2021 21:03:57 +0000 (07:03 +1000)]
Merge pull request #19974 from eileenmcnaughton/setup

Phpunit 8 support - add void to setup

3 years agoavoid E_notice / refactor
demeritcowboy [Tue, 6 Apr 2021 17:26:17 +0000 (13:26 -0400)]
avoid E_notice / refactor

3 years agoMerge pull request #19979 from civicrm/5.36
Eileen McNaughton [Tue, 6 Apr 2021 19:19:02 +0000 (07:19 +1200)]
Merge pull request #19979 from civicrm/5.36

5.36 to master

3 years agoMerge pull request #19977 from agh1/5.36.0-releasenotes-initial
Eileen McNaughton [Tue, 6 Apr 2021 19:18:34 +0000 (07:18 +1200)]
Merge pull request #19977 from agh1/5.36.0-releasenotes-initial

5.36.0 release notes initial run

3 years agoAfform Gui - Cleanup "Form Settings" tab
Coleman Watts [Tue, 23 Mar 2021 12:44:15 +0000 (08:44 -0400)]
Afform Gui - Cleanup "Form Settings" tab

Minor code cleanup, help text tweaks and organization on the config-form tab