civicrm-core.git
18 months agoRegnerate civicrm generated and membership xml
Seamus Lee [Mon, 8 May 2023 06:45:11 +0000 (16:45 +1000)]
Regnerate civicrm generated and membership xml

18 months agoMerge pull request #25987 from agileware/CIVICRM-2119
Eileen McNaughton [Mon, 8 May 2023 05:15:18 +0000 (17:15 +1200)]
Merge pull request #25987 from agileware/CIVICRM-2119

😵 Disambiguate "Source" field by showing the context of the source, ie. Membership, Participant, Contribution, Contact etc.

18 months agoMerge pull request #26044 from totten/jwt_generation_alt
Seamus Lee [Mon, 8 May 2023 03:10:06 +0000 (13:10 +1000)]
Merge pull request #26044 from totten/jwt_generation_alt

Authx - Add APIv4 support for creating and validating credentials

18 months agoMerge pull request #26165 from larssandergreen/php-warning-for-add-to-group
demeritcowboy [Sun, 7 May 2023 22:49:11 +0000 (18:49 -0400)]
Merge pull request #26165 from larssandergreen/php-warning-for-add-to-group

Fix PHP8 warnings for AddToGroup

18 months agofix php8 warnings for AddToGroup
larssandergreen [Sun, 7 May 2023 03:19:51 +0000 (21:19 -0600)]
fix php8 warnings for AddToGroup

18 months agoMerge pull request #26116 from larssandergreen/refund-form-improvements
demeritcowboy [Sat, 6 May 2023 23:09:10 +0000 (19:09 -0400)]
Merge pull request #26116 from larssandergreen/refund-form-improvements

Add default payment method for additional payment or refund

18 months agoMerge pull request #26129 from colemanw/api4JoinFix
Tim Otten [Sat, 6 May 2023 01:28:27 +0000 (18:28 -0700)]
Merge pull request #26129 from colemanw/api4JoinFix

APIv4 - Simplify bridge joins

18 months agoMerge pull request #26162 from civicrm/5.62
demeritcowboy [Fri, 5 May 2023 22:23:10 +0000 (18:23 -0400)]
Merge pull request #26162 from civicrm/5.62

5.62

18 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

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

18 months agoMerge pull request #26157 from eileenmcnaughton/test_fix
Tim Otten [Fri, 5 May 2023 19:55:41 +0000 (12:55 -0700)]
Merge pull request #26157 from eileenmcnaughton/test_fix

mixin/scan-classes - Don't scan extension-tests automatically

18 months agoscan-classes - Only scan live code. Skip test folder (which can interfere with phpuni...
Eileen McNaughton [Thu, 4 May 2023 02:00:36 +0000 (14:00 +1200)]
scan-classes - Only scan live code. Skip test folder (which can interfere with phpunit runner).

18 months agoMerge pull request #26103 from larssandergreen/don't-show-admin-only-price-fields...
demeritcowboy [Fri, 5 May 2023 15:50:48 +0000 (11:50 -0400)]
Merge pull request #26103 from larssandergreen/don't-show-admin-only-price-fields-on-event-preview

dev/core#4103 Don't show admin only price fields on Registration or Contribution page previews

18 months agoMerge pull request #26158 from MegaphoneJon/fill-fix-2
Eileen McNaughton [Thu, 4 May 2023 22:09:28 +0000 (10:09 +1200)]
Merge pull request #26158 from MegaphoneJon/fill-fix-2

fixes #4278 - Import fill on email/phone respects location type

18 months agoMerge pull request #26133 from eileenmcnaughton/report_stat
Seamus Lee [Thu, 4 May 2023 22:00:09 +0000 (08:00 +1000)]
Merge pull request #26133 from eileenmcnaughton/report_stat

Use purify rather than escape to preserve currency

18 months agoImport fill on email/phone respects location type
Jon Goldberg [Thu, 4 May 2023 20:10:31 +0000 (16:10 -0400)]
Import fill on email/phone respects location type

18 months agoSet version to 5.63.alpha1
CiviCRM [Thu, 4 May 2023 03:57:46 +0000 (03:57 +0000)]
Set version to 5.63.alpha1

18 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

18 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…

18 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

18 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

18 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

18 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

18 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

18 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

18 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

18 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

18 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

18 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"

18 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

18 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

18 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

18 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

18 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

18 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

18 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

18 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

18 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

18 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

18 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

18 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

18 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

18 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

18 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

18 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`...

18 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

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

18 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

18 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

18 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

18 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

18 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

18 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

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

19 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)

19 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

19 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)

19 months agoUse purify rather than escape to preserve currency
Eileen McNaughton [Mon, 1 May 2023 00:18:10 +0000 (12:18 +1200)]
Use purify rather than escape to preserve currency

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

19 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

19 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

19 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)

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

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

19 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

19 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)

19 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

19 months agoAPIv4 - Simplify bridge joins
Coleman Watts [Sun, 30 Apr 2023 22:06:32 +0000 (18:06 -0400)]
APIv4 - Simplify bridge joins

This simplifies the code and improves efficiency by using an inner sub-join
instead of a subquery. The latter was trying to fake it, but this is the real
thing: joining on two tables as if they were a single table.

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

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

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

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

19 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

19 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

19 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

19 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

19 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

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

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

19 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

19 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!

19 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

19 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

19 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

19 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

19 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

19 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

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

19 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

19 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

19 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

19 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

19 months agoSet default payment method for addt payment or refund
larssandergreen [Thu, 27 Apr 2023 16:37:41 +0000 (10:37 -0600)]
Set default payment method for addt payment or refund

19 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

19 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

19 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

19 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

19 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

19 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

19 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