civicrm-core.git
21 months agoMerge pull request #26239 from totten/5.62-uninstall
Seamus Lee [Wed, 17 May 2023 01:01:26 +0000 (11:01 +1000)]
Merge pull request #26239 from totten/5.62-uninstall

setup - Fix uninstall on MySQL 8.0

21 months agosetup - Fix uninstall on MySQL 8.0
Tim Otten [Tue, 16 May 2023 23:56:18 +0000 (16:56 -0700)]
setup - Fix uninstall on MySQL 8.0

Overview
--------

Fix a bug with uninstalling or reinstalling via cv (`cv core:uninstall` or `cv core:install -f`) on MySQL 8.0.

Before
------

On MySQL 8.0, it fails - because all table-names appear as null.

It's looking for a result column named `table_name` but actually receives `TABLE_NAME`.

After
-----

Doesn't matter if the column is called `table_name` or `TABLE_NAME`.

21 months agoMerge pull request #26172 from eileenmcnaughton/562_import
Yashodha Chaku [Fri, 12 May 2023 12:22:35 +0000 (17:52 +0530)]
Merge pull request #26172 from eileenmcnaughton/562_import

dev/core#4227 Fix import to not blank birth_date etc on update

21 months agoMerge pull request #26199 from pradpnayak/fatalerror
demeritcowboy [Thu, 11 May 2023 18:11:29 +0000 (14:11 -0400)]
Merge pull request #26199 from pradpnayak/fatalerror

Regression: Fatal error when importing membership

21 months agoFixed fatal error when importing membership
Pradeep Nayak [Thu, 11 May 2023 17:22:58 +0000 (18:22 +0100)]
Fixed fatal error when importing membership

21 months agoMerge pull request #26170 from eileenmcnaughton/562_member
Tim Otten [Mon, 8 May 2023 20:29:31 +0000 (13:29 -0700)]
Merge pull request #26170 from eileenmcnaughton/562_member

Fix regression whereby membership does not submit

21 months agoCiviDiscount fix - pass correct component
Eileen McNaughton [Mon, 8 May 2023 08:03:50 +0000 (20:03 +1200)]
CiviDiscount fix - pass correct component

21 months agodev/core#4227 Fix import to not blank birth_date etc on update
Eileen McNaughton [Mon, 8 May 2023 05:37:57 +0000 (17:37 +1200)]
dev/core#4227 Fix import to not blank birth_date etc on update

21 months agoRe-instate the renewal message
Eileen McNaughton [Mon, 8 May 2023 04:27:08 +0000 (16:27 +1200)]
Re-instate the renewal message

21 months agoFix regression whereby membership does not submit
Eileen McNaughton [Mon, 8 May 2023 03:45:13 +0000 (15:45 +1200)]
Fix regression whereby membership does not submit

21 months agoMerge pull request #26159 from demeritcowboy/drupal-cache
demeritcowboy [Fri, 5 May 2023 21:10:51 +0000 (17:10 -0400)]
Merge pull request #26159 from demeritcowboy/drupal-cache

Upgrade message for drupal9 sites to advise to clear drupal cache

21 months agoupgrade message
demeritcowboy [Fri, 5 May 2023 20:15:48 +0000 (16:15 -0400)]
upgrade message

21 months agoSet version to 5.62.beta1
CiviCRM [Thu, 4 May 2023 03:57:33 +0000 (03:57 +0000)]
Set version to 5.62.beta1

21 months agoMerge pull request #26144 from yashodha/core_2855
Seamus Lee [Thu, 4 May 2023 01:59:28 +0000 (11:59 +1000)]
Merge pull request #26144 from yashodha/core_2855

(dev/core#2855) Preserve pristine ids' for further manipulation via h…

21 months agoMerge pull request #26156 from civicrm/5.61
Seamus Lee [Thu, 4 May 2023 01:55:37 +0000 (11:55 +1000)]
Merge pull request #26156 from civicrm/5.61

5.61

21 months agoMerge pull request #26155 from seamuslee001/5.61
Seamus Lee [Thu, 4 May 2023 01:36:56 +0000 (11:36 +1000)]
Merge pull request #26155 from seamuslee001/5.61

Bump engine.io and socket.io versions

21 months agoMerge pull request #26153 from totten/5.61-rn0
Tim Otten [Thu, 4 May 2023 01:27:23 +0000 (18:27 -0700)]
Merge pull request #26153 from totten/5.61-rn0

release-notes/5.61.0.md - Last minute additions

21 months agoMerge pull request #26108 from eileenmcnaughton/import_template
Seamus Lee [Thu, 4 May 2023 01:26:46 +0000 (11:26 +1000)]
Merge pull request #26108 from eileenmcnaughton/import_template

Importer - Ensure mapping ID is set in all places using import templates

21 months agoBump engine.io and socket.io versions
Seamus Lee [Thu, 4 May 2023 01:20:09 +0000 (11:20 +1000)]
Bump engine.io and socket.io versions

21 months agorelease-notes/5.61.0.md - Last minute additions
Tim Otten [Thu, 4 May 2023 00:42:57 +0000 (17:42 -0700)]
release-notes/5.61.0.md - Last minute additions

21 months agoMerge pull request #26152 from civicrm/5.61
Seamus Lee [Thu, 4 May 2023 00:12:22 +0000 (10:12 +1000)]
Merge pull request #26152 from civicrm/5.61

5.61

21 months 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

21 months agoMerge pull request #26140 from eileenmcnaughton/561
Seamus Lee [Wed, 3 May 2023 23:27:21 +0000 (09:27 +1000)]
Merge pull request #26140 from eileenmcnaughton/561

dev/core#4225 Add test & fix for new regression - contact update fails when relationship exists & CiviMember disabled

21 months 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"

21 months agoMerge pull request #26146 from MegaphoneJon/import-fill-fix
Eileen McNaughton [Wed, 3 May 2023 22:20:17 +0000 (10:20 +1200)]
Merge pull request #26146 from MegaphoneJon/import-fill-fix

fixes core#4269 - Import "fill" doesn't fill phone/email

21 months 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

21 months 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

21 months agoFixes core#4269 - import 'fill' doesn't work on phone/email
Jon Goldberg [Wed, 3 May 2023 18:09:53 +0000 (14:09 -0400)]
Fixes core#4269 - import 'fill' doesn't work on phone/email

21 months ago(dev/core#2855) Preserve pristine ids' for further manipulation via hooks for reports
yashodha [Wed, 3 May 2023 06:10:11 +0000 (11:40 +0530)]
(dev/core#2855) Preserve pristine ids' for further manipulation via hooks for reports

21 months 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

21 months 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

21 months agoAdd Civi-Member is enabled check
Eileen McNaughton [Wed, 3 May 2023 00:39:14 +0000 (12:39 +1200)]
Add Civi-Member is enabled check

21 months agodev/core#4225 Add test for new regression
Eileen McNaughton [Wed, 3 May 2023 00:31:33 +0000 (12:31 +1200)]
dev/core#4225 Add test for new regression

21 months 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

21 months 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

21 months 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

21 months 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

21 months 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

21 months 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

21 months 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`...

21 months 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

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

21 months 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

21 months 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

21 months 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

21 months 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

21 months 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

21 months 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

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

21 months 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)

21 months 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

21 months 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)

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

21 months 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

21 months 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

21 months 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)

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

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

21 months 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

21 months 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)

21 months 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

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

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

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

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

21 months 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

21 months 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

21 months 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

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

22 months 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

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

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

22 months 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

22 months 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!

22 months 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

22 months 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

22 months 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

22 months 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

22 months 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

22 months 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

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

22 months 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

22 months 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

22 months 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

22 months 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

22 months 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

22 months 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

22 months 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

22 months 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

22 months 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

22 months 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

22 months 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

22 months 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

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

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

22 months 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

22 months 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

22 months 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

22 months 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

22 months 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