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

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

3 years agoMerge pull request #19968 from mlutfy/ui35
colemanw [Tue, 6 Apr 2021 18:43:19 +0000 (14:43 -0400)]
Merge pull request #19968 from mlutfy/ui35

dev/user-interface#35 civicrm.css: add support for mobile devices on forms

3 years ago5.36.0 release notes: added boilerplate
Andrew Hunt [Tue, 6 Apr 2021 16:23:18 +0000 (12:23 -0400)]
5.36.0 release notes: added boilerplate

3 years ago5.36.0 release notes: raw from script
Andrew Hunt [Tue, 6 Apr 2021 16:20:56 +0000 (12:20 -0400)]
5.36.0 release notes: raw from script

3 years agocivicrm.css: add support for mobile devices on forms
Mathieu Lutfy [Mon, 5 Apr 2021 13:47:43 +0000 (09:47 -0400)]
civicrm.css: add support for mobile devices on forms

3 years agoMerge pull request #19922 from colemanw/angularLoader
colemanw [Tue, 6 Apr 2021 12:39:19 +0000 (08:39 -0400)]
Merge pull request #19922 from colemanw/angularLoader

AngularJS - Allow loading multiple apps on a single page

3 years agoMerge pull request #19820 from greenpeace-cee/GP-15884-activity-contact-not-updated
Eileen McNaughton [Tue, 6 Apr 2021 10:30:10 +0000 (22:30 +1200)]
Merge pull request #19820 from greenpeace-cee/GP-15884-activity-contact-not-updated

dev/core#2450 - Update source/target contacts on contribution updates

3 years agoFix recalculation of dates on pledge
Jitendra Purohit [Tue, 6 Apr 2021 09:42:02 +0000 (15:12 +0530)]
Fix recalculation of dates on pledge

3 years agoPhpunit 8 support - add void to setup
eileen [Tue, 6 Apr 2021 08:53:30 +0000 (20:53 +1200)]
Phpunit 8 support - add void to setup

3 years agodev/core#2450 - Update source/target contacts on contribution updates
Manuel Flandorfer [Tue, 23 Mar 2021 11:01:21 +0000 (12:01 +0100)]
dev/core#2450 - Update source/target contacts on contribution updates

dev/core#2450 - Incorporate requested changes

dev/core#2450 - Make activity target contact parameter an array

dev/core#2450 - Delete now obsolete comment about target contact updates

dev/core#2450 - Compare activity contact IDs on contribution update

to avoid unnecessary updates
dev/core#2450 - Simplify API calls in unit test

dev/core#2450 - Remove limit from activity contact query

3 years agoMerge pull request #19904 from eileenmcnaughton/pdf
Monish Deb [Tue, 6 Apr 2021 06:05:01 +0000 (11:35 +0530)]
Merge pull request #19904 from eileenmcnaughton/pdf

[REF] [Search-kit-actions] Cleanup around contribution pdf common

3 years agoMerge pull request #19628 from vakeesan26/master
Monish Deb [Tue, 6 Apr 2021 05:39:27 +0000 (11:09 +0530)]
Merge pull request #19628 from vakeesan26/master

dev/core#2383 fix for contact custom data date field not working in scheduled reminder

3 years agoMerge pull request #19971 from eileenmcnaughton/setup
Eileen McNaughton [Tue, 6 Apr 2021 03:18:19 +0000 (15:18 +1200)]
Merge pull request #19971 from eileenmcnaughton/setup

Remove empty setUp() functions

3 years agoRemove empty setUp() functions
eileen [Tue, 6 Apr 2021 01:45:08 +0000 (13:45 +1200)]
Remove empty setUp() functions

3 years agodev/core#2488 - When setting default optionValue, limit query to specified domain
Coleman Watts [Mon, 5 Apr 2021 23:40:06 +0000 (19:40 -0400)]
dev/core#2488 - When setting default optionValue, limit query to specified domain

3 years agoMerge pull request #19959 from colemanw/afFilterRange
Eileen McNaughton [Mon, 5 Apr 2021 23:25:11 +0000 (11:25 +1200)]
Merge pull request #19959 from colemanw/afFilterRange

SearchKit - Support implied operators in exposed search forms

3 years agoE-notice fix on serialized setting
eileen [Mon, 5 Apr 2021 22:18:45 +0000 (10:18 +1200)]
E-notice fix on serialized setting

We do actually support settings declaring defaults for a serialized field as an array rather
than as a serialised string. However, this setting form, if used, will display an
e-notice in that case as it will still try to unserialize - this adds a simple check first

3 years agoAfform - Allow search range by postal code
Coleman Watts [Mon, 5 Apr 2021 21:22:46 +0000 (17:22 -0400)]
Afform - Allow search range by postal code

Search display forms only allow numeric fields to be a search range,
but postal code is an exception (it's stored as a string but is numeric in some locales)

3 years agoAfform - Set defaults for search filter fields
Coleman Watts [Mon, 5 Apr 2021 20:40:17 +0000 (16:40 -0400)]
Afform - Set defaults for search filter fields

3 years agoMerge pull request #19961 from systopia/issue/2502_master
Eileen McNaughton [Mon, 5 Apr 2021 19:43:39 +0000 (07:43 +1200)]
Merge pull request #19961 from systopia/issue/2502_master

dev/core#2502 Proposed fix/workaround for CORE-2502

3 years agoMerge pull request #19907 from colemanw/civiCaseApi
Eileen McNaughton [Mon, 5 Apr 2021 19:40:45 +0000 (07:40 +1200)]
Merge pull request #19907 from colemanw/civiCaseApi

APIv4 - Add CiviCase, CaseType, CaseContact entities

3 years agoSearchKit - Add unit test for SearchDisplay::run
Coleman Watts [Wed, 31 Mar 2021 19:50:19 +0000 (15:50 -0400)]
SearchKit - Add unit test for SearchDisplay::run

3 years agoAfform - Support search-by-range and search-by-multiple-values
Coleman Watts [Wed, 31 Mar 2021 18:30:12 +0000 (14:30 -0400)]
Afform - Support search-by-range and search-by-multiple-values

This adds support for filter operators in SearchKit. It does not expose an operator selector to Afform
but allows an operator to be implied through the type of field configured.
e.g. a multiselect implies the IN operator & a range select implies BETWEEN.

3 years agoproposed fix/workaround for CORE-2502
B. Endres [Thu, 1 Apr 2021 11:57:50 +0000 (13:57 +0200)]
proposed fix/workaround for CORE-2502

3 years agoMerge pull request #19317 from ahed-compucorp/dev/core#2285
Eileen McNaughton [Mon, 5 Apr 2021 07:46:35 +0000 (19:46 +1200)]
Merge pull request #19317 from ahed-compucorp/dev/core#2285

dev/core#2285 Fix civicrm_alterReportVar hook for contribute detail r…

3 years agoMerge pull request #19920 from totten/master-upgrade-token
Eileen McNaughton [Mon, 5 Apr 2021 07:27:16 +0000 (19:27 +1200)]
Merge pull request #19920 from totten/master-upgrade-token

Upgrader - Display note about token formatting

3 years agoMerge pull request #19948 from demeritcowboy/defrev-recdate
Eileen McNaughton [Mon, 5 Apr 2021 07:21:10 +0000 (19:21 +1200)]
Merge pull request #19948 from demeritcowboy/defrev-recdate

dev/financial#172 - Warning when saving a contribution with a recognition date

3 years agoMerge pull request #19963 from systopia/issue/2164_2
Eileen McNaughton [Sat, 3 Apr 2021 20:03:04 +0000 (08:03 +1200)]
Merge pull request #19963 from systopia/issue/2164_2

Proposed fix for CORE-2164

3 years agoproposed fix for CORE-2164
B. Endres [Sat, 3 Apr 2021 17:47:53 +0000 (19:47 +0200)]
proposed fix for CORE-2164

3 years agoAdd APIv4 CaseType entity
Coleman Watts [Thu, 1 Apr 2021 22:41:23 +0000 (18:41 -0400)]
Add APIv4 CaseType entity

The `definition` field requires special formatting; so this change
allows api fields to specify `output_formatters`, which are per-field
callback functions for altering the output of a `get` request.

3 years agoAPIv4 - Add CiviCase and CaseContact entities
Coleman Watts [Thu, 25 Mar 2021 14:48:33 +0000 (10:48 -0400)]
APIv4 - Add CiviCase and CaseContact entities

3 years agoMerge pull request #18982 from mlutfy/wp82
Mathieu Lu [Fri, 2 Apr 2021 16:24:56 +0000 (12:24 -0400)]
Merge pull request #18982 from mlutfy/wp82

dev/wordpress#82 Add support for creating WordPress accounts from the contact record

3 years agoMerge pull request #19962 from jaapjansma/dev_2503
Eileen McNaughton [Thu, 1 Apr 2021 22:02:06 +0000 (11:02 +1300)]
Merge pull request #19962 from jaapjansma/dev_2503

Fix for dev/core#2503

3 years agoFix for dev/core#2503
Jaap Jansma [Thu, 1 Apr 2021 13:30:10 +0000 (15:30 +0200)]
Fix for dev/core#2503

3 years agoMerge pull request #19949 from eileenmcnaughton/dedupe
Seamus Lee [Thu, 1 Apr 2021 03:08:51 +0000 (14:08 +1100)]
Merge pull request #19949 from eileenmcnaughton/dedupe

[REF] Minor cleanup - strictness & formatting

3 years agoMerge pull request #19911 from eileenmcnaughton/new
Monish Deb [Thu, 1 Apr 2021 02:48:08 +0000 (08:18 +0530)]
Merge pull request #19911 from eileenmcnaughton/new

[REF] [Towards membership api] more consistent handling on amount

3 years agoMerge pull request #19938 from demeritcowboy/php74-money
Seamus Lee [Wed, 31 Mar 2021 22:21:55 +0000 (09:21 +1100)]
Merge pull request #19938 from demeritcowboy/php74-money

dev/financial#171 - Trigger an error if non-numeric value passed to Money::format()

3 years agoMerge pull request #19937 from samuelsov/core#527
Eileen McNaughton [Wed, 31 Mar 2021 21:24:55 +0000 (10:24 +1300)]
Merge pull request #19937 from samuelsov/core#527

dev/core#527 use public title for on behalf profile and confirm/thank you profile in emails

3 years agoMerge pull request #19951 from pradpnayak/fixgetlineitem
Eileen McNaughton [Wed, 31 Mar 2021 20:51:15 +0000 (09:51 +1300)]
Merge pull request #19951 from pradpnayak/fixgetlineitem

Donot over-ride total amount incase contribution has more than one line item

3 years agoMerge pull request #19958 from demeritcowboy/htmlmoney
Eileen McNaughton [Wed, 31 Mar 2021 20:49:18 +0000 (09:49 +1300)]
Merge pull request #19958 from demeritcowboy/htmlmoney

dev/financial#171 - Don't try to money_format html

3 years agoMerge pull request #19561 from seamuslee001/search_task_map
Eileen McNaughton [Wed, 31 Mar 2021 20:47:42 +0000 (09:47 +1300)]
Merge pull request #19561 from seamuslee001/search_task_map

Expose mapping search task to Search Kit

3 years agodev/core#527 simpler solution
Samuel Vanhove [Wed, 31 Mar 2021 19:49:25 +0000 (15:49 -0400)]
dev/core#527 simpler solution

3 years agoMerge pull request #19955 from eileenmcnaughton/merge_locations
colemanw [Wed, 31 Mar 2021 18:26:38 +0000 (14:26 -0400)]
Merge pull request #19955 from eileenmcnaughton/merge_locations

[REF] Move function from static class to OO class

3 years agodon't try to money_format html
demeritcowboy [Wed, 31 Mar 2021 13:36:50 +0000 (09:36 -0400)]
don't try to money_format html

3 years agoMerge pull request #19924 from eileenmcnaughton/mem_ex
Monish Deb [Wed, 31 Mar 2021 09:41:31 +0000 (15:11 +0530)]
Merge pull request #19924 from eileenmcnaughton/mem_ex

[REF] Extract getMembershipTypeValues

3 years agoMerge pull request #19956 from civicrm/5.36
Eileen McNaughton [Wed, 31 Mar 2021 09:33:04 +0000 (22:33 +1300)]
Merge pull request #19956 from civicrm/5.36

5.36

3 years agoMerge pull request #19952 from eileenmcnaughton/5.36
Monish Deb [Wed, 31 Mar 2021 05:22:55 +0000 (10:52 +0530)]
Merge pull request #19952 from eileenmcnaughton/5.36

dev/core#2498 Fix regression on saving dedupe rules

3 years agoMerge pull request #19936 from jmcclelland/only-include-completed
Seamus Lee [Wed, 31 Mar 2021 05:07:35 +0000 (16:07 +1100)]
Merge pull request #19936 from jmcclelland/only-include-completed

Only include completed contributions in the aggregate custom search

3 years agoMerge pull request #19894 from eileenmcnaughton/acl
Seamus Lee [Wed, 31 Mar 2021 05:05:20 +0000 (16:05 +1100)]
Merge pull request #19894 from eileenmcnaughton/acl

Only call getGroupACLRoles if contactID is present

3 years agoMerge pull request #19944 from civicrm/dependabot/npm_and_yarn/y18n-4.0.1
Seamus Lee [Wed, 31 Mar 2021 05:01:07 +0000 (16:01 +1100)]
Merge pull request #19944 from civicrm/dependabot/npm_and_yarn/y18n-4.0.1

Bump y18n from 4.0.0 to 4.0.1

3 years agoMerge pull request #19953 from eileenmcnaughton/jobtest
Seamus Lee [Wed, 31 Mar 2021 04:59:28 +0000 (15:59 +1100)]
Merge pull request #19953 from eileenmcnaughton/jobtest

NFC cleanup in test class

3 years ago[REF] Move function from static class to OO class
eileen [Wed, 31 Mar 2021 03:47:13 +0000 (16:47 +1300)]
[REF] Move function from static class to OO class

Part of using the mergeHandler to (slowly) make code more readable.

changes from

self::mergeLocations();

to mergeHandler->mergeLocations()

3 years agoNFC cleanup in hook class
eileen [Wed, 31 Mar 2021 02:51:50 +0000 (15:51 +1300)]
NFC cleanup in hook class

3 years agoMerge pull request #19950 from eileenmcnaughton/dead_fn
Eileen McNaughton [Wed, 31 Mar 2021 02:35:30 +0000 (15:35 +1300)]
Merge pull request #19950 from eileenmcnaughton/dead_fn

Remove unused private function

3 years agoAdding test to support fix
Pradeep Nayak [Wed, 31 Mar 2021 01:55:37 +0000 (02:55 +0100)]
Adding test to support fix