civicrm-core.git
16 months agoCorrected TeX ligatures for pdf letters
Ruben Rodriguez [Mon, 13 Nov 2017 22:53:57 +0000 (17:53 -0500)]
Corrected TeX ligatures for pdf letters

16 months agoFilter groups according to included profiles
Andrew Engelbrecht [Mon, 25 Sep 2017 22:34:51 +0000 (18:34 -0400)]
Filter groups according to included profiles

This is a continuation of the contact groups filtering feature, which
allows admins to filter the public listings of contact groups on various
Civi pages by setting a Drupal variable with drush.

It is now possible to set a rule for a profile and for that rule to
automatically apply to standalone profile pages, contribution pages that
include the profile, and event pages that include it as well.

See comments in CRM/Contact/Form/Edit/TagsAndGroups.php for instructions
on how to set the variable via drush.

16 months agoAllow admin to change the names of filtered groups
Andrew Engelbrecht [Mon, 18 Sep 2017 22:19:40 +0000 (18:19 -0400)]
Allow admin to change the names of filtered groups

This feature lets one mimic a custom field by allowing admins to change
the text that appears next to each group's check box, via drush.

The json format is a bit more nested, but indented json can be used. An
exmple is included in CRM/Contact/Form/Edit/TagsAndGroups.php.

16 months agoGroups filter hack for smaller groups listings
Andrew Engelbrecht [Fri, 15 Sep 2017 20:15:10 +0000 (16:15 -0400)]
Groups filter hack for smaller groups listings

This change is a dirty hack that lets site admins filter the "Contacts
Group(s)" field output in select profiles. This reduces overwhem for
users when they are making a donation or filling out a form with the
Groups signup field. This is preferable to using a custom field with
smart groups because the Groups field provides double opt-in, while
custom fields do not.

The filter is controlled via a json string stored in a drupal variable
that can be set with drush like so:

drush vset --format=string groups_field_filters "{...}"

See the documentation marked with "sudoman hack" in
CRM/Contact/Form/Edit/TagsAndGroups.php for an example.

16 months agoremove unneeded file not deleted in git rebase
Andrew Engelbrecht [Wed, 19 Jul 2017 21:28:47 +0000 (17:28 -0400)]
remove unneeded file not deleted in git rebase

16 months agoremove unneeded file (latex.patch)
Andrew Engelbrecht [Wed, 19 Jul 2017 20:31:29 +0000 (16:31 -0400)]
remove unneeded file (latex.patch)

this was apparently not removed in the git rebase.

16 months agoComment cleanup
Ruben Rodriguez [Thu, 1 Dec 2016 21:59:27 +0000 (16:59 -0500)]
Comment cleanup

16 months agoUpdated the LaTeX header for letters
Ruben Rodriguez [Thu, 1 Dec 2016 21:28:53 +0000 (16:28 -0500)]
Updated the LaTeX header for letters

16 months agoAdded hack for scaping curly brackets on smarty LaTeX templates
Ruben Rodriguez [Fri, 10 Jun 2016 19:06:07 +0000 (15:06 -0400)]
Added hack for scaping curly brackets on smarty LaTeX templates

16 months agoTuned up PdfLatex font settings
Ruben Rodriguez [Fri, 10 Jun 2016 19:05:21 +0000 (15:05 -0400)]
Tuned up PdfLatex font settings

16 months agoredisabling mail tracking
k [Tue, 15 Mar 2016 17:41:14 +0000 (13:41 -0400)]
redisabling mail tracking

16 months agoSolving RT ticket #1092988
k [Tue, 15 Mar 2016 17:13:26 +0000 (13:13 -0400)]
Solving RT ticket #1092988
adding civicrm ID to contributin record

16 months agoipn receiver for external api
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:33:03 +0000 (13:33 -0400)]
ipn receiver for external api

16 months agoPriceset 2nd half
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:28:53 +0000 (13:28 -0400)]
Priceset 2nd half

16 months agoPriceset/debugwatchdog
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:28:43 +0000 (13:28 -0400)]
Priceset/debugwatchdog

16 months agoRemoved cache rebuild from the GroupContact
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:18:43 +0000 (13:18 -0400)]
Removed cache rebuild from the GroupContact

16 months agoRT#765026, patch for null values in civicrm_acl_cache
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:15:03 +0000 (13:15 -0400)]
RT#765026, patch for null values in civicrm_acl_cache

16 months agoAdded the current uncommited changes to production code, and rebased to 4.6.8
Ruben Rodriguez [Thu, 10 Sep 2015 22:24:23 +0000 (18:24 -0400)]
Added the current uncommited changes to production code, and rebased to 4.6.8

16 months agoAdditional files for PDF/Latex
Lisa Marie Maginnis [Thu, 1 May 2014 21:29:27 +0000 (17:29 -0400)]
Additional files for PDF/Latex

16 months agoOur changes
Lisa Marie Maginnis [Thu, 1 May 2014 21:04:18 +0000 (17:04 -0400)]
Our changes

16 months agoMerge pull request #26769 from totten/5.63-doc1
Tim Otten [Fri, 7 Jul 2023 18:55:56 +0000 (11:55 -0700)]
Merge pull request #26769 from totten/5.63-doc1

5.63.1 - Add release-notes

16 months agoAdd release-notes/5.63.1.md
Tim Otten [Fri, 7 Jul 2023 18:45:16 +0000 (11:45 -0700)]
Add release-notes/5.63.1.md

16 months agoMerge pull request #26761 from seamuslee001/payment_processor_upgrade_563
Tim Otten [Fri, 7 Jul 2023 18:23:26 +0000 (11:23 -0700)]
Merge pull request #26761 from seamuslee001/payment_processor_upgrade_563

dev/core#4418 Add in Upgrade Script for point release to fix bad data…

16 months agoSet version to 5.63.1
Tim Otten [Fri, 7 Jul 2023 17:53:29 +0000 (10:53 -0700)]
Set version to 5.63.1

16 months agoMerge pull request #26764 from demeritcowboy/index-10-more
demeritcowboy [Fri, 7 Jul 2023 14:03:11 +0000 (10:03 -0400)]
Merge pull request #26764 from demeritcowboy/index-10-more

backport 26763

16 months agobackport 26763
demeritcowboy [Fri, 7 Jul 2023 12:47:16 +0000 (08:47 -0400)]
backport 26763

16 months agoShift to using executeQuery rather than API to perform upgrade
Seamus Lee [Fri, 7 Jul 2023 01:27:37 +0000 (11:27 +1000)]
Shift to using executeQuery rather than API to perform upgrade

16 months agoMerge pull request #26762 from seamuslee001/dev_core_4418
Seamus Lee [Fri, 7 Jul 2023 01:16:16 +0000 (21:16 -0400)]
Merge pull request #26762 from seamuslee001/dev_core_4418

dev/core#4418 Fix Payment Processor accepted_credit_cards regression (backport to 5.63)

16 months agoMerge pull request #26759 from demeritcowboy/index-10-563
Seamus Lee [Fri, 7 Jul 2023 00:30:09 +0000 (20:30 -0400)]
Merge pull request #26759 from demeritcowboy/index-10-563

backport of 26757

16 months agoFix Upgrade Step as per feedback from Dave on RC PR
Seamus Lee [Fri, 7 Jul 2023 00:23:59 +0000 (10:23 +1000)]
Fix Upgrade Step as per feedback from Dave on RC PR

16 months agoFix Payment Processor accepted_credit_cards regression
larssandergreen [Thu, 6 Jul 2023 21:54:55 +0000 (15:54 -0600)]
Fix Payment Processor accepted_credit_cards regression

16 months agodev/core#4418 Add in Upgrade Script for point release to fix bad data in accepted_cre...
Seamus Lee [Thu, 6 Jul 2023 23:40:10 +0000 (09:40 +1000)]
dev/core#4418 Add in Upgrade Script for point release to fix bad data in accepted_credit_cards

16 months agobackport of 26757
demeritcowboy [Thu, 6 Jul 2023 23:11:55 +0000 (19:11 -0400)]
backport of 26757

16 months agoMerge pull request #26756 from totten/5.63-comp-perm
Eileen McNaughton [Thu, 6 Jul 2023 22:25:08 +0000 (10:25 +1200)]
Merge pull request #26756 from totten/5.63-comp-perm

(dev/core#4413) Don't remove core component permissions when disabled

16 months agoDon't remove core component permissions when disabled
larssandergreen [Wed, 5 Jul 2023 23:52:40 +0000 (17:52 -0600)]
Don't remove core component permissions when disabled

16 months agoMerge pull request #26747 from agileware/CIVICRM-2150
demeritcowboy [Thu, 6 Jul 2023 18:29:35 +0000 (14:29 -0400)]
Merge pull request #26747 from agileware/CIVICRM-2150

🌶️ dev/core/-/issues/4416 CiviCRM 5.63.0 - Regression, Mailing click tracking now returns: Error 500 malformed header from script 'url.php': Bad header for all tracked URLs

16 months agoCIVICRM-2150 CiviCRM 5.63.0 regression, Mailing click tracking now returns: Error...
Justin Freeman [Thu, 6 Jul 2023 07:08:56 +0000 (17:08 +1000)]
CIVICRM-2150 CiviCRM 5.63.0 regression, Mailing click tracking now returns: Error 500 malformed header from script 'url.php': Bad header for all tracked URLs

16 months agoSet version to 5.63.0
Tim Otten [Wed, 5 Jul 2023 23:36:45 +0000 (16:36 -0700)]
Set version to 5.63.0

16 months agoMerge pull request #26743 from totten/5.63-comp-uninstall
colemanw [Wed, 5 Jul 2023 20:41:10 +0000 (13:41 -0700)]
Merge pull request #26743 from totten/5.63-comp-uninstall

(dev/core#4391) Prohibit uninstallation of core components

16 months ago(dev/core#4391) Prohibit uninstallation of core components
Tim Otten [Wed, 5 Jul 2023 19:42:47 +0000 (12:42 -0700)]
(dev/core#4391) Prohibit uninstallation of core components

16 months agoext/civi_*/info.xml - Tag as "component"
Tim Otten [Wed, 5 Jul 2023 19:51:11 +0000 (12:51 -0700)]
ext/civi_*/info.xml - Tag as "component"

16 months agoMerge pull request #26735 from eileenmcnaughton/merge_perms
demeritcowboy [Wed, 5 Jul 2023 03:57:08 +0000 (23:57 -0400)]
Merge pull request #26735 from eileenmcnaughton/merge_perms

Fix recent regression - Use consistent value for checkPermissions in merger

16 months agoUse consistent value for checkPermissions in merger
Eileen McNaughton [Wed, 5 Jul 2023 01:10:35 +0000 (13:10 +1200)]
Use consistent value for checkPermissions in merger

We recently added a permission check when retrieving metadata here
https://github.com/civicrm/civicrm-core/commit/0e88731ff38f4bcf5a4d53c7e2ced01f70533ff1#diff-fe60c89ebe94bbd40114d135459371cc53708db1f2952ade6c0ce9b3468c4dabR2306

However, when that function is called from getFieldValueAndLabel that is not being passed
and is defaulting to TRUE. This is causing issues in a cron context where
checkPermissions is being used (well actually in a unit test in our custom code
simulating that possiblility)

17 months agoMerge pull request #26695 from alifrumin/rn5.63
Seamus Lee [Mon, 3 Jul 2023 03:01:34 +0000 (23:01 -0400)]
Merge pull request #26695 from alifrumin/rn5.63

[NFC] First pass at 5.63 release notes

17 months ago[NFC] 5.63 release notes
Alice Frumin [Mon, 26 Jun 2023 17:29:44 +0000 (13:29 -0400)]
[NFC] 5.63 release notes

17 months agoMerge pull request #26665 from eileenmcnaughton/import
demeritcowboy [Mon, 26 Jun 2023 14:00:41 +0000 (10:00 -0400)]
Merge pull request #26665 from eileenmcnaughton/import

dev/core#4317 Fix import issue when civicrm_custom_group.name ends in `_`

17 months agoMerge pull request #26666 from totten/5.63-datadist
demeritcowboy [Mon, 26 Jun 2023 13:29:45 +0000 (09:29 -0400)]
Merge pull request #26666 from totten/5.63-datadist

dev/core#4392 - Distribute `sql/civicrm_data/` with tarball

17 months agodev/core#4317 Fix import issue when civicrm_custom_group.name ends in _
Eileen McNaughton [Mon, 26 Jun 2023 06:57:21 +0000 (23:57 -0700)]
dev/core#4317 Fix import issue when civicrm_custom_group.name ends in _

17 months agodev/core#4392 - Distribute civicrm_data files
Tim Otten [Mon, 26 Jun 2023 06:42:18 +0000 (23:42 -0700)]
dev/core#4392 - Distribute civicrm_data files

17 months agoMerge pull request #26596 from demeritcowboy/syncmatch
Eileen McNaughton [Sat, 24 Jun 2023 05:32:39 +0000 (22:32 -0700)]
Merge pull request #26596 from demeritcowboy/syncmatch

dev/drupal#186 - UFMatch crash on drupal 9 - minimal RC fix to do like before 5.59 passing on contact_id

17 months agoMerge pull request #26628 from agh1/5.63.0-releasenotes-initial
Seamus Lee [Fri, 23 Jun 2023 21:52:34 +0000 (14:52 -0700)]
Merge pull request #26628 from agh1/5.63.0-releasenotes-initial

5.63.0 release notes initial run

17 months ago5.63.0 release notes: added boilerplate
Andie Hunt [Fri, 23 Jun 2023 21:09:51 +0000 (17:09 -0400)]
5.63.0 release notes: added boilerplate

17 months ago5.63.0 release notes: raw from script
Andie Hunt [Fri, 23 Jun 2023 21:06:07 +0000 (17:06 -0400)]
5.63.0 release notes: raw from script

17 months agoput back like 5.58 passing on contact_id
demeritcowboy [Thu, 22 Jun 2023 00:48:32 +0000 (20:48 -0400)]
put back like 5.58 passing on contact_id

17 months agoMerge pull request #26569 from eileenmcnaughton/event_preview
Seamus Lee [Mon, 19 Jun 2023 03:17:53 +0000 (13:17 +1000)]
Merge pull request #26569 from eileenmcnaughton/event_preview

Fix broken event message template preview

17 months agoFix broken event message template preview
Eileen McNaughton [Mon, 19 Jun 2023 00:57:23 +0000 (12:57 +1200)]
Fix broken event message template preview

This is outside most live use cases but it currently fails on an api
error due to a mismatch between example data & expectations. It should be fixed in
the rc but it might not make sense to back port (or determine breakage further back)

17 months agoMerge pull request #26538 from eileenmcnaughton/member_fix_rc
Tim Otten [Fri, 16 Jun 2023 22:00:01 +0000 (15:00 -0700)]
Merge pull request #26538 from eileenmcnaughton/member_fix_rc

Fix for membership discounts not showing in 5.62

17 months agoMerge pull request #26541 from eileenmcnaughton/mem563
colemanw [Fri, 16 Jun 2023 03:24:48 +0000 (23:24 -0400)]
Merge pull request #26541 from eileenmcnaughton/mem563

don't show membership block on confirmation page if no membership exists

17 months agodon't show membership block on confirmation page if no membership exists
Jon Goldberg [Wed, 14 Jun 2023 15:03:17 +0000 (11:03 -0400)]
don't show membership block on confirmation page if no membership exists

17 months agoFix for membership discounts not showing in 5.62
Eileen McNaughton [Fri, 16 Jun 2023 01:05:36 +0000 (13:05 +1200)]
Fix for membership discounts not showing in 5.62

17 months agoMerge pull request #26513 from colemanw/fixGrantAccess
colemanw [Mon, 12 Jun 2023 17:44:22 +0000 (13:44 -0400)]
Merge pull request #26513 from colemanw/fixGrantAccess

CiviGrant - Fix error when creating grant without permissions

17 months agoCiviGrant - Fix error when creating grant without permissions
colemanw [Mon, 12 Jun 2023 16:21:55 +0000 (12:21 -0400)]
CiviGrant - Fix error when creating grant without permissions

When creating a grant with checkPermissions disabled (e.g. via API) the permissions
were getting tripped by the RecentItem create action

17 months agoMerge pull request #26499 from totten/5.63-init-ext
colemanw [Fri, 9 Jun 2023 23:52:35 +0000 (19:52 -0400)]
Merge pull request #26499 from totten/5.63-init-ext

Component-Extensions - Ensure the initial activation list matches

17 months agoRegenerate `civicrm_generated.mysql`
Tim Otten [Fri, 9 Jun 2023 21:47:55 +0000 (14:47 -0700)]
Regenerate `civicrm_generated.mysql`

17 months agoregen.sh - Preserve the default component-extensions
Tim Otten [Fri, 9 Jun 2023 21:42:23 +0000 (14:42 -0700)]
regen.sh - Preserve the default component-extensions

The issue is that `civicrm_setting[enable_components]` and
`civicrm_extension` need to be sync'd (as of 5.63+).

But there's a structural asymmetry - when dealing with an empty/default
arrangement, "settings"/"components" will inherit a default activation-list;
but "extensions" start with an empty activation-list.

With this patch, we retain the local-active list of component-extensions.
Hopefully, that matches the default setting...

17 months agoAdd default-components to list of default-extensions
Tim Otten [Fri, 9 Jun 2023 21:37:11 +0000 (14:37 -0700)]
Add default-components to list of default-extensions

17 months ago(REF) civicrm_extension.sqldata.php - Remove redundant lines
Tim Otten [Fri, 9 Jun 2023 21:32:56 +0000 (14:32 -0700)]
(REF) civicrm_extension.sqldata.php - Remove redundant lines

17 months agoMerge pull request #26488 from eileenmcnaughton/event_reg
demeritcowboy [Fri, 9 Jun 2023 16:19:48 +0000 (12:19 -0400)]
Merge pull request #26488 from eileenmcnaughton/event_reg

Fix back office register form validation

17 months agoFix back office register form validation
Eileen McNaughton [Fri, 9 Jun 2023 07:10:43 +0000 (19:10 +1200)]
Fix back office register form validation

Follow on to https://github.com/civicrm/civicrm-core/pull/26346#event-9346416078

17 months agoSet version to 5.63.beta1
CiviCRM [Wed, 7 Jun 2023 22:43:19 +0000 (22:43 +0000)]
Set version to 5.63.beta1

17 months agoMerge pull request #26472 from eileenmcnaughton/event_test
colemanw [Wed, 7 Jun 2023 22:34:13 +0000 (18:34 -0400)]
Merge pull request #26472 from eileenmcnaughton/event_test

Cleanup on ContributionTest

17 months agoMerge pull request #24705 from larssandergreen/improve-removed-groups-on-contact...
colemanw [Wed, 7 Jun 2023 22:27:53 +0000 (18:27 -0400)]
Merge pull request #24705 from larssandergreen/improve-removed-groups-on-contact-groups-tab

Improve Past Groups table on Contact Groups tab

17 months agoCleanup on ContributionTest
Eileen McNaughton [Wed, 7 Jun 2023 20:05:50 +0000 (08:05 +1200)]
Cleanup on ContributionTest

Remove calls to deprecated functions, typos, undeclared properties, use Event functions

17 months agoMerge pull request #26469 from mattwire/simplifyeventmsg
Tim Otten [Wed, 7 Jun 2023 22:03:41 +0000 (15:03 -0700)]
Merge pull request #26469 from mattwire/simplifyeventmsg

Simplify messaging for event confirm page

17 months agoMerge pull request #26471 from eileenmcnaughton/legacy
Eileen McNaughton [Wed, 7 Jun 2023 21:29:40 +0000 (09:29 +1200)]
Merge pull request #26471 from eileenmcnaughton/legacy

Use APIv4 when creating test entities

17 months agoAdd api-v4-mandatory parameter
Eileen McNaughton [Wed, 7 Jun 2023 20:59:01 +0000 (08:59 +1200)]
Add api-v4-mandatory parameter

17 months agoMerge pull request #26180 from olayiwola-compucorp/configureDoNotReplyMail
colemanw [Wed, 7 Jun 2023 20:19:02 +0000 (16:19 -0400)]
Merge pull request #26180 from olayiwola-compucorp/configureDoNotReplyMail

dev/core#4273 - CRM/Mailing - Allow user to configure donotreply email address

17 months agoUse APIv4 when creating test entities
Eileen McNaughton [Wed, 7 Jun 2023 20:06:51 +0000 (08:06 +1200)]
Use APIv4 when creating test entities

17 months agoMerge pull request #26468 from colemanw/underscore___test
Eileen McNaughton [Wed, 7 Jun 2023 19:48:48 +0000 (07:48 +1200)]
Merge pull request #26468 from colemanw/underscore___test

APIv4 - Add test to ensure custom fields work with underscores

17 months agoMerge pull request #26457 from MegaphoneJon/url-filter-afform
Eileen McNaughton [Wed, 7 Jun 2023 19:13:59 +0000 (07:13 +1200)]
Merge pull request #26457 from MegaphoneJon/url-filter-afform

Fixes core#4343 - SK ACL bypass not always respected when using an Afform filter

17 months agoMerge pull request #26467 from larssandergreen/Fix-PHP-warning-on-Export-Contacts
Eileen McNaughton [Wed, 7 Jun 2023 19:12:52 +0000 (07:12 +1200)]
Merge pull request #26467 from larssandergreen/Fix-PHP-warning-on-Export-Contacts

Fix PHP warning on Export Contacts

17 months agoSimplify messaging for event confirm page
Matthew Wire [Tue, 9 May 2023 12:48:40 +0000 (13:48 +0100)]
Simplify messaging for event confirm page

17 months agoAPIv4 - Add test to ensure custom fields work with underscores
colemanw [Wed, 7 Jun 2023 14:08:26 +0000 (10:08 -0400)]
APIv4 - Add test to ensure custom fields work with underscores

See https://lab.civicrm.org/dev/core/-/issues/4317

17 months agoMerge pull request #26356 from MegaphoneJon/payment-get-fix
Matthew Wire [Wed, 7 Jun 2023 13:14:19 +0000 (14:14 +0100)]
Merge pull request #26356 from MegaphoneJon/payment-get-fix

fix parameters in Payment.get

17 months agoMerge pull request #26365 from larssandergreen/Show-already-registered-error-on-Trans...
Matthew Wire [Wed, 7 Jun 2023 13:09:42 +0000 (14:09 +0100)]
Merge pull request #26365 from larssandergreen/Show-already-registered-error-on-Transfer-Participant

Fix missing error on Transfer Participant and allow multiple

17 months agoMerge pull request #26364 from larssandergreen/Fix-display-of-fee_level-on-Transfer...
Matthew Wire [Wed, 7 Jun 2023 13:07:10 +0000 (14:07 +0100)]
Merge pull request #26364 from larssandergreen/Fix-display-of-fee_level-on-Transfer-Participant

Fix display of Fee Level on Self-service Registration Update

17 months agoMerge pull request #26151 from larssandergreen/next-and-cancelled-dates-for-contribut...
Matthew Wire [Wed, 7 Jun 2023 13:06:15 +0000 (14:06 +0100)]
Merge pull request #26151 from larssandergreen/next-and-cancelled-dates-for-contribution-recur-on-contact

dev/core#4258 Show next scheduled and cancel / modified date for recurring contributions on contact record

17 months agoMerge pull request #26376 from larssandergreen/Don't-default-dedupe-source
Matthew Wire [Wed, 7 Jun 2023 13:03:42 +0000 (14:03 +0100)]
Merge pull request #26376 from larssandergreen/Don't-default-dedupe-source

dev/core#3989 When merging, don't overwrite source even when original source is empty

17 months agoUtilsRule - Don't check empty values when validating email
colemanw [Wed, 7 Jun 2023 13:02:47 +0000 (09:02 -0400)]
UtilsRule - Don't check empty values when validating email

17 months agoMerge pull request #25207 from larssandergreen/make-email-for-registration-cancellati...
Matthew Wire [Wed, 7 Jun 2023 12:58:13 +0000 (13:58 +0100)]
Merge pull request #25207 from larssandergreen/make-email-for-registration-cancellation-or-transfer-optional

Make event registration cancellation email optional for back office cancellation

17 months agoMerge pull request #26388 from larssandergreen/Fix-participant-error-receive-date
Matthew Wire [Wed, 7 Jun 2023 12:54:12 +0000 (13:54 +0100)]
Merge pull request #26388 from larssandergreen/Fix-participant-error-receive-date

Fix receive_date error saving on Edit Participant with Record Contribution

17 months agoMerge pull request #26347 from larssandergreen/Don't-show-events-with-no-end-date...
Matthew Wire [Wed, 7 Jun 2023 12:52:58 +0000 (13:52 +0100)]
Merge pull request #26347 from larssandergreen/Don't-show-events-with-no-end-date-that-started-more-than-7-days-ago

Don't show events without end date forever on Manage Events

17 months agoMerge pull request #26355 from larssandergreen/Improve-registration-button-for-free...
Matthew Wire [Wed, 7 Jun 2023 10:26:07 +0000 (11:26 +0100)]
Merge pull request #26355 from larssandergreen/Improve-registration-button-for-free-events

dev/core#4260 Improve Event Registration buttons for free registrations, additional participants and review

17 months agoMerge pull request #26464 from eileenmcnaughton/event_cleaup
colemanw [Wed, 7 Jun 2023 10:13:18 +0000 (06:13 -0400)]
Merge pull request #26464 from eileenmcnaughton/event_cleaup

More test fixes on cleanup, helper use

17 months agoMerge pull request #26463 from eileenmcnaughton/event_help
colemanw [Wed, 7 Jun 2023 10:12:40 +0000 (06:12 -0400)]
Merge pull request #26463 from eileenmcnaughton/event_help

Fix another class to use the eventCreatePaid helper

17 months agoMerge pull request #26461 from larssandergreen/Use-select2-for-new-email-template
colemanw [Wed, 7 Jun 2023 10:07:08 +0000 (06:07 -0400)]
Merge pull request #26461 from larssandergreen/Use-select2-for-new-email-template

Use select2 for template on New Email, Scheduled Reminders, SMS & PDF Letter

17 months agoFixes core#4343 - SK ACL bypass not always respected when using an Afform filter
Jon Goldberg [Tue, 6 Jun 2023 22:15:45 +0000 (18:15 -0400)]
Fixes core#4343 - SK ACL bypass not always respected when using an Afform filter

17 months agoMerge pull request #26466 from eileenmcnaughton/trait_comment
Tim Otten [Wed, 7 Jun 2023 05:53:46 +0000 (22:53 -0700)]
Merge pull request #26466 from eileenmcnaughton/trait_comment

Add eventTrait warning [ merge before rc is cut]

17 months agoMerge pull request #26309 from totten/master-esm-oop2
Eileen McNaughton [Wed, 7 Jun 2023 05:50:16 +0000 (17:50 +1200)]
Merge pull request #26309 from totten/master-esm-oop2

(dev/core#4279) Define import-maps for ECMAScript Modules (OOP)

17 months agoFix PHP warning on Export Contacts
larssandergreen [Wed, 7 Jun 2023 04:59:22 +0000 (22:59 -0600)]
Fix PHP warning on Export Contacts