civicrm-core.git
2 years agoMerge pull request #23638 from jensschuppe/fix/iCalHtmlEntities
Mathieu Lu [Mon, 20 Jun 2022 15:33:36 +0000 (11:33 -0400)]
Merge pull request #23638 from jensschuppe/fix/iCalHtmlEntities

Decode HTML entities in iCalendar text

2 years agoMerge pull request #23837 from civicrm/5.51
Eileen McNaughton [Mon, 20 Jun 2022 00:52:12 +0000 (12:52 +1200)]
Merge pull request #23837 from civicrm/5.51

5.51 to master

2 years agoMerge pull request #23823 from eileenmcnaughton/contact_test
Eileen McNaughton [Mon, 20 Jun 2022 00:51:20 +0000 (12:51 +1200)]
Merge pull request #23823 from eileenmcnaughton/contact_test

dev/core#3663 fix output regression on csv output for import

2 years agoMerge pull request #23825 from colemanw/profileExport
Eileen McNaughton [Sun, 19 Jun 2022 23:41:14 +0000 (11:41 +1200)]
Merge pull request #23825 from colemanw/profileExport

APIv4 - Enable exporting profiles with custom fields

2 years agoMerge pull request #23818 from colemanw/afformDep
Eileen McNaughton [Sun, 19 Jun 2022 21:15:05 +0000 (09:15 +1200)]
Merge pull request #23818 from colemanw/afformDep

Afform - fix dependency injection for autogenerated forms

2 years agoAlways throw exception in tests for pdf out
Eileen McNaughton [Fri, 17 Jun 2022 21:52:00 +0000 (09:52 +1200)]
Always throw exception in tests for pdf out

headers_sent() was always true before and hence the tests were written to expect the
exception would be called. Fixing that caused the tests to fail - but fixing it is good

2 years agoMerge pull request #23832 from demeritcowboy/casedetails-static
Eileen McNaughton [Fri, 17 Jun 2022 22:14:57 +0000 (10:14 +1200)]
Merge pull request #23832 from demeritcowboy/casedetails-static

dev/core#2983 - Make static function static - AJAX::caseDetails()

2 years agomake static function static
demeritcowboy [Fri, 17 Jun 2022 18:24:06 +0000 (14:24 -0400)]
make static function static

2 years agoAPIv4 - Enable exporting profiles with custom fields
Coleman Watts [Fri, 17 Jun 2022 01:18:03 +0000 (21:18 -0400)]
APIv4 - Enable exporting profiles with custom fields

Before: Impossible to export a profile with custom fields as a managed entity because of the dependence on custom ids as the fieldname.

After: Uses APIv4-style names when exporting custom fields for profiles, which makes them portable.

2 years agoMerge pull request #23816 from eileenmcnaughton/inv_org
demeritcowboy [Fri, 17 Jun 2022 16:13:42 +0000 (12:13 -0400)]
Merge pull request #23816 from eileenmcnaughton/inv_org

Fix double organization name in invoice, use token

2 years agoMerge pull request #23827 from eileenmcnaughton/empty_date
Tim Otten [Fri, 17 Jun 2022 06:03:23 +0000 (23:03 -0700)]
Merge pull request #23827 from eileenmcnaughton/empty_date

Handle empty date token gracefully

2 years agoHandle empty date token gracefully
Eileen McNaughton [Fri, 17 Jun 2022 04:15:51 +0000 (16:15 +1200)]
Handle empty date token gracefully

2 years agoOutput to stdErr rather than echo
Eileen McNaughton [Fri, 17 Jun 2022 03:39:02 +0000 (15:39 +1200)]
Output to stdErr rather than echo

2 years agoMerge pull request #23824 from totten/mixin-refresh
colemanw [Fri, 17 Jun 2022 03:08:35 +0000 (23:08 -0400)]
Merge pull request #23824 from totten/mixin-refresh

(dev/core#3660) Ensure that rebuildMenuAndCaches has current mixins+classloaders

2 years agodev/core#3663 fix output regression on csv output
Eileen McNaughton [Fri, 17 Jun 2022 00:11:12 +0000 (12:11 +1200)]
dev/core#3663 fix output regression on csv output

This fixes a very-recent rc regression whereby the file error output was
not correctly referring to the fields to be exported.

Note that in order to make it testable I had to
- remove header-setting that duplicates work done by the csv package
- remove extraneous echos in the GenCode

2 years ago(dev/core#3660) Ensure that rebuildMenuAndCaches has current mixins+classloaders
Tim Otten [Fri, 17 Jun 2022 00:00:48 +0000 (17:00 -0700)]
(dev/core#3660) Ensure that rebuildMenuAndCaches has current mixins+classloaders

Overview
--------

This fixes an issue in transitioning from `hook_managed` to `mixin/mgd-php@1`, wherein
managed-entities are briefly deleted (but later recreated).

Steps to Reproduce
------------------

1. (Web) Install an extension with a revision that uses `hook_managed`
2. (CLI) Switch the extension to a revision that uses `mixin/mgd-php@1`
3. (CLI) View contents of `civicrm_managed`
4. (Web) Run `civicrm/menu/rebuild`
5. (CLI) View contents of `civicrm_managed`
6. (Web) Run `civicrm/menu/rebuild`
7. (CLI) View contents of `civicrm_managed`

Before
------

While processing step 4 (`civicrm/menu/rebuild`), it fails to run the hooks for `mgd-php`.

Consequently, the list of managed-entities is lost and will disappear at step 5.

After
-----

While processing step 4 (`civicrm/menu/rebuild`), it activates the hooks for `mgd-php`.

Technical Details
------------------

When processing `civicrm/menu/rebuild`, there are a couple big substeps:

* `Civi\Core\Container::boot()` - During this process, it loads extensions. As usual,
  this reads cached metadata, sets up classloaders, sets up mixins/hooks, etc.
* `CRM_Core_Invoke::rebuildMenuAndCaches()` - During this process, it clears
  out caches and rebuilds several things (menus, managed-entities, etc).

The problem is this:

* The cache used during `boot()` has stale metadata (specifically,
  `civicrm_cache` has old values of `mixinScan` and `mixinBoot`).
  So it doesn't setup any new mixins/hooks.
* Then `rebuildMenuAndCaches()` depends on the mixins/hooks that are already setup.
  While the function does clear persistent caches, it assumes that the
  PHP runtime environment is up-to-spec. But it's not -- becuase our hooks
  were based on the caches.

The patch uses the same `refresh()` mechanism as the extension-administration subsystem (which
has to reset the classloaders+mixins after enabling or disabling an extension).

2 years agoMerge pull request #23807 from colemanw/fixAfformTitle
Mathieu Lu [Thu, 16 Jun 2022 19:49:15 +0000 (15:49 -0400)]
Merge pull request #23807 from colemanw/fixAfformTitle

SearchKit - Only add filter values to Afform title if passed internally

2 years agoSearchKit - Only add filter values to Afform title if passed internally
Coleman Watts [Wed, 15 Jun 2022 21:49:51 +0000 (17:49 -0400)]
SearchKit - Only add filter values to Afform title if passed internally

This narrows the scope of contextual titles from #22319 to
only those filters passed internally, as used in drilldown forms.

It makes sense to exclude values from exposed filters because that
can lead to a confusing UI.

2 years agoAfform - fix dependency injection for autogenerated forms
Coleman Watts [Thu, 16 Jun 2022 14:21:24 +0000 (10:21 -0400)]
Afform - fix dependency injection for autogenerated forms

2 years agoMerge pull request #23800 from seamuslee001/ref_date_filter
demeritcowboy [Thu, 16 Jun 2022 13:54:33 +0000 (09:54 -0400)]
Merge pull request #23800 from seamuslee001/ref_date_filter

[REF] [PHP8.1] Replace usage of smarty's date_filter to ensure we don't call s…

2 years agoMerge pull request #23419 from chrisgaraffa/contactheader-regions
colemanw [Thu, 16 Jun 2022 12:47:25 +0000 (08:47 -0400)]
Merge pull request #23419 from chrisgaraffa/contactheader-regions

Add crmRegions to contact headers and associated inline forms

2 years agoMerge pull request #23817 from civicrm/5.51
Eileen McNaughton [Thu, 16 Jun 2022 10:59:11 +0000 (22:59 +1200)]
Merge pull request #23817 from civicrm/5.51

5.51 to master

2 years agoMerge pull request #23815 from seamuslee001/date_second_customformat
Eileen McNaughton [Thu, 16 Jun 2022 10:47:47 +0000 (22:47 +1200)]
Merge pull request #23815 from seamuslee001/date_second_customformat

[REF] Fix second output in customFormat function and extend unit test

2 years agoFix double organization name in invoice, use token
Eileen McNaughton [Thu, 16 Jun 2022 08:30:33 +0000 (20:30 +1200)]
Fix double organization name in invoice, use token

2 years ago[REF] Fix second output in customFormat function and extend unit test
Seamus Lee [Thu, 16 Jun 2022 07:49:51 +0000 (17:49 +1000)]
[REF] Fix second output in customFormat function and extend unit test

2 years ago[REF] Replace usage of smarty's date_filter to ensure we don't call strftime which...
Seamus Lee [Wed, 15 Jun 2022 03:20:20 +0000 (13:20 +1000)]
[REF] Replace usage of smarty's date_filter to ensure we don't call strftime which is deprecated in php8.1

Ensure start date format is the same

2 years agoMerge pull request #23806 from eileenmcnaughton/invoice_domain
Seamus Lee [Thu, 16 Jun 2022 07:39:02 +0000 (17:39 +1000)]
Merge pull request #23806 from eileenmcnaughton/invoice_domain

Invoice Workflow template - add domain tokens

2 years ago(NFC) Domain Tokens - Use consistent capitalization (title-case)
Tim Otten [Thu, 16 Jun 2022 05:56:12 +0000 (22:56 -0700)]
(NFC) Domain Tokens - Use consistent capitalization (title-case)

The current labels have mixed capitalization. Notwitstanding
one notable exception (`{action.*}`), most tokens use title-case.
So this patch applies title-case.

2 years agoMerge pull request #23697 from bsilvern/CRM-3495
Eileen McNaughton [Thu, 16 Jun 2022 04:58:47 +0000 (16:58 +1200)]
Merge pull request #23697 from bsilvern/CRM-3495

dev/core#3495 - Fix fields with wildcards in Advanced Search

2 years agoMerge pull request #23813 from totten/master-tokproc-exc
Eileen McNaughton [Thu, 16 Jun 2022 03:58:10 +0000 (15:58 +1200)]
Merge pull request #23813 from totten/master-tokproc-exc

(REF) TokenProcessor - Tweak error message

2 years agoMerge pull request #23811 from totten/master-wfmsg-dataprovider
Eileen McNaughton [Thu, 16 Jun 2022 03:06:04 +0000 (15:06 +1200)]
Merge pull request #23811 from totten/master-wfmsg-dataprovider

(REF) WorkflowMessageTest - Use dataProvider

2 years agoMerge pull request #23810 from totten/5.51-msgadm-htmlraw
Eileen McNaughton [Thu, 16 Jun 2022 02:53:04 +0000 (14:53 +1200)]
Merge pull request #23810 from totten/5.51-msgadm-htmlraw

message_admin - Enable another preview mode ("HTML (Raw)")

2 years agoMerge pull request #23814 from civicrm/5.51
Eileen McNaughton [Thu, 16 Jun 2022 02:45:39 +0000 (14:45 +1200)]
Merge pull request #23814 from civicrm/5.51

5.51 to master

2 years agoTokenProcessor - Tweak error message
Tim Otten [Wed, 15 Jun 2022 09:16:18 +0000 (02:16 -0700)]
TokenProcessor - Tweak error message

2 years ago(REF) WorkflowMessageTest - Use dataProvider
Tim Otten [Wed, 15 Jun 2022 08:12:28 +0000 (01:12 -0700)]
(REF) WorkflowMessageTest - Use dataProvider

2 years agomessage_admin - Enable another preview mode ("HTML (Raw)")
Tim Otten [Thu, 16 Jun 2022 01:04:58 +0000 (18:04 -0700)]
message_admin - Enable another preview mode ("HTML (Raw)")

This is similar to the "HTML" preview, except it shows the raw HTML (with syntax highlighting).

2 years agoMerge pull request #23801 from eileenmcnaughton/cont_work
Tim Otten [Thu, 16 Jun 2022 01:03:59 +0000 (18:03 -0700)]
Merge pull request #23801 from eileenmcnaughton/cont_work

Fix breakage in message preview on workflow contributions

2 years agoMerge pull request #23768 from mlutfy/cloud17
Tim Otten [Thu, 16 Jun 2022 00:30:03 +0000 (17:30 -0700)]
Merge pull request #23768 from mlutfy/cloud17

dev/core#3542 Store extdir cache in sqlcache rather than the filesystem

2 years agoMerge pull request #23723 from mattwire/ufmatchsearchkit
Seamus Lee [Thu, 16 Jun 2022 00:20:11 +0000 (10:20 +1000)]
Merge pull request #23723 from mattwire/ufmatchsearchkit

Allow UFMatch to be used in SearchKit - this allows you to filter by eg. 'has a CMS account'

2 years agoMerge pull request #23790 from mattwire/editcontributionlinkshook
colemanw [Wed, 15 Jun 2022 22:21:34 +0000 (18:21 -0400)]
Merge pull request #23790 from mattwire/editcontributionlinkshook

Add hook to modify 'contribution payment links'

2 years agoMetadata - Add title for UfMatch entity
Coleman Watts [Wed, 15 Jun 2022 21:15:04 +0000 (17:15 -0400)]
Metadata - Add title for UfMatch entity

2 years agoInvoice Workflow template - add domain tokens
Eileen McNaughton [Wed, 15 Jun 2022 13:07:12 +0000 (01:07 +1200)]
Invoice Workflow template - add domain tokens

2 years agoAdd hook to modify 'contribution payment links'
Matthew Wire [Tue, 14 Jun 2022 17:42:02 +0000 (18:42 +0100)]
Add hook to modify 'contribution payment links'

2 years agoMerge pull request #23805 from mattwire/devfinancial197alt
Monish Deb [Wed, 15 Jun 2022 14:43:43 +0000 (20:13 +0530)]
Merge pull request #23805 from mattwire/devfinancial197alt

dev/financial#197 Revert freezing on total_amount field on recurring form (alt to #23796)

2 years agodev/cloud-native#17 Store extdir cache in sqlcache rather than the filesystem
Mathieu Lutfy [Sat, 11 Jun 2022 14:19:11 +0000 (10:19 -0400)]
dev/cloud-native#17 Store extdir cache in sqlcache rather than the filesystem

2 years agoMerge pull request #23799 from turrisxyz/Pinned-Dependencies-GitHub
demeritcowboy [Wed, 15 Jun 2022 12:50:14 +0000 (08:50 -0400)]
Merge pull request #23799 from turrisxyz/Pinned-Dependencies-GitHub

chore: Set permissions for GitHub actions

2 years agoRevert freezing on total_amount field on recurring form
Matthew Wire [Wed, 15 Jun 2022 11:21:39 +0000 (12:21 +0100)]
Revert freezing on total_amount field on recurring form

2 years agoMerge pull request #23798 from seamuslee001/fix_auto_renew_membership
Monish Deb [Wed, 15 Jun 2022 11:19:47 +0000 (16:49 +0530)]
Merge pull request #23798 from seamuslee001/fix_auto_renew_membership

Fix Automatic renewal membership from front end contribution forms

2 years agoFix breakage in message preview on workflow contributions
Eileen McNaughton [Wed, 15 Jun 2022 03:44:52 +0000 (15:44 +1200)]
Fix breakage in message preview on workflow contributions

2 years agoMerge pull request #23797 from eileenmcnaughton/remove_field_types
Eileen McNaughton [Wed, 15 Jun 2022 01:41:09 +0000 (13:41 +1200)]
Merge pull request #23797 from eileenmcnaughton/remove_field_types

[REF] Remove param that has a set value

2 years agochore: Set permissions for GitHub actions
nathannaveen [Wed, 15 Jun 2022 00:59:10 +0000 (00:59 +0000)]
chore: Set permissions for GitHub actions

 Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: nathannaveen <42319948+nathannaveen@users.noreply.github.com>
2 years ago[REF] Fix Automatic renewal membership from front end contribution forms
Seamus Lee [Tue, 14 Jun 2022 23:49:26 +0000 (09:49 +1000)]
[REF] Fix Automatic renewal membership from front end contribution forms

Properly fix regression and update unit tests to match what the form does

2 years agoMerge pull request #23774 from demeritcowboy/recur-curious
Seamus Lee [Tue, 14 Jun 2022 23:53:48 +0000 (09:53 +1000)]
Merge pull request #23774 from demeritcowboy/recur-curious

dev/financial#199 - Add failing test to demonstrate the problem

2 years ago[REF] Remove param that has a set value
Eileen McNaughton [Tue, 14 Jun 2022 23:33:13 +0000 (11:33 +1200)]
[REF] Remove param that has a set value

2 years agoMerge pull request #23785 from totten/5.51-hook-log
Tim Otten [Tue, 14 Jun 2022 21:11:43 +0000 (14:11 -0700)]
Merge pull request #23785 from totten/5.51-hook-log

dev/core#3502 - CiviEventDispatcher - Softer errors for not-ready. More comments.

2 years agoMerge pull request #23789 from civicrm/5.51
Eileen McNaughton [Tue, 14 Jun 2022 20:56:13 +0000 (08:56 +1200)]
Merge pull request #23789 from civicrm/5.51

5.51

2 years agoMerge pull request #23753 from eileenmcnaughton/import_validate_int
colemanw [Tue, 14 Jun 2022 20:13:04 +0000 (16:13 -0400)]
Merge pull request #23753 from eileenmcnaughton/import_validate_int

Add integer validation to import

2 years agoMerge pull request #23763 from eileenmcnaughton/act_test
colemanw [Tue, 14 Jun 2022 20:12:21 +0000 (16:12 -0400)]
Merge pull request #23763 from eileenmcnaughton/act_test

Fix target contact label back to include target

2 years agoMerge pull request #23764 from eileenmcnaughton/activity_update_mutli
colemanw [Tue, 14 Jun 2022 20:11:37 +0000 (16:11 -0400)]
Merge pull request #23764 from eileenmcnaughton/activity_update_mutli

dev/core#2706 dev/core#2308 fix activity import to update multi-select fields

2 years agoMerge pull request #23749 from colemanw/uiUtils
Eileen McNaughton [Tue, 14 Jun 2022 20:10:57 +0000 (08:10 +1200)]
Merge pull request #23749 from colemanw/uiUtils

AngularJS - Remove UI-Utils library

2 years agoMerge pull request #23788 from ufundo/5.51
Eileen McNaughton [Tue, 14 Jun 2022 20:08:40 +0000 (08:08 +1200)]
Merge pull request #23788 from ufundo/5.51

only check batch currency match when adding a financial_trxn

2 years agoMerge pull request #23791 from mattwire/phpnotice1
Eileen McNaughton [Tue, 14 Jun 2022 20:05:17 +0000 (08:05 +1200)]
Merge pull request #23791 from mattwire/phpnotice1

NFC: Fix PHP notice on ContributionRecurSelector.tpl

2 years agoMerge pull request #23792 from mattwire/recordrefund
Eileen McNaughton [Tue, 14 Jun 2022 19:33:31 +0000 (07:33 +1200)]
Merge pull request #23792 from mattwire/recordrefund

Make it clear what "record refund" form does

2 years agoMake it clear what record refund form does
Matthew Wire [Tue, 14 Jun 2022 17:56:40 +0000 (18:56 +0100)]
Make it clear what record refund form does

2 years agoFix PHP notice
Matthew Wire [Tue, 14 Jun 2022 17:53:47 +0000 (18:53 +0100)]
Fix PHP notice

2 years agoMerge pull request #23786 from mattwire/devfinancial199
demeritcowboy [Tue, 14 Jun 2022 17:12:47 +0000 (13:12 -0400)]
Merge pull request #23786 from mattwire/devfinancial199

dev/financial#199 Fix additional details on edit template contribution

2 years agoFix additional details on edit template contribution
Matthew Wire [Tue, 14 Jun 2022 14:45:13 +0000 (15:45 +0100)]
Fix additional details on edit template contribution

2 years agoonly check batch currency match when adding a financial_trxn
ufundo [Thu, 9 Jun 2022 16:29:32 +0000 (16:29 +0000)]
only check batch currency match when adding a financial_trxn

2 years agodev/core#3502 - CiviEventDispatcher - Tune down the warning
Tim Otten [Thu, 9 Jun 2022 04:17:51 +0000 (21:17 -0700)]
dev/core#3502 - CiviEventDispatcher - Tune down the warning

2 years agodev/core#3502 - CiviEventDispatcher - Tweak error message. Add explanation.
Tim Otten [Thu, 9 Jun 2022 02:14:04 +0000 (19:14 -0700)]
dev/core#3502 - CiviEventDispatcher - Tweak error message. Add explanation.

2 years agoMerge pull request #23783 from totten/5.51-snapshots
Eileen McNaughton [Tue, 14 Jun 2022 03:58:59 +0000 (15:58 +1200)]
Merge pull request #23783 from totten/5.51-snapshots

FiveFiftyOne - Enable snapshots for data modified data

2 years agoFiveFiftyOne - Enable snapshots for data modified data
Tim Otten [Tue, 14 Jun 2022 02:06:05 +0000 (19:06 -0700)]
FiveFiftyOne - Enable snapshots for data modified data

Before
------

The 5.51.alpha upgrade modifies a some data-structures (`civicrm_mapping_*`, `civicrm_queue`),
but it doesn't take any snapshots.

After
-----

It does snapshots.

Comments
--------

Both tables should generally be quite small.

Strictly, the `civicrm_mapping_*` updates are more in-place modifications,
so that's more important.  The `civicrm_queue` changes are only adding new
columns.  But the table is so small - it doesn't hurt.

I suppose one could argue that these particular fields aren't likely to have
problems - but it's important to get in the habit of enabling snapshots so
that we have them when they do matter.

2 years agoMerge pull request #23781 from civicrm/5.51
Eileen McNaughton [Tue, 14 Jun 2022 00:00:58 +0000 (12:00 +1200)]
Merge pull request #23781 from civicrm/5.51

5.51 to master

2 years agoMerge pull request #23771 from eileenmcnaughton/cont_update
Eileen McNaughton [Tue, 14 Jun 2022 00:00:29 +0000 (12:00 +1200)]
Merge pull request #23771 from eileenmcnaughton/cont_update

dev/core#3651 dev/core#1337 Fix failure to show last column data in output, spaces in names

2 years agoadd failing test
demeritcowboy [Sun, 12 Jun 2022 21:17:17 +0000 (17:17 -0400)]
add failing test

2 years agoMerge pull request #23780 from totten/5.51-hush
Eileen McNaughton [Mon, 13 Jun 2022 22:19:02 +0000 (10:19 +1200)]
Merge pull request #23780 from totten/5.51-hush

(dev/core#3653) CRM_Queue_Runner - Fix upgrade warnings. Extract disableBackgroundExecution().

2 years agoMerge pull request #23776 from eileenmcnaughton/electro
Tim Otten [Mon, 13 Jun 2022 20:42:19 +0000 (13:42 -0700)]
Merge pull request #23776 from eileenmcnaughton/electro

(dev/core#2198) Switch to more maintained phpQuery

2 years agoMerge pull request #23766 from eileenmcnaughton/cont_up
Tim Otten [Mon, 13 Jun 2022 20:34:06 +0000 (13:34 -0700)]
Merge pull request #23766 from eileenmcnaughton/cont_up

dev/core#3513 Remove 'done' from sumary/import monitoring page

2 years agoCRM_Queue_Runner - Fix upgrade warnings. Extract disableBackgroundExecution().
Tim Otten [Mon, 13 Jun 2022 19:55:51 +0000 (12:55 -0700)]
CRM_Queue_Runner - Fix upgrade warnings. Extract disableBackgroundExecution().

This is a revision to #23775.  As before, it prevents a hard error when
upgrading to 5.51.  However, the try-catch produces confusing error messages
in the `CiviCRM.log.*` (ie they indicate a SQL error, but the situation is
actually a normal/expected during upgrade).  This avoids the error messages.

Tested (`r-run`) with `civicrm/upgrade`, `drush civicrm-upgrade-db`, and `cv
upgrade:db` -- for both 5.45=>5.51 and 5.45=>5.49=>5.51.

2 years agoMerge pull request #23741 from ufundo/entitybatchcurrency
Matthew Wire [Mon, 13 Jun 2022 16:24:07 +0000 (17:24 +0100)]
Merge pull request #23741 from ufundo/entitybatchcurrency

only check batch currency match when adding a financial_trxn

2 years agoMerge pull request #23777 from darrick/fix_import_disableUSPS
Eileen McNaughton [Mon, 13 Jun 2022 06:01:48 +0000 (18:01 +1200)]
Merge pull request #23777 from darrick/fix_import_disableUSPS

fix disableUSPS since import running in separate context of Queue.

2 years agofix disableUSPS since import running in separate context of Queue.
Darrick Servis [Sat, 11 Jun 2022 22:53:56 +0000 (15:53 -0700)]
fix disableUSPS since import running in separate context of Queue.

2 years agoMerge pull request #23778 from civicrm/5.51
Eileen McNaughton [Mon, 13 Jun 2022 02:40:28 +0000 (14:40 +1200)]
Merge pull request #23778 from civicrm/5.51

5.51

2 years agoMerge pull request #23775 from eileenmcnaughton/5.51
demeritcowboy [Mon, 13 Jun 2022 00:54:20 +0000 (20:54 -0400)]
Merge pull request #23775 from eileenmcnaughton/5.51

dev/core#3653 Fix on queue runner not working in upgrade

2 years agodev/core#2198 switch to more mainted phpquery
Eileen McNaughton [Sun, 12 Jun 2022 23:09:22 +0000 (11:09 +1200)]
dev/core#2198 switch to more mainted phpquery

2 years agodev/core#3653 Fix on queue runner not working in upgrade
Eileen McNaughton [Sun, 12 Jun 2022 22:13:07 +0000 (10:13 +1200)]
dev/core#3653 Fix on queue runner not working in upgrade

2 years agoMerge pull request #23773 from civicrm/5.51
Eileen McNaughton [Sun, 12 Jun 2022 06:06:01 +0000 (18:06 +1200)]
Merge pull request #23773 from civicrm/5.51

5.51 to master

2 years agoMerge pull request #23772 from eileenmcnaughton/cont_contact_fields
Eileen McNaughton [Sun, 12 Jun 2022 06:03:38 +0000 (18:03 +1200)]
Merge pull request #23772 from eileenmcnaughton/cont_contact_fields

Fix import regression - contribution import borks on do_not_import

2 years agoMerge pull request #23757 from colemanw/dupeFixAgain
Eileen McNaughton [Sun, 12 Jun 2022 00:29:37 +0000 (12:29 +1200)]
Merge pull request #23757 from colemanw/dupeFixAgain

Deduepe - Fix form buttons (again)

2 years agodev/core#3651 dev/core#1337 Fix failure to show last column data in output, spaces...
Eileen McNaughton [Sat, 11 Jun 2022 23:36:09 +0000 (11:36 +1200)]
dev/core#3651 dev/core#1337 Fix failure to show last column data in output, spaces in names

2 years agoFix import regression - contribution import borks on do_not_import
Eileen McNaughton [Sun, 12 Jun 2022 00:21:18 +0000 (12:21 +1200)]
Fix import regression - contribution import borks on do_not_import

2 years agoMerge pull request #23769 from civicrm/5.51
demeritcowboy [Sat, 11 Jun 2022 21:15:22 +0000 (17:15 -0400)]
Merge pull request #23769 from civicrm/5.51

5.51

2 years agodev/core#3513 Remove 'done' from sumary/import monitoring page
Eileen McNaughton [Sat, 11 Jun 2022 02:59:20 +0000 (14:59 +1200)]
dev/core#3513 Remove 'done' from sumary/import monitoring page

See dev/core#3513 for why it's confusing

2 years agoMerge pull request #23759 from colemanw/fixTotalCount
demeritcowboy [Sat, 11 Jun 2022 19:38:42 +0000 (15:38 -0400)]
Merge pull request #23759 from colemanw/fixTotalCount

[REGRESSION] SearchKit - Fix angular console error when totalCount is not given

2 years agoMerge pull request #23754 from eileenmcnaughton/act_date
demeritcowboy [Sat, 11 Jun 2022 19:19:38 +0000 (15:19 -0400)]
Merge pull request #23754 from eileenmcnaughton/act_date

dev/core#2325 import second-handling fix

2 years agoMerge pull request #21809 from demeritcowboy/site-path
colemanw [Sat, 11 Jun 2022 18:16:38 +0000 (14:16 -0400)]
Merge pull request #21809 from demeritcowboy/site-path

dev/drupal#167 - Deprecated service to be removed in Drupal 10

2 years agoMerge pull request #23765 from eileenmcnaughton/guzzle_it
colemanw [Sat, 11 Jun 2022 15:41:21 +0000 (11:41 -0400)]
Merge pull request #23765 from eileenmcnaughton/guzzle_it

Catch & convert Guzzle exception

2 years agoMerge pull request #23758 from colemanw/noCiviGrant
demeritcowboy [Sat, 11 Jun 2022 15:37:01 +0000 (11:37 -0400)]
Merge pull request #23758 from colemanw/noCiviGrant

Setup - Remove CiviGrant from available components

2 years agoMerge pull request #23760 from eileenmcnaughton/validate_fields
colemanw [Sat, 11 Jun 2022 14:11:06 +0000 (10:11 -0400)]
Merge pull request #23760 from eileenmcnaughton/validate_fields

dev/core#3511 Improve handling of invalid saved mapping fields

2 years agoMerge pull request #23761 from eileenmcnaughton/invalid_state_with_country
colemanw [Sat, 11 Jun 2022 13:56:47 +0000 (09:56 -0400)]
Merge pull request #23761 from eileenmcnaughton/invalid_state_with_country

dev/core#3512 fix rc fatal error when state is invalid