larssandergreen [Tue, 27 Jun 2023 21:01:37 +0000 (21:01 +0000)]
regenerate civicrm_generated
larssandergreen [Tue, 27 Jun 2023 20:55:53 +0000 (14:55 -0600)]
Rename "Name and Email" dedupe rules to "Name or Email"
Yashodha Chaku [Tue, 27 Jun 2023 11:31:54 +0000 (17:01 +0530)]
Merge pull request #26671 from colemanw/deleteTpl
Delete unused tpl file
colemanw [Tue, 27 Jun 2023 04:57:52 +0000 (00:57 -0400)]
Delete unused tpl file
This tpl is unused since
b30809e49e9ed5142092f2157877a24ad1df17ee
Eileen McNaughton [Tue, 27 Jun 2023 00:06:38 +0000 (17:06 -0700)]
Merge pull request #26383 from MegaphoneJon/crmmoney-filter
crmMoney filter - allow coercing locale
Eileen McNaughton [Tue, 27 Jun 2023 00:00:09 +0000 (17:00 -0700)]
Merge pull request #25989 from eileenmcnaughton/import_county
Ensure counties are properly imported even if ambiguous
Jamie McClelland [Mon, 5 Dec 2022 21:49:21 +0000 (16:49 -0500)]
ensure counties are properly imported even if ambiguous
If a county has a unique name, you can import it by name.
But, if there is one or more counties with the same name, the county is
not properly converted to an id, and we get a foreign constraint error
and/or a invalid value error.
Tim Otten [Mon, 26 Jun 2023 22:22:28 +0000 (15:22 -0700)]
Merge pull request #26651 from eileenmcnaughton/workflow
Follow up to #26618 - set locale consistently when exporting model
Tim Otten [Mon, 26 Jun 2023 20:01:07 +0000 (13:01 -0700)]
Merge pull request #26649 from totten/master-standalone-paths
Standalone - Fix some path calculations
Tim Otten [Mon, 26 Jun 2023 19:34:46 +0000 (12:34 -0700)]
Merge pull request #26643 from totten/master-auto-enable
Standalone - Auto-enable user subsystem. Tweak default user.
demeritcowboy [Mon, 26 Jun 2023 18:37:45 +0000 (14:37 -0400)]
Merge pull request #26670 from larssandergreen/Remove-Search-Builder-links-from-search-results
Remove Search Builder link from search results
Tim Otten [Mon, 26 Jun 2023 18:34:41 +0000 (11:34 -0700)]
StandaloneUsers.civi-setup.php - Fix log message for recently added 'adminUser' property
larssandergreen [Mon, 26 Jun 2023 18:01:15 +0000 (12:01 -0600)]
Remove Search Builder link from search results
Seamus Lee [Mon, 26 Jun 2023 15:27:02 +0000 (11:27 -0400)]
Merge pull request #26667 from civicrm/5.63
5.63
Seamus Lee [Mon, 26 Jun 2023 15:26:40 +0000 (11:26 -0400)]
Merge pull request #26668 from demeritcowboy/adminui-reserved
Admin UI - be like regular civi and don't show reserved custom groups
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 `_`
colemanw [Mon, 26 Jun 2023 13:42:13 +0000 (06:42 -0700)]
Merge pull request #26661 from eileenmcnaughton/tokens
Add survey tokens
colemanw [Mon, 26 Jun 2023 13:37:03 +0000 (06:37 -0700)]
Merge pull request #26664 from eileenmcnaughton/custom_search
Move last (hopefully) custom search classes to the extension, unhide
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
colemanw [Mon, 26 Jun 2023 13:29:31 +0000 (06:29 -0700)]
Merge pull request #26642 from jitendrapurohit/sk_rel_actions
Fix actions on Relationship search using Searchkit
Aidan Saunders [Mon, 26 Jun 2023 11:53:53 +0000 (12:53 +0100)]
Merge pull request #26663 from colemanw/searchKitActionLinks
SearchKit - Reuse helpers from CRM_Core_Action
Tim Otten [Mon, 26 Jun 2023 07:21:59 +0000 (00:21 -0700)]
Merge pull request #26662 from eileenmcnaughton/token_default
Add capitalize filter to tokens
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 _
Tim Otten [Mon, 26 Jun 2023 06:42:18 +0000 (23:42 -0700)]
dev/core#4392 - Distribute civicrm_data files
jitendrapurohit [Sat, 24 Jun 2023 05:22:36 +0000 (10:52 +0530)]
Fix actions on Relationship search using Searchkit
Eileen McNaughton [Mon, 26 Jun 2023 04:58:37 +0000 (21:58 -0700)]
Move last (hopefully) custom search classes to the extension, unhide
colemanw [Mon, 26 Jun 2023 02:59:27 +0000 (22:59 -0400)]
SearchKit - Reuse helpers from CRM_Core_Action
This simplifies SearchKit code by reusing the new helpers added in
cf957fc
It adds an additional helper for fetching the icon associated with an action.
Also fixes an action name in the CustomField DAO which did not match the name
of a CRM_Core_Action (renamed 'move' to 'detach' which is the convention other entities use).
demeritcowboy [Sun, 25 Jun 2023 23:45:57 +0000 (19:45 -0400)]
don't show reserved groups
Eileen McNaughton [Sun, 25 Jun 2023 21:46:27 +0000 (14:46 -0700)]
Add capitalize filter to tokens
colemanw [Sun, 25 Jun 2023 21:41:07 +0000 (14:41 -0700)]
Merge pull request #26660 from eileenmcnaughton/custom_group
Move Custom Group search test to extension, remove xml brittleness
Tim Otten [Sun, 25 Jun 2023 20:41:29 +0000 (13:41 -0700)]
(NFC) Comment to explain use-case for $requestedLocale
Eileen McNaughton [Sun, 25 Jun 2023 00:36:11 +0000 (17:36 -0700)]
Follow up to #26618 - set locale consistently when exporting model
Eileen McNaughton [Sun, 25 Jun 2023 19:41:35 +0000 (12:41 -0700)]
Add survey tokens
Eileen McNaughton [Sun, 25 Jun 2023 19:38:59 +0000 (12:38 -0700)]
Merge pull request #26658 from colemanw/autoLinks2
[REF] Switch a bunch of core pages to use auto-links
Eileen McNaughton [Sun, 25 Jun 2023 17:06:55 +0000 (10:06 -0700)]
Move Custom Group search test to extension, remove xml brittleness
Tim Otten [Sun, 25 Jun 2023 18:35:37 +0000 (11:35 -0700)]
Merge pull request #26656 from totten/master-standalone-dbg
Standalone - Suppress debug output
colemanw [Sun, 25 Jun 2023 15:59:11 +0000 (08:59 -0700)]
Merge pull request #26652 from eileenmcnaughton/pet
Remove copy-and-paste comment
colemanw [Sun, 25 Jun 2023 15:58:39 +0000 (08:58 -0700)]
Merge pull request #26653 from eileenmcnaughton/survey
Add apiv4 Survey entity
colemanw [Sun, 25 Jun 2023 04:39:11 +0000 (00:39 -0400)]
Switch to autoLinks for MailingComponent page
colemanw [Sun, 25 Jun 2023 01:53:18 +0000 (20:53 -0500)]
Switch to autoLinks for MailSettings page
colemanw [Sun, 25 Jun 2023 01:48:45 +0000 (20:48 -0500)]
Switch to autoLinks for MembershipStatus page
colemanw [Sun, 25 Jun 2023 01:36:40 +0000 (20:36 -0500)]
Switch to autoLinks for PaymentProcessor page
colemanw [Sun, 25 Jun 2023 01:32:15 +0000 (20:32 -0500)]
Switch to autoLinks for ParticipantStatusType page
colemanw [Sun, 25 Jun 2023 01:25:59 +0000 (20:25 -0500)]
Switch to autoLinks for RelationshipType page
colemanw [Sun, 25 Jun 2023 01:20:30 +0000 (20:20 -0500)]
Switch to autoLinks for PaymentProcessorType page
colemanw [Sun, 25 Jun 2023 00:52:48 +0000 (19:52 -0500)]
Switch to autoLinks for DatePreferences page
colemanw [Sun, 25 Jun 2023 00:51:33 +0000 (19:51 -0500)]
Switch to autoLinks for contactType and locationType
colemanw [Sun, 25 Jun 2023 00:30:47 +0000 (19:30 -0500)]
Switch to autoLinks for SMSProvider page
colemanw [Sun, 25 Jun 2023 00:14:19 +0000 (19:14 -0500)]
CRM_Core_Page_Basic - Cleanup copy-pasta comments
colemanw [Sat, 24 Jun 2023 23:51:48 +0000 (18:51 -0500)]
Switch to autoLinks for ACLEntityRole page
Tim Otten [Sat, 24 Jun 2023 23:38:37 +0000 (16:38 -0700)]
Standalone - Suppress debug output
Eileen McNaughton [Sun, 25 Jun 2023 06:03:59 +0000 (23:03 -0700)]
Merge pull request #26644 from colemanw/autoLinks
REF - Auto-generate links for CRM_Core_Page_Basic
Eileen McNaughton [Sun, 25 Jun 2023 05:37:38 +0000 (22:37 -0700)]
Add apiv4 Survey entity
Eileen McNaughton [Sun, 25 Jun 2023 05:36:21 +0000 (22:36 -0700)]
Remove copy-and-paste comment
colemanw [Sat, 24 Jun 2023 15:46:42 +0000 (08:46 -0700)]
REF - Auto-generate links for CRM_Core_Page_Basic
Instead of hard-coding an array of links in every page, we can auto-generate the list
based on the 'paths' metadata in the DAO. As a POC this converts one page (ACLs).
Future conversions are simply a matter of ensuring 'paths' is defined then deleting the
links function and $_links variable.
Tim Otten [Sat, 24 Jun 2023 23:34:14 +0000 (16:34 -0700)]
Standalone - Fix generation of absolute URLs
Tim Otten [Sat, 24 Jun 2023 23:23:03 +0000 (16:23 -0700)]
Standalone bootstrap - Guard against variations in trailing /
Seamus Lee [Sat, 24 Jun 2023 23:54:06 +0000 (19:54 -0400)]
Merge pull request #26640 from eileenmcnaughton/processor_clean
[Test] Clean up payment processors when cleaning up other related entities
Tim Otten [Sat, 24 Jun 2023 22:49:17 +0000 (15:49 -0700)]
standaloneusers - Convert SecurityTest from headless to e2e
Tim Otten [Sat, 24 Jun 2023 22:48:51 +0000 (15:48 -0700)]
standaloneusers - Slightly relax install check to allow headless.
Tim Otten [Sat, 24 Jun 2023 22:45:58 +0000 (15:45 -0700)]
(NFC) SecurityTest - Apply the changes that PHPStorm yearns for
Eileen McNaughton [Sat, 24 Jun 2023 22:21:24 +0000 (15:21 -0700)]
Merge pull request #26648 from eileenmcnaughton/ufmatch
Fix test to not use brittle xml, remove redundant crud tests
Eileen McNaughton [Sat, 24 Jun 2023 21:16:02 +0000 (14:16 -0700)]
Fix test to not use brittle xml, remove redundant crud tests
Eileen McNaughton [Sat, 24 Jun 2023 21:03:34 +0000 (14:03 -0700)]
Merge pull request #26647 from colemanw/mappingCleanup
REF - Code cleanup and notice fixes in scheduled reminders
colemanw [Sat, 24 Jun 2023 19:49:35 +0000 (12:49 -0700)]
Merge pull request #26645 from eileenmcnaughton/ufjoin
Update UFJoin test to not use brittle xml set up
colemanw [Sat, 24 Jun 2023 19:18:45 +0000 (12:18 -0700)]
REF - Code cleanup and notice fixes in scheduled reminders
Eileen McNaughton [Sat, 24 Jun 2023 17:42:40 +0000 (10:42 -0700)]
Merge pull request #26634 from eileenmcnaughton/civi_unit
Fix some test cleanup routines
Eileen McNaughton [Sat, 24 Jun 2023 17:07:09 +0000 (10:07 -0700)]
Update UFJoin test to not use brittle xml set up
This also removes a bunch of tests that are redundant due to
the various other levels of api & entity testing & does other
minor cleanup like fixing expected & actual variables to be in the right order
A cause of test fails for
https://github.com/civicrm/civicrm-core/pull/26546
Eileen McNaughton [Fri, 23 Jun 2023 23:43:02 +0000 (16:43 -0700)]
Fix some test cleanup routines
colemanw [Sat, 24 Jun 2023 16:04:52 +0000 (09:04 -0700)]
Merge pull request #26638 from eileenmcnaughton/uf
Cleanup Apiv3-UfField test
colemanw [Sat, 24 Jun 2023 14:06:31 +0000 (07:06 -0700)]
Merge pull request #26595 from totten/ts-warn
(REF) Convert dynamic translations from `ts()` to `_ts()`
colemanw [Sat, 24 Jun 2023 13:49:05 +0000 (06:49 -0700)]
Merge pull request #26639 from colemanw/acl_search_display_2
API/SearchKit - Improve dynamic pseudoconstant lookups and ACL adminU…
Tim Otten [Sat, 24 Jun 2023 06:48:09 +0000 (23:48 -0700)]
standaloneusers - Update README
Tim Otten [Sat, 24 Jun 2023 06:25:17 +0000 (23:25 -0700)]
standaloneusers - Allow installer to customize initial user account
Before: The initial admin account is always "admin" with a random password.
After: The initial admin account has *default* as above, but it can be customized.
* For `cv`, this looks like `cv core:install -m extras.adminUser=alice -m extras.adminPass=SECRET `
* In the future, the same pathway can be used for web-based installer.
Tim Otten [Sat, 24 Jun 2023 02:28:08 +0000 (19:28 -0700)]
Auto-enable `standaloneusers` when installing `Standalone`
Tim Otten [Sat, 24 Jun 2023 02:17:28 +0000 (19:17 -0700)]
standaloneusers - Auto-enable password login
Tim Otten [Sat, 24 Jun 2023 05:48:35 +0000 (22:48 -0700)]
standaloneusers - Enforce "Standalone" pre-req without modifying global state
Eileen McNaughton [Sat, 24 Jun 2023 05:33:13 +0000 (22:33 -0700)]
Merge pull request #26641 from civicrm/5.63
5.63 to master
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
Eileen McNaughton [Sat, 24 Jun 2023 05:27:16 +0000 (22:27 -0700)]
[Test] Clean up payment processors when cleaning up other related entities
Eileen McNaughton [Sat, 24 Jun 2023 03:18:50 +0000 (20:18 -0700)]
Cleanup Apiv3-UfField test
Stop using xml for set up, other minor fixes, remove tests that are very well covered elsewhere
(basic api wrapper & crud)
colemanw [Sat, 24 Jun 2023 03:54:31 +0000 (20:54 -0700)]
API/SearchKit - Improve dynamic pseudoconstant lookups and ACL adminUI table
colemanw [Sat, 24 Jun 2023 03:50:43 +0000 (23:50 -0400)]
Merge pull request #26624 from seamuslee001/acl_search_display
Add Search Display of ACLs
colemanw [Sat, 24 Jun 2023 03:16:03 +0000 (20:16 -0700)]
Fix APIv3 conformanceTest when a field has no options (band-aid)
demeritcowboy [Sat, 24 Jun 2023 02:57:27 +0000 (22:57 -0400)]
Merge pull request #26585 from colemanw/crmMailingRecipientsSet
CiviMail - New autocompletes for selecting recipients
Seamus Lee [Sat, 24 Jun 2023 02:38:35 +0000 (19:38 -0700)]
Merge pull request #26574 from eileenmcnaughton/event_preview_template_update
Update online event workflow template for more consistent participant amount data and preview-ability
Seamus Lee [Sat, 24 Jun 2023 02:10:00 +0000 (19:10 -0700)]
Merge pull request #26632 from eileenmcnaughton/deploy_id
Add deployID to civicrm.settings.php
Eileen McNaughton [Mon, 19 Jun 2023 10:40:59 +0000 (22:40 +1200)]
Update online_event_template to use workflow message
This updates the default online event template to use the variables assigned by
the workflow template
This works to standardise the variables previously in dataArray
, lineItem, totalAmount, taxAmount to reflect the
approach in other templates per
https://docs.civicrm.org/user/en/latest/email/message-templates/#variables-and-tokens-in-workflow-message-templates
However, for participants, per the helpful discussion at
https://github.com/civicrm/civicrm-core/pull/24576
the expectation is that the primaryParticipant gets the values for
all participants whereas the others only get line items,
tax breakdowns, totals that relate to them.
Hence I have assigned an array participants that holds detials for all participants
and the template iterates through them showing all or just the
one that relates to the assigned participant id depending on
whether it is primary.
This allows the template to display in the Message preview and should
also mean that those values that I have addressed will always reflect
the participantID being used. This also addresses some notices
and incompatibility with secure smarty.
However, there are still values I haven't made sense of, or otherwise left
out of the scope of this PR in the template.
Also note I updated the taxBreakdown in the contribution trait - I decided it
was cloberring the amount as it iterated through the line items - rather than
doing a running total.
colemanw [Sat, 24 Jun 2023 00:27:52 +0000 (20:27 -0400)]
Merge pull request #26625 from larssandergreen/Group-delete-fix
Fix group count for delete confirmation
Seamus Lee [Sat, 24 Jun 2023 00:20:24 +0000 (17:20 -0700)]
Merge pull request #26635 from eileenmcnaughton/test_tidy
Very minor test cleanup
Seamus Lee [Sat, 24 Jun 2023 00:20:05 +0000 (17:20 -0700)]
Merge pull request #26633 from eileenmcnaughton/cont_status
Contribution WorkflowTrait updates to support event template changes
Eileen McNaughton [Fri, 23 Jun 2023 23:45:21 +0000 (16:45 -0700)]
Very minor test cleanup
Eileen McNaughton [Fri, 23 Jun 2023 23:41:27 +0000 (16:41 -0700)]
Contribution WorkflowTrait updates to support event template changes
Eileen McNaughton [Fri, 23 Jun 2023 23:31:02 +0000 (16:31 -0700)]
Add deployID to civicrm.settings.php
Eileen McNaughton [Fri, 23 Jun 2023 23:21:04 +0000 (16:21 -0700)]
Merge pull request #26631 from totten/master-bump-standalone
standaloneusers - Update versioning
Tim Otten [Fri, 23 Jun 2023 22:47:19 +0000 (15:47 -0700)]
Standalone - Rerun 'civix upgrade'. Drop backports.
Tim Otten [Fri, 23 Jun 2023 22:43:54 +0000 (15:43 -0700)]
(Re-run) Set version to 5.64.alpha1 (with standaloneusers)
Tim Otten [Fri, 23 Jun 2023 22:44:08 +0000 (15:44 -0700)]
Add "standaloneusers" to list of "core-ext"s
This ensures that the `<ver>`sion tag will be incremented in parallel with the rest.
Eileen McNaughton [Fri, 23 Jun 2023 22:32:21 +0000 (15:32 -0700)]
Merge pull request #26618 from totten/bb
WorkflowMessage - Allow more dynamic-localized data. Unify language field.
Seamus Lee [Fri, 23 Jun 2023 22:27:17 +0000 (15:27 -0700)]
Merge pull request #26630 from civicrm/5.63
5.63