civicrm-core.git
2 years agoMerge pull request #26150 from totten/master-562-dedupe
Tim Otten [Thu, 4 May 2023 00:05:28 +0000 (17:05 -0700)]
Merge pull request #26150 from totten/master-562-dedupe

FiveSixtyTwo - Improve detection of identical configurations

2 years agoFiveSixtyTwo - When deciding to show messages, treat "CiviMail,CiviEvent" as equal...
Tim Otten [Wed, 3 May 2023 22:33:17 +0000 (15:33 -0700)]
FiveSixtyTwo - When deciding to show messages, treat "CiviMail,CiviEvent" as equal to "CiviEvent,CiviMail"

2 years agoMerge pull request #26147 from civicrm/5.61
demeritcowboy [Wed, 3 May 2023 19:59:28 +0000 (15:59 -0400)]
Merge pull request #26147 from civicrm/5.61

5.61

2 years agoMerge pull request #26141 from eileenmcnaughton/561_member
demeritcowboy [Wed, 3 May 2023 18:55:42 +0000 (14:55 -0400)]
Merge pull request #26141 from eileenmcnaughton/561_member

dev/core#4272 Fix unreleased regression on Membership form validation

2 years agoMerge pull request #26131 from eileenmcnaughton/report_notice2
Yashodha Chaku [Wed, 3 May 2023 05:27:41 +0000 (10:57 +0530)]
Merge pull request #26131 from eileenmcnaughton/report_notice2

Further notice fixes on Constituent report

2 years agodev/core#4272 Fix unreleased regression on Membership form validation
Eileen McNaughton [Wed, 3 May 2023 01:17:28 +0000 (13:17 +1200)]
dev/core#4272 Fix unreleased regression on Membership form validation

2 years agoMerge pull request #26121 from colemanw/removeConfigUses
Eileen McNaughton [Wed, 3 May 2023 00:27:24 +0000 (12:27 +1200)]
Merge pull request #26121 from colemanw/removeConfigUses

Use settings::get instead of $config object to retrieve enabled components

2 years agoMerge pull request #26125 from MegaphoneJon/configurable-import-batch
Eileen McNaughton [Tue, 2 May 2023 22:23:31 +0000 (10:23 +1200)]
Merge pull request #26125 from MegaphoneJon/configurable-import-batch

Importer - Add system-setting for batch size

2 years agoMerge pull request #26139 from totten/master-tpl-auto
demeritcowboy [Tue, 2 May 2023 21:27:50 +0000 (17:27 -0400)]
Merge pull request #26139 from totten/master-tpl-auto

dev/core#4262 - Drop auto_detect_line_endings from civicrm.settings.php.template

2 years agoMerge pull request #26090 from demeritcowboy/price-use
demeritcowboy [Tue, 2 May 2023 21:22:14 +0000 (17:22 -0400)]
Merge pull request #26090 from demeritcowboy/price-use

dev/core#4248 - Fix missing price-set usage table

2 years agoMerge pull request #26091 from demeritcowboy/file-on-case-revision
demeritcowboy [Tue, 2 May 2023 21:21:01 +0000 (17:21 -0400)]
Merge pull request #26091 from demeritcowboy/file-on-case-revision

dev/core#4220 - Don't make case activity revisions anymore when file-on-case

2 years agoMerge pull request #26138 from larssandergreen/expire-group-remove-notifications
demeritcowboy [Tue, 2 May 2023 21:20:38 +0000 (17:20 -0400)]
Merge pull request #26138 from larssandergreen/expire-group-remove-notifications

Expire notifications for adding and removing groups, tags and relationships

2 years agodev/core#4262 - Drop auto_detect_line_endings from civicrm.settings.php.template
Tim Otten [Tue, 2 May 2023 20:56:44 +0000 (13:56 -0700)]
dev/core#4262 - Drop auto_detect_line_endings from civicrm.settings.php.template

If the upgrader is telling you to remove it from `civicrm.settings.php`,
then...  we probably don't need it in `civicrm.settings.php.template`...

2 years agoMerge pull request #26136 from demeritcowboy/upgrade-autodetect
Tim Otten [Tue, 2 May 2023 20:51:54 +0000 (13:51 -0700)]
Merge pull request #26136 from demeritcowboy/upgrade-autodetect

dev/core#4262 - Upgrade message about obsolete civicrm.settings.php setting that generates php warnings

2 years agoLet non-critical notifications expire
larssandergreen [Tue, 2 May 2023 19:39:25 +0000 (13:39 -0600)]
Let non-critical notifications expire

2 years agoMerge pull request #26137 from yashodha/dev_2104
demeritcowboy [Tue, 2 May 2023 19:24:21 +0000 (15:24 -0400)]
Merge pull request #26137 from yashodha/dev_2104

Add target contact custom data to activity report

2 years agoMerge pull request #26135 from seamuslee001/instructions_i18n_support
demeritcowboy [Tue, 2 May 2023 17:30:02 +0000 (13:30 -0400)]
Merge pull request #26135 from seamuslee001/instructions_i18n_support

Surveys: Fix I18n translation support and WYSIWYG support

2 years agoAdd target contact custom data to activity report
yashodha [Tue, 2 May 2023 13:52:15 +0000 (19:22 +0530)]
Add target contact custom data to activity report

2 years agoMerge pull request #26124 from colemanw/afformNumbers
Mathieu Lu [Tue, 2 May 2023 13:29:26 +0000 (09:29 -0400)]
Merge pull request #26124 from colemanw/afformNumbers

dev/core#4115 Afform - Handle decimal number fields

2 years agoAdd instructions field into the skip fields array
Seamus Lee [Tue, 2 May 2023 01:49:17 +0000 (11:49 +1000)]
Add instructions field into the skip fields array

2 years agoMerge pull request #26132 from eileenmcnaughton/report_notice
Yashodha Chaku [Mon, 1 May 2023 17:16:05 +0000 (22:46 +0530)]
Merge pull request #26132 from eileenmcnaughton/report_notice

Contribution reports, specify type for is pledge payment

2 years agowarn about obsolete setting
demeritcowboy [Mon, 1 May 2023 15:47:14 +0000 (11:47 -0400)]
warn about obsolete setting

2 years agoMerge pull request #26134 from eileenmcnaughton/report_notice_group
Yashodha Chaku [Mon, 1 May 2023 07:39:47 +0000 (13:09 +0530)]
Merge pull request #26134 from eileenmcnaughton/report_notice_group

Remove notices on group_by i reports (eg pledge report)

2 years ago[REF] Add in I18n front end translation support and update widget to be a RichTextEdi...
Seamus Lee [Mon, 1 May 2023 07:11:50 +0000 (17:11 +1000)]
[REF] Add in I18n front end translation support and update widget to be a RichTextEditor for the translation given it is already a wysiyg in singlelingual mode

2 years agoRemove notices on group_by i reports (eg pledge report)
Eileen McNaughton [Mon, 1 May 2023 01:08:16 +0000 (13:08 +1200)]
Remove notices on group_by i reports (eg pledge report)

2 years agoEnsure printOnly is assigned
Eileen McNaughton [Mon, 1 May 2023 00:01:43 +0000 (12:01 +1200)]
Ensure printOnly is assigned

2 years agoReduce notices by checking if key exists
Eileen McNaughton [Sun, 30 Apr 2023 23:52:20 +0000 (11:52 +1200)]
Reduce notices by checking if key exists

2 years agoContribution reports, specify type for is pledge payment
Eileen McNaughton [Sun, 30 Apr 2023 23:49:23 +0000 (11:49 +1200)]
Contribution reports, specify type for is pledge payment

2 years agoMerge pull request #26130 from eileenmcnaughton/report_notice
Eileen McNaughton [Sun, 30 Apr 2023 23:42:08 +0000 (11:42 +1200)]
Merge pull request #26130 from eileenmcnaughton/report_notice

Fix notice on Constituent Summary report (strict smarty)

2 years agoEnsure no_display key exists
Eileen McNaughton [Sun, 30 Apr 2023 23:35:06 +0000 (11:35 +1200)]
Ensure no_display key exists

2 years agoAdd title for is_deleted
Eileen McNaughton [Sun, 30 Apr 2023 23:31:55 +0000 (11:31 +1200)]
Add title for is_deleted

2 years agoFurther notice fixes on Constituent report
Eileen McNaughton [Sun, 30 Apr 2023 23:28:04 +0000 (11:28 +1200)]
Further notice fixes on Constituent report

2 years agoFix notice on Constituent Summary report (strict smarty)
Eileen McNaughton [Sun, 30 Apr 2023 23:14:01 +0000 (11:14 +1200)]
Fix notice on Constituent Summary report (strict smarty)

2 years agoMerge pull request #26128 from demeritcowboy/membership-offline
Eileen McNaughton [Sun, 30 Apr 2023 22:33:43 +0000 (10:33 +1200)]
Merge pull request #26128 from demeritcowboy/membership-offline

Offline membership receipt - custom message text is wrong

2 years agoregen
demeritcowboy [Sun, 30 Apr 2023 16:24:28 +0000 (12:24 -0400)]
regen

2 years agothe else went missing
demeritcowboy [Sun, 30 Apr 2023 16:06:27 +0000 (12:06 -0400)]
the else went missing

2 years agoadd test
demeritcowboy [Sat, 29 Apr 2023 17:31:19 +0000 (13:31 -0400)]
add test

2 years agodon't make revisions anymore
demeritcowboy [Thu, 20 Apr 2023 17:58:53 +0000 (13:58 -0400)]
don't make revisions anymore

2 years agoMerge pull request #25930 from eileenmcnaughton/mem_receipt_offline
demeritcowboy [Sun, 30 Apr 2023 15:59:46 +0000 (11:59 -0400)]
Merge pull request #25930 from eileenmcnaughton/mem_receipt_offline

Update membership offline receipt to run off WorkflowTemplate & tokens

2 years agoMerge pull request #26126 from seamuslee001/upgrade_league_csv
Eileen McNaughton [Sat, 29 Apr 2023 23:54:17 +0000 (11:54 +1200)]
Merge pull request #26126 from seamuslee001/upgrade_league_csv

[REF] Update league/csv package to 9.7.4 to remove need for patching

2 years agoMerge pull request #26127 from alifrumin/rn5.61
Eileen McNaughton [Sat, 29 Apr 2023 23:53:47 +0000 (11:53 +1200)]
Merge pull request #26127 from alifrumin/rn5.61

[NFC] 5.61 release notes

2 years ago[NFC] 5.61 release notes
Alice Frumin [Fri, 28 Apr 2023 03:21:40 +0000 (23:21 -0400)]
[NFC] 5.61 release notes

2 years ago[REF] Update league/csv package to 9.7.4 to remove need for patching
Seamus Lee [Sat, 29 Apr 2023 03:54:45 +0000 (13:54 +1000)]
[REF] Update league/csv package to 9.7.4 to remove need for patching

2 years agoconfigurable import batch size
Jon Goldberg [Fri, 28 Apr 2023 20:27:07 +0000 (16:27 -0400)]
configurable import batch size

2 years agoAfform - Handle decimal number fields
Coleman Watts [Fri, 28 Apr 2023 19:20:41 +0000 (15:20 -0400)]
Afform - Handle decimal number fields

2 years agoMerge pull request #26122 from colemanw/geocodeMethod
demeritcowboy [Fri, 28 Apr 2023 17:41:04 +0000 (13:41 -0400)]
Merge pull request #26122 from colemanw/geocodeMethod

Remove unused broken $config->geocodeMethod

2 years agoRemove unused broken $config->geocodeMethod
Coleman Watts [Fri, 28 Apr 2023 14:52:57 +0000 (10:52 -0400)]
Remove unused broken $config->geocodeMethod

This deprecated item in the $config object couldn't possibly work because
the class and function it refers to don't exist!

2 years agoMerge pull request #25535 from mattwire/afformreqselect2
colemanw [Fri, 28 Apr 2023 16:29:29 +0000 (12:29 -0400)]
Merge pull request #25535 from mattwire/afformreqselect2

Afform: Add required flag to select2

2 years agoUse settings::get instead of $config object to retrieve enableComponents
Coleman Watts [Fri, 28 Apr 2023 14:18:56 +0000 (10:18 -0400)]
Use settings::get instead of $config object to retrieve enableComponents

2 years agoMerge pull request #26118 from colemanw/civiGrantUpgrade
Eileen McNaughton [Fri, 28 Apr 2023 06:00:44 +0000 (18:00 +1200)]
Merge pull request #26118 from colemanw/civiGrantUpgrade

CiviGrant - Fix upgrade to work on multiple domains

2 years agoMerge pull request #26119 from civicrm/5.61
Eileen McNaughton [Fri, 28 Apr 2023 03:18:44 +0000 (15:18 +1200)]
Merge pull request #26119 from civicrm/5.61

5.61

2 years agoCiviGrant - Fix upgrade to work on multiple domains
Coleman Watts [Fri, 28 Apr 2023 00:46:59 +0000 (20:46 -0400)]
CiviGrant - Fix upgrade to work on multiple domains

2 years agoMerge pull request #24765 from colemanw/priceSet
Eileen McNaughton [Thu, 27 Apr 2023 22:58:31 +0000 (10:58 +1200)]
Merge pull request #24765 from colemanw/priceSet

PriceSet - Fix metadata for extends column, for SearchKit compatibility

2 years agoFix : to be withing ts
Eileen McNaughton [Thu, 27 Apr 2023 22:53:58 +0000 (10:53 +1200)]
Fix : to be withing ts

2 years agoUpdate membership offline receipt away from form dependence
Eileen McNaughton [Mon, 27 Mar 2023 06:34:34 +0000 (19:34 +1300)]
Update membership offline receipt away from form dependence

2 years agoMerge pull request #26117 from agh1/5.61.0-releasenotes-initial
Eileen McNaughton [Thu, 27 Apr 2023 22:46:33 +0000 (10:46 +1200)]
Merge pull request #26117 from agh1/5.61.0-releasenotes-initial

5.61.0 release notes initial run

2 years ago5.61.0 release notes: added boilerplate
Andie Hunt [Thu, 27 Apr 2023 20:48:16 +0000 (16:48 -0400)]
5.61.0 release notes: added boilerplate

2 years ago5.61.0 release notes: raw from script
Andie Hunt [Thu, 27 Apr 2023 20:43:30 +0000 (16:43 -0400)]
5.61.0 release notes: raw from script

2 years agoMerge pull request #26115 from civicrm/5.61
demeritcowboy [Thu, 27 Apr 2023 14:06:24 +0000 (10:06 -0400)]
Merge pull request #26115 from civicrm/5.61

5.61

2 years agoMerge pull request #26015 from eileenmcnaughton/dedupe_employer
demeritcowboy [Thu, 27 Apr 2023 13:31:12 +0000 (09:31 -0400)]
Merge pull request #26015 from eileenmcnaughton/dedupe_employer

dev/core#4156 Fix employer not carrying over correctly in merge

2 years agoFix APIv3 test to better handle serialized fields
Coleman Watts [Sat, 8 Apr 2023 19:40:19 +0000 (15:40 -0400)]
Fix APIv3 test to better handle serialized fields

2 years agoEnsure value for PriceSet.extends is correctly serialized
Coleman Watts [Wed, 19 Oct 2022 14:18:51 +0000 (10:18 -0400)]
Ensure value for PriceSet.extends is correctly serialized

2 years agoPriceSet - Fix metadata for extends column, for SearchKit compatibility
Coleman Watts [Tue, 18 Oct 2022 00:57:21 +0000 (20:57 -0400)]
PriceSet - Fix metadata for extends column, for SearchKit compatibility

2 years agoMerge pull request #26109 from colemanw/ufJoinNotABridge
Yashodha Chaku [Thu, 27 Apr 2023 08:32:39 +0000 (14:02 +0530)]
Merge pull request #26109 from colemanw/ufJoinNotABridge

APIv4 - Remove incorrect EntityBridge from UFMatch entity

2 years agoMerge pull request #25920 from colemanw/customGroupPerms
Eileen McNaughton [Wed, 26 Apr 2023 22:44:35 +0000 (10:44 +1200)]
Merge pull request #25920 from colemanw/customGroupPerms

APIv4 - Enforce custom group permissions when loading metadata

2 years agoMerge pull request #24900 from larssandergreen/Don't-add-newlines-to-HTML-emails...
demeritcowboy [Wed, 26 Apr 2023 22:31:10 +0000 (18:31 -0400)]
Merge pull request #24900 from larssandergreen/Don't-add-newlines-to-HTML-emails-in-activities

Don't add newlines into HTML emails when viewing activities

2 years agoFix emails
larssandergreen [Wed, 26 Apr 2023 21:35:59 +0000 (15:35 -0600)]
Fix emails

2 years agoDave's tests
larssandergreen [Wed, 26 Apr 2023 20:33:15 +0000 (14:33 -0600)]
Dave's tests

2 years agoMerge remote-tracking branch 'upstream/master' into Don't-add-newlines-to-HTML-emails...
larssandergreen [Wed, 26 Apr 2023 20:32:53 +0000 (14:32 -0600)]
Merge remote-tracking branch 'upstream/master' into Don't-add-newlines-to-HTML-emails-in-activities

2 years agoDon't add newlines to html activities
larssandergreen [Wed, 26 Apr 2023 19:17:12 +0000 (13:17 -0600)]
Don't add newlines to html activities

2 years agoMerge pull request #26100 from Damilare1/master
Yashodha Chaku [Wed, 26 Apr 2023 05:25:00 +0000 (10:55 +0530)]
Merge pull request #26100 from Damilare1/master

Add regions to the Contribute Dashboard Page

2 years agoMerge pull request #26110 from lcdservices/dev-core-1821
Monish Deb [Wed, 26 Apr 2023 05:05:22 +0000 (10:35 +0530)]
Merge pull request #26110 from lcdservices/dev-core-1821

dev/core#1821 fix custom field option list radio clear link

2 years agodev/core#1821 fix custom field option list radio clear link
Brian Shaughnessy [Tue, 25 Apr 2023 16:57:37 +0000 (12:57 -0400)]
dev/core#1821 fix custom field option list radio clear link

2 years agoAPIv4 - Remove incorrect EntityBridge from UFMatch entity
Coleman Watts [Tue, 25 Apr 2023 15:13:07 +0000 (11:13 -0400)]
APIv4 - Remove incorrect EntityBridge from UFMatch entity

UFJoin cannot work as a bridge because it does not connect two CiviCRM entities with each other.
So the trait wasn't doing anything except getting in the way of SearchKit being able to perform joins.

2 years agoMerge pull request #26106 from reflexive-communications/crm-mailing-selector-browse...
colemanw [Tue, 25 Apr 2023 13:21:57 +0000 (09:21 -0400)]
Merge pull request #26106 from reflexive-communications/crm-mailing-selector-browse-undef-variable

CRM_Mailing_Selector_Browse: fix typo in local variable name

2 years agoMerge pull request #26107 from reflexive-communications/contributors-key-semseysandor...
demeritcowboy [Mon, 24 Apr 2023 23:09:44 +0000 (19:09 -0400)]
Merge pull request #26107 from reflexive-communications/contributors-key-semseysandor-change-org

Contributors: semseysandor - change of organization

2 years agosemseysandor: change of organization
Sandor Semsey [Mon, 24 Apr 2023 21:50:19 +0000 (23:50 +0200)]
semseysandor: change of organization

2 years agofix typo in local variable name
Sandor Semsey [Mon, 24 Apr 2023 20:55:32 +0000 (22:55 +0200)]
fix typo in local variable name

2 years agoMerge pull request #26096 from pradpnayak/subCUstomgroup
Yashodha Chaku [Mon, 24 Apr 2023 16:42:37 +0000 (22:12 +0530)]
Merge pull request #26096 from pradpnayak/subCUstomgroup

Include subtypes if passed to avoid 61 join limit for Mysql on Custom group

2 years agofix missing usage table
demeritcowboy [Thu, 20 Apr 2023 14:24:59 +0000 (10:24 -0400)]
fix missing usage table

2 years agoMerge pull request #26097 from colemanw/imageUrlLabel
Yashodha Chaku [Mon, 24 Apr 2023 05:52:53 +0000 (11:22 +0530)]
Merge pull request #26097 from colemanw/imageUrlLabel

Add user-friendly label to contact.image_URL field

2 years agoMerge pull request #26105 from larssandergreen/add-labels-from-schema-to-selects...
Seamus Lee [Sun, 23 Apr 2023 22:18:08 +0000 (08:18 +1000)]
Merge pull request #26105 from larssandergreen/add-labels-from-schema-to-selects-on-quickforms

Use label from schema instead of title for selects on QuickForms

2 years agouse labels from schema for selects
larssandergreen [Sun, 23 Apr 2023 19:34:22 +0000 (13:34 -0600)]
use labels from schema for selects

2 years agoMerge pull request #26104 from larssandergreen/Participant-labels-cleanup
Matthew Wire [Sun, 23 Apr 2023 19:19:45 +0000 (20:19 +0100)]
Merge pull request #26104 from larssandergreen/Participant-labels-cleanup

Remove "and Time" from registration date label on view Participant

2 years agoremove time from date label for participant view
larssandergreen [Sun, 23 Apr 2023 18:22:08 +0000 (12:22 -0600)]
remove time from date label for participant view

2 years agoMerge pull request #26102 from pradpnayak/codeCleanUp
Seamus Lee [Sun, 23 Apr 2023 00:24:48 +0000 (10:24 +1000)]
Merge pull request #26102 from pradpnayak/codeCleanUp

Code cleanup

2 years agoCode cleanup
Pradeep Nayak [Sat, 22 Apr 2023 18:24:48 +0000 (19:24 +0100)]
Code cleanup

2 years agoMerge pull request #25403 from larssandergreen/do-not-send-on-hold-emails-for-contrib...
demeritcowboy [Sat, 22 Apr 2023 16:35:39 +0000 (12:35 -0400)]
Merge pull request #25403 from larssandergreen/do-not-send-on-hold-emails-for-contribution-receipts-contact-from-select2

Don't show email receipt option for on hold emails when adding contribution and selecting contact

2 years agoChange API call to join
larssandergreen [Sat, 22 Apr 2023 16:00:10 +0000 (10:00 -0600)]
Change API call to join

2 years agoMerge pull request #26101 from pradpnayak/codeCleanUp
demeritcowboy [Sat, 22 Apr 2023 15:08:26 +0000 (11:08 -0400)]
Merge pull request #26101 from pradpnayak/codeCleanUp

Referening not needed

2 years agoReferening not needed
Pradeep Nayak [Sat, 22 Apr 2023 12:31:31 +0000 (13:31 +0100)]
Referening not needed

2 years agoAdd regions to the Contribute Dashboard Page
Damilare Adedoyin [Sat, 22 Apr 2023 09:41:39 +0000 (10:41 +0100)]
Add regions to the Contribute Dashboard Page

2 years agoMerge pull request #26055 from colemanw/mappingIndex
colemanw [Sat, 22 Apr 2023 01:08:39 +0000 (21:08 -0400)]
Merge pull request #26055 from colemanw/mappingIndex

Make civicrm_mapping.name required and fix index to be unique

2 years agoMerge pull request #26099 from seamuslee001/5.61
Seamus Lee [Sat, 22 Apr 2023 00:56:51 +0000 (10:56 +1000)]
Merge pull request #26099 from seamuslee001/5.61

dev/core#4249 Ensure that no deprecation logging occurs from groupPer…

2 years agodo not send emails to on hold or do not email contacts
larssandergreen [Sat, 22 Apr 2023 00:12:09 +0000 (18:12 -0600)]
do not send emails to on hold or do not email contacts

2 years agoMerge pull request #26098 from MegaphoneJon/blank-pc-create
colemanw [Sat, 22 Apr 2023 00:06:49 +0000 (20:06 -0400)]
Merge pull request #26098 from MegaphoneJon/blank-pc-create

empty pseudoconstant string on create causes an error

2 years agodev/core#4249 Ensure that no deprecation logging occurs from groupPermission having...
Seamus Lee [Thu, 20 Apr 2023 03:26:15 +0000 (13:26 +1000)]
dev/core#4249 Ensure that no deprecation logging occurs from groupPermission having includeGroups as NULL rather than an empty array

2 years agoMake civicrm_mapping.name required and fix index to be unique
Coleman Watts [Wed, 12 Apr 2023 02:14:36 +0000 (22:14 -0400)]
Make civicrm_mapping.name required and fix index to be unique

2 years agoMerge pull request #26094 from mattwire/paymentagreementtext
Seamus Lee [Fri, 21 Apr 2023 21:28:30 +0000 (07:28 +1000)]
Merge pull request #26094 from mattwire/paymentagreementtext

Fix missing change from #25918

2 years agoempty pseudoconstant string on create causes an error
Jon Goldberg [Fri, 21 Apr 2023 21:23:29 +0000 (17:23 -0400)]
empty pseudoconstant string on create causes an error