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
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
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
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
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
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
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
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
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
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
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
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]
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)
Eileen McNaughton [Wed, 7 Jun 2023 04:35:12 +0000 (16:35 +1200)]
Add eventTrait warning
Eileen McNaughton [Wed, 7 Jun 2023 02:39:04 +0000 (14:39 +1200)]
More test fixes on cleanup, helper use
Eileen McNaughton [Wed, 7 Jun 2023 02:33:49 +0000 (14:33 +1200)]
Fix another class to use the createPaidEvent helper
demeritcowboy [Wed, 7 Jun 2023 01:38:04 +0000 (21:38 -0400)]
Merge pull request #26462 from eileenmcnaughton/event_help
Fix a couple of tests to use Event helpers
demeritcowboy [Wed, 7 Jun 2023 01:34:26 +0000 (21:34 -0400)]
Merge pull request #26458 from eileenmcnaughton/uf_group
Create UFGroup in tear-down-able manner
demeritcowboy [Wed, 7 Jun 2023 01:32:06 +0000 (21:32 -0400)]
Merge pull request #26400 from larssandergreen/warn-on-changing-to-tax-deductible
dev/financial#210: Warn when changing Contribution from non-deductible to deductible
demeritcowboy [Wed, 7 Jun 2023 01:30:03 +0000 (21:30 -0400)]
Merge pull request #26186 from larssandergreen/allow-backend-cancel/transfer-in-all-conditions
Allow backend transfer or cancel for all participant statuses
Eileen McNaughton [Wed, 7 Jun 2023 00:33:06 +0000 (12:33 +1200)]
Fix a couple of tests to use Event helpers
larssandergreen [Wed, 7 Jun 2023 00:22:00 +0000 (18:22 -0600)]
Use select2 for template on New Email
demeritcowboy [Wed, 7 Jun 2023 00:04:37 +0000 (20:04 -0400)]
Merge pull request #26398 from MegaphoneJon/fix-mail-test
fix Mailsettings.testconnection picking wrong settings to test
Eileen McNaughton [Tue, 6 Jun 2023 23:26:53 +0000 (11:26 +1200)]
Create UFGroup in tear-down-able manner
demeritcowboy [Tue, 6 Jun 2023 23:51:18 +0000 (19:51 -0400)]
Merge pull request #24734 from larssandergreen/abmailing-names
Fix undefined included mailing names in A/B test report, improve readability
demeritcowboy [Tue, 6 Jun 2023 23:06:56 +0000 (19:06 -0400)]
Merge pull request #26265 from larssandergreen/Add-title-to-form-elements-so-we-can-use-it-for-help-text-titles
Get help text title from field label if htxt title is not provided
colemanw [Tue, 6 Jun 2023 21:37:37 +0000 (17:37 -0400)]
Merge pull request #26455 from eileenmcnaughton/event_test_2
Fix tests calling getParticipantOrderParams to use the trait
Mathieu Lu [Tue, 6 Jun 2023 18:53:25 +0000 (14:53 -0400)]
Merge pull request #26397 from larssandergreen/Remove-unneeded-text-on-Campaign,-Pledge-etc
Remove unneeded description text on Campaign, Pledge, Tell a Friend, etc
Mathieu Lu [Tue, 6 Jun 2023 18:50:18 +0000 (14:50 -0400)]
Merge pull request #26396 from larssandergreen/Remove-unneeded-descriptions-on-Membership
Remove unneeded description text on Memberships
Mathieu Lu [Tue, 6 Jun 2023 18:42:08 +0000 (14:42 -0400)]
Merge pull request #26415 from larssandergreen/options_per_line-for-customs-fields
dev/core#3815 Set options_per_line to zero when changing Custom Field html_type
demeritcowboy [Tue, 6 Jun 2023 18:04:21 +0000 (14:04 -0400)]
Merge pull request #26442 from eileenmcnaughton/no_ref
Remove pass-by-ref
larssandergreen [Tue, 6 Jun 2023 15:28:36 +0000 (09:28 -0600)]
Get help text title from field label if htxt title is not provided
Eileen McNaughton [Tue, 6 Jun 2023 03:20:21 +0000 (15:20 +1200)]
Fix events calling getParticipantOrderParams to use the trait
Seamus Lee [Tue, 6 Jun 2023 04:21:16 +0000 (14:21 +1000)]
Merge pull request #26454 from eileenmcnaughton/event_test
Superficial Cleanup in test class
Eileen McNaughton [Tue, 6 Jun 2023 02:50:53 +0000 (14:50 +1200)]
Cleanup in event class
colemanw [Tue, 6 Jun 2023 01:32:45 +0000 (21:32 -0400)]
Merge pull request #26441 from eileenmcnaughton/price_
PriceSet forms - remove reference to undeclared _contributionAmount property
Seamus Lee [Tue, 6 Jun 2023 01:13:07 +0000 (11:13 +1000)]
Merge pull request #26450 from eileenmcnaughton/leg_event_paid
[Test] Rename version of eventCreatePaid that is being replaced
Seamus Lee [Tue, 6 Jun 2023 01:12:33 +0000 (11:12 +1000)]
Merge pull request #26453 from seamuslee001/master
5.62
Seamus Lee [Tue, 6 Jun 2023 01:11:09 +0000 (11:11 +1000)]
Merge branch '5.62'
Eileen McNaughton [Tue, 6 Jun 2023 00:57:04 +0000 (12:57 +1200)]
Merge pull request #26451 from demeritcowboy/translate-petition
Use already translated string (followup to 26446)
Eileen McNaughton [Mon, 5 Jun 2023 22:32:20 +0000 (10:32 +1200)]
Use same key as new function for easier transition
demeritcowboy [Mon, 5 Jun 2023 22:50:29 +0000 (18:50 -0400)]
use already translated string
demeritcowboy [Mon, 5 Jun 2023 22:47:11 +0000 (18:47 -0400)]
Merge pull request #26449 from eileenmcnaughton/profile
Stop truncating UFGroup on tearDown
demeritcowboy [Mon, 5 Jun 2023 22:44:01 +0000 (18:44 -0400)]
Merge pull request #26446 from jmcclelland/petition-error-take-two
present friendlier error message if petition cannot be displayed.
Eileen McNaughton [Mon, 5 Jun 2023 22:14:49 +0000 (10:14 +1200)]
Switch PaymentFormsTest to new version
Eileen McNaughton [Mon, 5 Jun 2023 22:04:45 +0000 (10:04 +1200)]
Rename the test function I am replacing
The eventTrait has a new version of eventCreatePaid but
it can't be called because these tests still rely on an older variant
(which creates invalid financial records) - this moves that function
out of the way to allow me to work through migrating over
Eileen McNaughton [Mon, 5 Jun 2023 21:38:27 +0000 (09:38 +1200)]
Stop truncating UFGroup on tearDown
Eileen McNaughton [Mon, 5 Jun 2023 20:34:59 +0000 (08:34 +1200)]
Merge pull request #26443 from reflexive-communications/log-filename
Use dot to delimit log filename for domain ID
colemanw [Mon, 5 Jun 2023 20:10:16 +0000 (16:10 -0400)]
Merge pull request #26420 from eileenmcnaughton/user_dash
[Test] Switch some unpaid event test setup to use createUnPaidEvent
colemanw [Mon, 5 Jun 2023 20:09:00 +0000 (16:09 -0400)]
Merge pull request #26434 from eileenmcnaughton/uf_group_cleanup
[TEST] Further minor fixes on UFGroup Cleanup
Jamie McClelland [Mon, 5 Jun 2023 16:50:57 +0000 (12:50 -0400)]
present friendlier error message if petition cannot be displayed.
Aidan Saunders [Mon, 5 Jun 2023 16:39:00 +0000 (17:39 +0100)]
Merge pull request #26436 from larssandergreen/Order-select-mailing-id-DESC
Order mailings for selects in search and reports by id DESC
Aidan Saunders [Mon, 5 Jun 2023 16:29:46 +0000 (17:29 +0100)]
Merge pull request #26231 from colemanw/campaignIndexes
REF - Fix Campaign index names, add default value for created_date
Aidan Saunders [Mon, 5 Jun 2023 16:26:24 +0000 (17:26 +0100)]
Merge pull request #26345 from colemanw/sampleData
Installer - Clarify the function and purpose of sample data
Aidan Saunders [Mon, 5 Jun 2023 16:05:36 +0000 (17:05 +0100)]
Merge pull request #26437 from colemanw/api4FixOrderBy
dev/core#4330 - Fix APIv4 orderBy to resolve ambiguous column names
colemanw [Mon, 5 Jun 2023 00:29:17 +0000 (20:29 -0400)]
dev/core#4330 - Fix APIv4 orderBy to resolve ambiguous column names
See https://lab.civicrm.org/dev/core/-/issues/4330
This regressed from
ff2a73c, the fix is to only use names from the select
clause if they are actual aliases.
colemanw [Mon, 5 Jun 2023 13:53:57 +0000 (09:53 -0400)]
Merge pull request #26440 from eileenmcnaughton/perm
Use PriceSet permissions for related entities
Sandor Semsey [Mon, 5 Jun 2023 12:37:04 +0000 (14:37 +0200)]
use dot to delimit log filename
Eileen McNaughton [Mon, 5 Jun 2023 07:58:30 +0000 (19:58 +1200)]
Remove pass-by-ref
Eileen McNaughton [Mon, 5 Jun 2023 07:52:49 +0000 (19:52 +1200)]
PriceSet forms - remove reference to undeclared _contributionAmount property
I don't find this value anywhere in our universe outside this
function - which implies it should be not be a property - especially for
php 8,x reasons. In fact it really just is a case of checking if field_name
is contribution_amount at the right places. I didn't include it in the place where
it would read if field_name = x AND field_name <> y....
Eileen McNaughton [Mon, 5 Jun 2023 07:44:42 +0000 (19:44 +1200)]
Merge pull request #26375 from larssandergreen/Refactor-price-sets
[REF] Move repeated code for Price Field labels into separate function
Eileen McNaughton [Mon, 5 Jun 2023 07:23:17 +0000 (19:23 +1200)]
Merge pull request #26374 from colemanw/activityVirtualFields
APIv4 - Fix Activity contact virtual fields to work across joins
Eileen McNaughton [Sun, 4 Jun 2023 21:20:50 +0000 (09:20 +1200)]
[TEST] Further minor fixes on UFGroup Cleanup
Eileen McNaughton [Mon, 5 Jun 2023 04:52:26 +0000 (16:52 +1200)]
Merge pull request #26373 from mattwire/noidsmembership
Stop passing $ids to membership::create
Yashodha Chaku [Mon, 5 Jun 2023 04:48:00 +0000 (10:18 +0530)]
Merge pull request #26439 from eileenmcnaughton/price_search
Cleanup on PriceSetCustom search
Eileen McNaughton [Mon, 5 Jun 2023 01:38:12 +0000 (13:38 +1200)]
Remove handling for required field to be empty
Eileen McNaughton [Mon, 5 Jun 2023 01:32:03 +0000 (13:32 +1200)]
Cleanup on PriceSetCustom search
Having fixed up the test on this I also fixed a couple of bits of red and
also replaced calls to internal Core CiviCRM functions
with api calls
Eileen McNaughton [Sun, 4 Jun 2023 23:27:20 +0000 (11:27 +1200)]
Move legacy prices set search test to extension
Eileen McNaughton [Mon, 5 Jun 2023 01:41:55 +0000 (13:41 +1200)]
Use PriceSet permissions for related entities
This addresses a situation where price set permissions are looser than the
associated fields, values & linkages to events & contribution pages
larssandergreen [Sun, 4 Jun 2023 23:22:11 +0000 (17:22 -0600)]
Order select for mailings by id DESC
colemanw [Sun, 4 Jun 2023 23:30:17 +0000 (19:30 -0400)]
Merge pull request #26427 from larssandergreen/Don't-show-current-mailing-in-include/exclude-mailings
dev/core#3570: Don't show current mailing in include/exclude previous mailings
Eileen McNaughton [Sun, 4 Jun 2023 23:24:28 +0000 (11:24 +1200)]
Merge pull request #26419 from larssandergreen/Remove-URL-from-event-template
Don't show event URL on Manage Event Template
colemanw [Sun, 4 Jun 2023 23:20:32 +0000 (19:20 -0400)]
Merge pull request #26395 from larssandergreen/No-pager-in-Afform-when-not-needed
SearchKit: Don't show the pager unless it is needed
Eileen McNaughton [Sun, 4 Jun 2023 21:01:22 +0000 (09:01 +1200)]
Merge pull request #26433 from braders/php8.2-CRM_Member_Page_DashBoard
[REF][PHP8.2] Remove unused dynamic property showMembershipSummary
Matthew Wire [Sun, 4 Jun 2023 20:29:53 +0000 (21:29 +0100)]
Merge pull request #26431 from larssandergreen/Show-fee-info-above-payment-info-on-Event-confirmation-and-thank-you
Show Event Info at bottom of Registration Confirm & Fee Info above Payment
Matthew Wire [Sun, 4 Jun 2023 20:27:17 +0000 (21:27 +0100)]
Merge pull request #26430 from larssandergreen/Fix-payment-validation-for-show-payment-on-confirm
Fix payment validation for Payment on Confirm
Bradley Taylor [Sun, 4 Jun 2023 19:10:26 +0000 (20:10 +0100)]
[REF][PHP8.2] Remove unused dynamic property showMembershipSummary
demeritcowboy [Sun, 4 Jun 2023 17:21:48 +0000 (13:21 -0400)]
Merge pull request #26429 from larssandergreen/Fix-whitespace-around-date-through-in-EventInfoBlock
[NFC] Remove extra whitespace around date through in EventInfoBlock
larssandergreen [Sun, 4 Jun 2023 17:14:01 +0000 (11:14 -0600)]
Improve button text for free registrations and additional participants
larssandergreen [Sun, 4 Jun 2023 16:55:40 +0000 (10:55 -0600)]
Show Event Info at bottom Registration confirm and show Fee Info above Payment
larssandergreen [Sun, 4 Jun 2023 16:15:54 +0000 (10:15 -0600)]
Fix payment validation for payment on confirm
larssandergreen [Sun, 4 Jun 2023 15:47:06 +0000 (09:47 -0600)]
Remove extra whitespace around date through in EventInfoBlock
demeritcowboy [Sun, 4 Jun 2023 15:13:56 +0000 (11:13 -0400)]
Merge pull request #26409 from ahed-compucorp/dev/core#4333
dev/core#4333 Set default created_id for case and activity Attachments
demeritcowboy [Sun, 4 Jun 2023 14:41:37 +0000 (10:41 -0400)]
Merge pull request #26421 from eileenmcnaughton/cleanup2
[Test] Fix UFGroup cleanup in ReportTemplateTest
demeritcowboy [Sun, 4 Jun 2023 14:35:14 +0000 (10:35 -0400)]
Merge pull request #26422 from eileenmcnaughton/cleanup
[Test] More test UFGroup cleanup
demeritcowboy [Sun, 4 Jun 2023 14:30:26 +0000 (10:30 -0400)]
Merge pull request #26423 from braders/php8.2-CRM_Report_Form_Contact_Log
[REF][PHP8.2] Declare property in CRM_Report_Form_Contact_Log
demeritcowboy [Sun, 4 Jun 2023 14:29:31 +0000 (10:29 -0400)]
Merge pull request #26424 from braders/php8.2-CRM_Report_Form_Contribute_OrganizationSummary
[REF][PHP8.2] Declare properties on OrganizationSummary report
demeritcowboy [Sun, 4 Jun 2023 14:23:34 +0000 (10:23 -0400)]
Merge pull request #26428 from braders/class-case
[NFC] Fix capitalization of class names
larssandergreen [Sun, 4 Jun 2023 13:22:41 +0000 (07:22 -0600)]
Don't show current mailing in include/exclude options
Bradley Taylor [Sun, 4 Jun 2023 08:25:42 +0000 (09:25 +0100)]
[NFC] Fix capitalization of class names
Bradley Taylor [Sat, 3 Jun 2023 17:24:49 +0000 (18:24 +0100)]
[REF][PHP8.2] Declare properties on OrganizationSummary report
Bradley Taylor [Sat, 3 Jun 2023 17:06:29 +0000 (18:06 +0100)]
[REF][PHP8.2] Declare property in CRM_Report_Form_Contact_Log
Ahed [Fri, 2 Jun 2023 08:47:27 +0000 (11:47 +0300)]
dev/core#4333 Set default created_id for case and activity Attachments
Eileen McNaughton [Sat, 3 Jun 2023 00:06:00 +0000 (12:06 +1200)]
More test UFGroup cleanup
Fixes a couple more tests to appropriate UFGroup cleanup
Eileen McNaughton [Sat, 3 Jun 2023 00:00:41 +0000 (12:00 +1200)]
Fix UFGroup cleanup in SelectorTest
Eileen McNaughton [Fri, 2 Jun 2023 06:55:02 +0000 (18:55 +1200)]
Fix UFGroup cleanup in ReportTemplateTest
Eileen McNaughton [Fri, 2 Jun 2023 22:07:03 +0000 (10:07 +1200)]
Switch some unpaid event test setup to use createUnPaidEvent
This resolves some of the ambiguity
Spin off from https://github.com/civicrm/civicrm-core/pull/26348
larssandergreen [Fri, 2 Jun 2023 22:02:56 +0000 (16:02 -0600)]
Hide pager if single page on all Admin UI
Aidan Saunders [Fri, 2 Jun 2023 21:47:25 +0000 (22:47 +0100)]
Merge pull request #26417 from colemanw/htmlType
Metadata - Add missing html types/labels to the schema
Aidan Saunders [Fri, 2 Jun 2023 21:43:09 +0000 (22:43 +0100)]
Merge pull request #26418 from SolidCharity/TP-202306-contributor_key
Added tpokorra to contributor-key.yml