civicrm-core.git
11 months agoTightens targeting of AccordionToggle JS
Nicol [Wed, 6 Dec 2023 21:01:58 +0000 (21:01 +0000)]
Tightens targeting of AccordionToggle JS

11 months agoTargets the crmAccordionToggle more tightly
Nicol [Wed, 6 Dec 2023 21:00:30 +0000 (21:00 +0000)]
Targets the crmAccordionToggle more tightly

So as to not hide the <details> content.

11 months agoMerge branch 'civicrm:master' into patch-15
Nicol [Wed, 6 Dec 2023 20:59:31 +0000 (20:59 +0000)]
Merge branch 'civicrm:master' into patch-15

11 months agoMerge pull request #28504 from yashodha/report-fixess
Eileen McNaughton [Wed, 6 Dec 2023 20:26:14 +0000 (09:26 +1300)]
Merge pull request #28504 from yashodha/report-fixess

Add filter on archived in Mailing Summary report

11 months agoMerge pull request #28545 from aydun/labelformat_metadata
Eileen McNaughton [Wed, 6 Dec 2023 20:25:13 +0000 (09:25 +1300)]
Merge pull request #28545 from aydun/labelformat_metadata

Munge paths for labelFormats

11 months agoOpens first three regions
Nicol [Wed, 6 Dec 2023 20:18:57 +0000 (20:18 +0000)]
Opens first three regions

Matches behavior of old Advanced Search.

11 months agoKeeps main Advanced Searchd details always open
Nicol [Wed, 6 Dec 2023 20:10:30 +0000 (20:10 +0000)]
Keeps main Advanced Searchd details always open

11 months agoMerge branch 'civicrm:master' into patch-15
Nicol [Wed, 6 Dec 2023 20:09:14 +0000 (20:09 +0000)]
Merge branch 'civicrm:master' into patch-15

11 months agoMerge pull request #28544 from aydun/premiums_metadata
Eileen McNaughton [Wed, 6 Dec 2023 20:03:09 +0000 (09:03 +1300)]
Merge pull request #28544 from aydun/premiums_metadata

Premiums metadata

11 months agoMerge pull request #28534 from pradpnayak/mappingseaechkit
Eileen McNaughton [Wed, 6 Dec 2023 20:02:39 +0000 (09:02 +1300)]
Merge pull request #28534 from pradpnayak/mappingseaechkit

Use the action definded in DAO for Mapping

11 months agoMunge paths for labelFormats
Aidan Saunders [Wed, 6 Dec 2023 18:21:03 +0000 (18:21 +0000)]
Munge paths for labelFormats

11 months agoMerge pull request #28468 from jaapjansma/timezone
demeritcowboy [Wed, 6 Dec 2023 18:07:29 +0000 (13:07 -0500)]
Merge pull request #28468 from jaapjansma/timezone

dev/core#4410: fixed timezone support for standalone

11 months agoMerge pull request #28513 from wyde22/newuiLabelFormat-dewy
Aidan Saunders [Wed, 6 Dec 2023 18:06:15 +0000 (18:06 +0000)]
Merge pull request #28513 from wyde22/newuiLabelFormat-dewy

searchui : new screen label format

11 months agoRegen
Aidan Saunders [Wed, 6 Dec 2023 17:25:20 +0000 (17:25 +0000)]
Regen

11 months agoPath mangling for managePremiums
Aidan Saunders [Wed, 6 Dec 2023 17:24:07 +0000 (17:24 +0000)]
Path mangling for managePremiums

11 months agoFixes UI regression in #28418
Nicol [Wed, 6 Dec 2023 17:36:52 +0000 (17:36 +0000)]
Fixes UI regression in #28418

Some advanced search accordion regions have a close button on the right – clicking this 'deactivites' the region from the search, and with the recent changes it also makes the expanded region hidden.

This removes the line of JS responsible for that.

11 months agoMerge pull request #28525 from totten/master-pw-rst
Tim Otten [Wed, 6 Dec 2023 15:44:14 +0000 (15:44 +0000)]
Merge pull request #28525 from totten/master-pw-rst

standaloneusers - Fix tokens+docblocks for "Password reset" email

11 months agoMerge pull request #28528 from wmortada/standalone-users
Matthew Wire [Wed, 6 Dec 2023 12:11:41 +0000 (12:11 +0000)]
Merge pull request #28528 from wmortada/standalone-users

Standalone - Improve administer user screen

11 months agostandaloneusers - Fix tokens+docblocks for password-reset email
Tim Otten [Tue, 5 Dec 2023 22:20:27 +0000 (22:20 +0000)]
standaloneusers - Fix tokens+docblocks for password-reset email

11 months agoMerge pull request #28535 from eileenmcnaughton/master_test
Tim Otten [Wed, 6 Dec 2023 11:01:55 +0000 (11:01 +0000)]
Merge pull request #28535 from eileenmcnaughton/master_test

Test-notice-fix affecting all tests

11 months agoTest-notice-fix
Eileen McNaughton [Wed, 6 Dec 2023 03:27:49 +0000 (16:27 +1300)]
Test-notice-fix

11 months agoMerge pull request #28531 from civicrm/5.68
Eileen McNaughton [Wed, 6 Dec 2023 01:38:31 +0000 (14:38 +1300)]
Merge pull request #28531 from civicrm/5.68

5.68

11 months agoMerge pull request #28387 from eileenmcnaughton/membership_block_save
Matthew Wire [Wed, 6 Dec 2023 00:30:42 +0000 (00:30 +0000)]
Merge pull request #28387 from eileenmcnaughton/membership_block_save

dev/core#3994 Update membership block on membership type save & remove the same from the Manage form

11 months agoMerge pull request #28344 from eileenmcnaughton/move_set
Matthew Wire [Wed, 6 Dec 2023 00:29:13 +0000 (00:29 +0000)]
Merge pull request #28344 from eileenmcnaughton/move_set

Move form specific code out of shared function

11 months agoMerge pull request #28388 from asmac-org/formbuilder-textarea-support-rows-cols
Matthew Wire [Wed, 6 Dec 2023 00:28:43 +0000 (00:28 +0000)]
Merge pull request #28388 from asmac-org/formbuilder-textarea-support-rows-cols

Formbuilder: support rows and columns values for Note (textarea) custom field type

11 months agoMerge pull request #28386 from eileenmcnaughton/membership_types
Matthew Wire [Wed, 6 Dec 2023 00:28:06 +0000 (00:28 +0000)]
Merge pull request #28386 from eileenmcnaughton/membership_types

Use apv4 rather than V3 for cached membershipTypes retrieval

11 months agoMerge pull request #28487 from eileenmcnaughton/price_notice
Matthew Wire [Wed, 6 Dec 2023 00:27:08 +0000 (00:27 +0000)]
Merge pull request #28487 from eileenmcnaughton/price_notice

dev/core#3083 Add a warning about price fields where non_deductible amount potentially misconfigured

11 months agoMerge pull request #28493 from eileenmcnaughton/invoice
Matthew Wire [Wed, 6 Dec 2023 00:26:33 +0000 (00:26 +0000)]
Merge pull request #28493 from eileenmcnaughton/invoice

Consolidate invoice determination

11 months agoMerge pull request #28491 from eileenmcnaughton/dep
Matthew Wire [Wed, 6 Dec 2023 00:26:08 +0000 (00:26 +0000)]
Merge pull request #28491 from eileenmcnaughton/dep

Update CustomField default_value to NULL instead of '' for floats

11 months agoMerge pull request #28483 from pradpnayak/dateprefAfform
Matthew Wire [Wed, 6 Dec 2023 00:25:28 +0000 (00:25 +0000)]
Merge pull request #28483 from pradpnayak/dateprefAfform

Added DatePreference admin UI

11 months agoUse the action definded in DAO for Mapping
Pradeep Nayak [Wed, 6 Dec 2023 00:25:02 +0000 (00:25 +0000)]
Use the action definded in DAO for Mapping

11 months agoMerge pull request #28482 from pradpnayak/datePrefAPI
Matthew Wire [Wed, 6 Dec 2023 00:24:38 +0000 (00:24 +0000)]
Merge pull request #28482 from pradpnayak/datePrefAPI

Adding PreferencesDate API

11 months agoMerge pull request #28479 from eileenmcnaughton/add_payment_more
Matthew Wire [Wed, 6 Dec 2023 00:23:52 +0000 (00:23 +0000)]
Merge pull request #28479 from eileenmcnaughton/add_payment_more

Clean up parameters in add payment form

11 months agoMerge pull request #28485 from eileenmcnaughton/transaction
Matthew Wire [Wed, 6 Dec 2023 00:23:25 +0000 (00:23 +0000)]
Merge pull request #28485 from eileenmcnaughton/transaction

Add deprecation to transition components

11 months agoMerge pull request #28489 from eileenmcnaughton/membership_type_write
Matthew Wire [Wed, 6 Dec 2023 00:22:20 +0000 (00:22 +0000)]
Merge pull request #28489 from eileenmcnaughton/membership_type_write

Partial standardisation of MembershipType::Add

11 months agoMerge pull request #28498 from eileenmcnaughton/main_notice_
Matthew Wire [Wed, 6 Dec 2023 00:12:41 +0000 (00:12 +0000)]
Merge pull request #28498 from eileenmcnaughton/main_notice_

Remove notice from main donate page

11 months agoMerge pull request #28509 from pradpnayak/mappingseaechkit
Matthew Wire [Wed, 6 Dec 2023 00:11:05 +0000 (00:11 +0000)]
Merge pull request #28509 from pradpnayak/mappingseaechkit

Added Export Mapping search kit UI

11 months agoMerge pull request #28508 from pradpnayak/mappingseaech
Matthew Wire [Wed, 6 Dec 2023 00:10:12 +0000 (00:10 +0000)]
Merge pull request #28508 from pradpnayak/mappingseaech

make Mapping entity available on searchkit

11 months agoMerge pull request #28396 from colemanw/contactTypeSearchSegments
Matthew Wire [Wed, 6 Dec 2023 00:07:39 +0000 (00:07 +0000)]
Merge pull request #28396 from colemanw/contactTypeSearchSegments

SearchKit - Fix Search Segments for contact type entities

11 months agoMerge pull request #28438 from colemanw/civiGrantCleanup
Matthew Wire [Wed, 6 Dec 2023 00:06:05 +0000 (00:06 +0000)]
Merge pull request #28438 from colemanw/civiGrantCleanup

Civi grant cleanup

11 months agoMerge pull request #28515 from MegaphoneJon/sk-undefined-array-key
Matthew Wire [Wed, 6 Dec 2023 00:04:24 +0000 (00:04 +0000)]
Merge pull request #28515 from MegaphoneJon/sk-undefined-array-key

SearchKit: Don't assume a comparison value when none exists

11 months agoMerge pull request #28524 from totten/master-exception
Seamus Lee [Wed, 6 Dec 2023 00:03:14 +0000 (11:03 +1100)]
Merge pull request #28524 from totten/master-exception

TemplateTrait - Fix references to CRM_Core_Exception

11 months agoMerge pull request #28522 from totten/5.68-msgtpl
Seamus Lee [Wed, 6 Dec 2023 00:02:54 +0000 (11:02 +1100)]
Merge pull request #28522 from totten/5.68-msgtpl

(dev/core#4839) WorkflowMessage - Send email. Don't overwrite $to.

11 months agoMerge pull request #28526 from 19ATF72/mailing-component-edit-page-link
Seamus Lee [Tue, 5 Dec 2023 23:39:12 +0000 (10:39 +1100)]
Merge pull request #28526 from 19ATF72/mailing-component-edit-page-link

Fix ID retrieval for MailingComponent edit page

11 months agoMerge pull request #28472 from 19ATF72/mailing-component-searchkit
Seamus Lee [Tue, 5 Dec 2023 23:36:04 +0000 (10:36 +1100)]
Merge pull request #28472 from 19ATF72/mailing-component-searchkit

Add MailingComponent.php

11 months agoStandalone - Improve administer user screen
William Mortada [Tue, 5 Dec 2023 23:01:04 +0000 (23:01 +0000)]
Standalone - Improve administer user screen

11 months agoFix ID retrieval for MailingComponent edit page
19ATF72 [Tue, 5 Dec 2023 22:38:07 +0000 (14:38 -0800)]
Fix ID retrieval for MailingComponent edit page

11 months agoMerge pull request #28500 from pradpnayak/urlChange
colemanw [Tue, 5 Dec 2023 22:40:20 +0000 (22:40 +0000)]
Merge pull request #28500 from pradpnayak/urlChange

Changed the URL path for DatePreference screen

11 months agoTemplateTrait - Fix references to CRM_Core_Exception
Tim Otten [Tue, 5 Dec 2023 22:21:19 +0000 (22:21 +0000)]
TemplateTrait - Fix references to CRM_Core_Exception

There are a few places where this class throws exceptions. It's quite uncommon. But if it happens, then it won't work right.

11 months ago(dev/core#4839) WorkflowMessage - Send email. Don't overwrite $to.
Tim Otten [Tue, 5 Dec 2023 21:56:15 +0000 (21:56 +0000)]
(dev/core#4839) WorkflowMessage - Send email. Don't overwrite $to.

11 months agoMerge pull request #28441 from vingle/a11y-accordions-ang
Rich Lott [Tue, 5 Dec 2023 21:46:06 +0000 (21:46 +0000)]
Merge pull request #28441 from vingle/a11y-accordions-ang

Applies accessible accordion to SearchKit, adds fallbacks

11 months agoMerge pull request #28490 from mattwire/dorefund
Eileen McNaughton [Tue, 5 Dec 2023 20:33:31 +0000 (09:33 +1300)]
Merge pull request #28490 from mattwire/dorefund

Clarify doRefund() signature

11 months agoMerge pull request #28516 from demeritcowboy/regen
Eileen McNaughton [Tue, 5 Dec 2023 20:29:05 +0000 (09:29 +1300)]
Merge pull request #28516 from demeritcowboy/regen

Regen

11 months agoMerge pull request #28452 from colemanw/autocompleteValues
Matthew Wire [Tue, 5 Dec 2023 18:38:19 +0000 (18:38 +0000)]
Merge pull request #28452 from colemanw/autocompleteValues

APIv4 - Pass form values to autocomplete field

11 months agoClarify doRefund() signature
Matthew Wire [Tue, 5 Dec 2023 00:19:36 +0000 (00:19 +0000)]
Clarify doRefund() signature

12 months agoMerge pull request #28510 from pradpnayak/providerapi
colemanw [Tue, 5 Dec 2023 17:11:11 +0000 (17:11 +0000)]
Merge pull request #28510 from pradpnayak/providerapi

Add SMS provider API 4 Support

12 months agoregen
demeritcowboy [Tue, 5 Dec 2023 17:05:23 +0000 (12:05 -0500)]
regen

12 months agoMerge pull request #28507 from artfulrobot/artfulrobot-e2e-errortest-1
Rich Lott [Tue, 5 Dec 2023 16:42:38 +0000 (16:42 +0000)]
Merge pull request #28507 from artfulrobot/artfulrobot-e2e-errortest-1

Standalone: fix e2e error message test(s)

12 months agoMerge pull request #27162 from eileenmcnaughton/text
demeritcowboy [Tue, 5 Dec 2023 16:33:59 +0000 (11:33 -0500)]
Merge pull request #27162 from eileenmcnaughton/text

Add userEnteredText as generic workflow template smarty variable

12 months agoSearchKit: Don't assume a comparison value when none exists
Jon Goldberg [Tue, 5 Dec 2023 16:33:53 +0000 (11:33 -0500)]
SearchKit: Don't assume a comparison value when none exists

12 months agoAdded Export Mapping search kit UI
Pradeep Nayak [Tue, 5 Dec 2023 14:32:46 +0000 (14:32 +0000)]
Added Export Mapping search kit UI

12 months agoAdded DatePreference admin UI
Pradeep Nayak [Mon, 4 Dec 2023 21:02:38 +0000 (21:02 +0000)]
Added DatePreference admin UI

12 months agoMerge pull request #28499 from ufundo/afform-json-php
colemanw [Tue, 5 Dec 2023 15:34:26 +0000 (15:34 +0000)]
Merge pull request #28499 from ufundo/afform-json-php

convert .aff.json to .aff.php and add ts()

12 months agodev/core#4410: fixed timezone support for standalone
Jaap Jansma [Tue, 5 Dec 2023 15:24:41 +0000 (16:24 +0100)]
dev/core#4410: fixed timezone support for standalone

12 months agoAdd SMS provider API 4 Support
Pradeep Nayak [Tue, 5 Dec 2023 14:44:22 +0000 (14:44 +0000)]
Add SMS provider API 4 Support

12 months agostandalone: fix test, cleanup unnecessary javascript
Rich Lott / Artful Robot [Tue, 5 Dec 2023 14:15:19 +0000 (14:15 +0000)]
standalone: fix test, cleanup unnecessary javascript

12 months agomake Mapping entity available on searchkit
Pradeep Nayak [Tue, 5 Dec 2023 14:19:28 +0000 (14:19 +0000)]
make Mapping entity available on searchkit

12 months agoMerge pull request #28475 from artfulrobot/artfulrobot-testPaths_getUrl-fix
Tim Otten [Tue, 5 Dec 2023 13:48:50 +0000 (13:48 +0000)]
Merge pull request #28475 from artfulrobot/artfulrobot-testPaths_getUrl-fix

standalone: fix failing E2E test due to getting resource base URL

12 months agoadd filter for archived in mailing summary report
yashodha [Tue, 5 Dec 2023 13:27:16 +0000 (18:57 +0530)]
add filter for archived in mailing summary report

12 months agostandalone: fix failing E2E test due to getting resource base URL
Rich Lott / Artful Robot [Mon, 4 Dec 2023 18:54:39 +0000 (18:54 +0000)]
standalone: fix failing E2E test due to getting resource base URL

Fixes E2E\Core\PathUrlTest::testPaths_getUrl

12 months agoUpdate ext/civi_mail/Civi/Api4/MailingComponent.php
19ATF72 [Tue, 5 Dec 2023 12:24:08 +0000 (12:24 +0000)]
Update ext/civi_mail/Civi/Api4/MailingComponent.php

Co-authored-by: colemanw <coleman@civicrm.org>
12 months agosearchui : new screen label format
Dewy [Tue, 5 Dec 2023 12:21:00 +0000 (04:21 -0800)]
searchui : new screen label format

12 months agoMerge pull request #28478 from wmortada/standalone-fields
Rich Lott [Tue, 5 Dec 2023 12:16:44 +0000 (12:16 +0000)]
Merge pull request #28478 from wmortada/standalone-fields

Standalone - Make active field required and labelled enabled

12 months agoFix string parameter being passed non string variable
19ATF72 [Tue, 5 Dec 2023 11:53:10 +0000 (03:53 -0800)]
Fix string parameter being passed non string variable

12 months agoconvert .aff.json to .aff.php and add ts()
benjamin [Tue, 5 Dec 2023 10:45:08 +0000 (10:45 +0000)]
convert .aff.json to .aff.php and add ts()

12 months agoChanged the URL path for DatePreference screen
Pradeep Nayak [Tue, 5 Dec 2023 11:16:25 +0000 (11:16 +0000)]
Changed the URL path for DatePreference screen

12 months agoAdding PreferencesDate API
Pradeep Nayak [Mon, 4 Dec 2023 20:55:46 +0000 (20:55 +0000)]
Adding PreferencesDate API

12 months agoMerge pull request #28494 from eileenmcnaughton/crazy_param
Eileen McNaughton [Tue, 5 Dec 2023 09:14:46 +0000 (22:14 +1300)]
Merge pull request #28494 from eileenmcnaughton/crazy_param

Cleanup return on processContact

12 months agoCleanup return on processContact
Eileen McNaughton [Tue, 5 Dec 2023 04:26:35 +0000 (17:26 +1300)]
Cleanup return on processContact

12 months agoRemove notice from main donate page
Eileen McNaughton [Tue, 5 Dec 2023 08:20:14 +0000 (21:20 +1300)]
Remove notice from main donate page

auto_renew is added to the form after allowAutoRenewMembership is assigned, and only if it
is true - so the check for cj('auto_renew') is not enhanced by the check for the variable
- but it DOES lead to notices on the other pages

12 months agoConsolidate invoice determination
Eileen McNaughton [Tue, 5 Dec 2023 02:54:03 +0000 (15:54 +1300)]
Consolidate invoice determination

12 months agoUpdate CustomField default_value to NULL instead of '' for floats
Eileen McNaughton [Tue, 5 Dec 2023 02:08:09 +0000 (15:08 +1300)]
Update CustomField default_value to NULL instead of '' for floats

12 months agoPartial standardisation of MembershipType::Add
Eileen McNaughton [Tue, 5 Dec 2023 00:03:38 +0000 (13:03 +1300)]
Partial standardisation of MembershipType::Add

12 months agoAdd a warning about price fields where non_deductible amount potentially misconfigured
Eileen McNaughton [Mon, 4 Dec 2023 23:29:40 +0000 (12:29 +1300)]
Add a warning about price fields where non_deductible amount potentially misconfigured

12 months agoMerge pull request #28486 from 19ATF72/contributor-update
Eileen McNaughton [Mon, 4 Dec 2023 22:32:52 +0000 (11:32 +1300)]
Merge pull request #28486 from 19ATF72/contributor-update

Update contributor-key.yml

12 months agoMerge pull request #28398 from MegaphoneJon/better-ajax-error-handling
Eileen McNaughton [Mon, 4 Dec 2023 21:41:26 +0000 (10:41 +1300)]
Merge pull request #28398 from MegaphoneJon/better-ajax-error-handling

ensure exception class supports getErrorData

12 months agoUpdate contributor-key.yml
19ATF72 [Mon, 4 Dec 2023 21:38:33 +0000 (21:38 +0000)]
Update contributor-key.yml

12 months agoAdd deprecation to transition components
Eileen McNaughton [Mon, 4 Dec 2023 21:15:00 +0000 (10:15 +1300)]
Add deprecation to transition components

Deprecate transitionComponents

12 months agoMerge pull request #28425 from demeritcowboy/lang-eco
Tim Otten [Mon, 4 Dec 2023 21:09:31 +0000 (21:09 +0000)]
Merge pull request #28425 from demeritcowboy/lang-eco

Update language download during install to use existing folder if present

12 months agoStop passing unused invoiceID to doPayment
Eileen McNaughton [Mon, 4 Dec 2023 20:01:24 +0000 (09:01 +1300)]
Stop passing unused invoiceID to doPayment

12 months agoMerge pull request #26227 from eileenmcnaughton/payment
Matthew Wire [Mon, 4 Dec 2023 20:59:14 +0000 (20:59 +0000)]
Merge pull request #26227 from eileenmcnaughton/payment

Use payment create rather than transitionComponents

12 months agoClean up payment create
Eileen McNaughton [Mon, 4 Dec 2023 01:00:37 +0000 (14:00 +1300)]
Clean up payment create

12 months agoMake active flag required and labelled enabled
William Mortada [Sun, 3 Dec 2023 12:05:07 +0000 (12:05 +0000)]
Make active flag required and labelled enabled

12 months agoAdd MailingComponent.php
19ATF72 [Mon, 4 Dec 2023 19:24:12 +0000 (11:24 -0800)]
Add MailingComponent.php

12 months agoensure this exception class supports getErrorData
Jon Goldberg [Fri, 1 Dec 2023 20:11:17 +0000 (15:11 -0500)]
ensure this exception class supports getErrorData

12 months agoMerge pull request #28419 from ufundo/standalone-url-test
Rich Lott [Mon, 4 Dec 2023 18:46:24 +0000 (18:46 +0000)]
Merge pull request #28419 from ufundo/standalone-url-test

Standalone PathUrlTest

12 months agoMerge pull request #28470 from demeritcowboy/not4
colemanw [Mon, 4 Dec 2023 18:08:21 +0000 (18:08 +0000)]
Merge pull request #28470 from demeritcowboy/not4

Use buttons instead of buttons, but only when not 4, but also if it's 4

12 months agotest Standalone urls (use drupal format)
benjamin [Sat, 2 Dec 2023 15:54:21 +0000 (15:54 +0000)]
test Standalone urls (use drupal format)

12 months agopat => pattern
benjamin [Sat, 2 Dec 2023 15:53:43 +0000 (15:53 +0000)]
pat => pattern

12 months agotypo in joomla path
benjamin [Mon, 4 Dec 2023 17:11:26 +0000 (17:11 +0000)]
typo in joomla path