Tim Otten [Fri, 4 Mar 2022 23:03:19 +0000 (15:03 -0800)]
Set version to 5.47.0
Tim Otten [Fri, 4 Mar 2022 21:59:11 +0000 (13:59 -0800)]
Merge pull request #22881 from colemanw/civiGrantFixSecondAttempt
CiviGrant install fix second attempt
Tim Otten [Fri, 4 Mar 2022 04:37:43 +0000 (20:37 -0800)]
FiveFortySeven - Ensure that `civicrm_search_display` is up-to-date
Note: This step was added to the codebase circa 5.47. The underlying schema
change actually originated circa 5.46. The step should be idempotent.
Tim Otten [Fri, 4 Mar 2022 00:37:38 +0000 (16:37 -0800)]
FiveFortySeven - Leave `civigrant` inactive during inconsistent period
Before
------
`migrateCiviGrant()` migrates some metadata from core-ownership to
core-extension-ownership... and it ALSO activates the extension. However,
the extension depends on other (possibly-inactive) extensions. This
creates an inconsistent state (where active parts of `civigrant`
depend on inactive parts of `search_kit`).
In this inconsistent state, `ManagedEntities::reconcile()` fails.
After
-----
`migrateCiviGrant()` still migrates metadata. However, it initially leaves
the extension inactive. So `ManagedEntities::reconcile()` won't try to
setup these records.
After core schema is fully resolved, then it installs all necessary
extensions using normal mechanisms (with normal ordering).
Tim Otten [Fri, 4 Mar 2022 00:29:34 +0000 (16:29 -0800)]
ManagedEntities - Ignore `$ignoreUpgradeMode`
This guard was added by
912511a359680eb72b15c595b5091fa03f8687f2 as part of
a previous approach to managing hooks during upgrades. This general
approach changed with https://github.com/civicrm/civicrm-core/pull/17126; so
17126 partially undid this... but it inadvertently had the effect of
completely disabling `reconcile()` (because this guard was left).
Coleman Watts [Thu, 3 Mar 2022 14:35:43 +0000 (09:35 -0500)]
CiviGrant - Ensure dependencies are installed
Fixes dev/core#3093
Tim Otten [Thu, 3 Mar 2022 05:48:25 +0000 (21:48 -0800)]
Upgrader - Add enable extension as a reusable upgrade task
Seamus Lee [Thu, 3 Mar 2022 22:11:15 +0000 (09:11 +1100)]
Merge pull request #22879 from colemanw/fixUndefinedVars
Fix undeclared javascript variables
Tim Otten [Thu, 3 Mar 2022 05:34:31 +0000 (21:34 -0800)]
CRM/Upgrade - Define queue weights. Put finalization step in the queue.
Coleman Watts [Thu, 3 Mar 2022 01:13:30 +0000 (20:13 -0500)]
Fix undefined javascript variables
These variables need to be declared with the `var` keyword, or it crashes some browsers.
Tim Otten [Wed, 2 Mar 2022 06:04:34 +0000 (22:04 -0800)]
Merge pull request #22871 from totten/5.47-mem-date-test
(NFC) Membership Tests - Update assertions to match behavior circa leap-day
Tim Otten [Tue, 1 Mar 2022 06:00:03 +0000 (22:00 -0800)]
(NFC) Membership Tests - Update assertions to match behavior circa leap-day
If you run the tests on Mar 2, 2022, then some of the generated memberships
land on the leap-day in 2024. The actual behavior is have the end-date on the
last day of the month (29 Feb 2024), but the test incorrectly asserts that
it comes before (28 Feb 2024).
Seamus Lee [Tue, 1 Mar 2022 05:01:51 +0000 (16:01 +1100)]
Merge pull request #22858 from seamuslee001/update_contribution_recur_dao
[NFC] Update Contribution Recur DAO following regen
Seamus Lee [Tue, 1 Mar 2022 02:14:07 +0000 (13:14 +1100)]
Update Contribution Recur DAO following regen
demeritcowboy [Tue, 1 Mar 2022 00:53:34 +0000 (19:53 -0500)]
Merge pull request #22855 from demeritcowboy/grant-menu
dev/core#3087- Grant menu appears twice
demeritcowboy [Mon, 28 Feb 2022 22:38:02 +0000 (17:38 -0500)]
regen
demeritcowboy [Mon, 28 Feb 2022 22:28:27 +0000 (17:28 -0500)]
fix duplicate menu
demeritcowboy [Mon, 28 Feb 2022 15:03:13 +0000 (10:03 -0500)]
Merge pull request #22851 from JMAConsulting/civiGrantFields
CiviGrant - Don't return grant fields as contact fields
Monish Deb [Mon, 28 Feb 2022 13:18:11 +0000 (18:48 +0530)]
add grant_id select clause definition
Coleman Watts [Sun, 20 Feb 2022 19:30:07 +0000 (14:30 -0500)]
CiviGrant - Don't return grant fields as contact fields
Fixes dev/core#3069
demeritcowboy [Sat, 26 Feb 2022 15:35:35 +0000 (10:35 -0500)]
Merge pull request #22809 from colemanw/afformSearchKitRefresh
SearchKit - Refresh contents after saving a popup when in a block/tab
Seamus Lee [Sat, 26 Feb 2022 00:19:26 +0000 (11:19 +1100)]
Merge pull request #22833 from alifrumin/rn5.47
[NFC] first stab at 5.47 release notes
Alice Frumin [Tue, 22 Feb 2022 20:40:21 +0000 (15:40 -0500)]
[NFC] first pass at 5.47 release notes
Coleman Watts [Sun, 20 Feb 2022 23:26:46 +0000 (18:26 -0500)]
SearchKit - Refresh contents after saving a popup when in a block/tab
The auto-refresh depends on the search being inside a <form> element.
Tim Otten [Wed, 23 Feb 2022 21:03:19 +0000 (13:03 -0800)]
Merge pull request #22817 from totten/5.47-rest-q
RestTest - Skip `testNotCMSUser_q` when it's not supported
Tim Otten [Wed, 23 Feb 2022 04:52:00 +0000 (20:52 -0800)]
Skip `testNotCMSUser_q` in some environments (based on `isOldQSupported()`)
Tim Otten [Wed, 23 Feb 2022 04:21:00 +0000 (20:21 -0800)]
(REF) E2E_Extern_*RestTest - Extract `isOldQSupported()`
This patch changes the way a certain carve-out works, but it doesn't change the outcome.
Background: There are two E2E tests:
* `LegacyRestTest` extends `BaseRestTest` and targets `extern/rest.php`.
It tests `rest.php?entity=ENTITY&action=ACTION`
as well as `rest.php?q=civicrm/ENTITY/ACTION`.
* `AuthxRestTest` extends `BaseRestTest` and targets `civicrm/ajax/rest`.
It only tests `civicrm/ajax/rest?entity=ENTITY&action=ACTION`.
The `q` parameter cannot be used realiably with CMS routing
(`q=civicrm/ajax/rest&q=civicrm/ENTITY/ACTION`). So we skip testing that
combination.
The patch merely changes how the skip works.
Tim Otten [Wed, 23 Feb 2022 03:49:47 +0000 (19:49 -0800)]
Merge pull request #22815 from totten/5.47-rn546-auto
(NFC) release-notes/5.46.0.md - Re-apply auto-cleanups
Tim Otten [Tue, 22 Feb 2022 23:04:55 +0000 (15:04 -0800)]
release-notes/5.46.0.md - Auto clean (https://gist.github.com/totten/
acff49e6dd77947349a1df26d5002003)
Tim Otten [Fri, 4 Feb 2022 02:52:55 +0000 (18:52 -0800)]
release-notes.md - Update date
Tim Otten [Tue, 22 Feb 2022 22:56:40 +0000 (14:56 -0800)]
Merge pull request #22813 from alifrumin/rn5.46take2
[NFC] Second pass at release notes for 5.46
Alice Frumin [Wed, 16 Feb 2022 18:28:48 +0000 (13:28 -0500)]
[NFC] 5.46 release notes updates
colemanw [Sun, 20 Feb 2022 01:47:07 +0000 (20:47 -0500)]
Merge pull request #22791 from colemanw/civigrantPermissions
CiviGrant - Declare API permissions
Tim Otten [Sat, 19 Feb 2022 00:24:11 +0000 (16:24 -0800)]
Merge pull request #22793 from agh1/5.47.0-releasenotes-initial
5.47.0 release notes initial run
Andie Hunt [Fri, 18 Feb 2022 20:14:54 +0000 (15:14 -0500)]
5.47.0 release notes: added boilerplate
Andie Hunt [Fri, 18 Feb 2022 20:10:27 +0000 (15:10 -0500)]
5.47.0 release notes: raw from script
Coleman Watts [Fri, 18 Feb 2022 15:26:38 +0000 (10:26 -0500)]
CiviGrant - Declare API permissions
This allows the current user to access the grant api (e.g. through SearchKit)
without needing the "administer CiviCRM" permission.
Seamus Lee [Fri, 18 Feb 2022 01:38:35 +0000 (12:38 +1100)]
Merge pull request #22499 from eileenmcnaughton/fin3
Follow up fix on #22685 financial acl move to extension
demeritcowboy [Thu, 17 Feb 2022 18:25:14 +0000 (13:25 -0500)]
Merge pull request #22781 from iswilson/patch-2
Contributor key: Add Ian Wilson
Ian Wilson [Thu, 17 Feb 2022 14:28:43 +0000 (09:28 -0500)]
Contributor key: Add Ian Wilson
Eileen McNaughton [Wed, 16 Feb 2022 22:37:49 +0000 (11:37 +1300)]
Merge pull request #22779 from eileenmcnaughton/pledgey
dev/core#3066 - Check CiviPledge is enabled before disconnecting pledge payments
Eileen McNaughton [Wed, 16 Feb 2022 21:20:40 +0000 (10:20 +1300)]
Merge pull request #22740 from colemanw/dev/core#3063
dev/core#3063 APIv3 - Fix numeric option matching
Ian Wilson [Mon, 14 Feb 2022 17:06:09 +0000 (12:06 -0500)]
dev/core#3066 - Add check for CiviPledge component
Check that component is enabled before attempting to disconnect pledge payments from Failed / Cancelled contributions.
Tim Otten [Fri, 11 Feb 2022 02:58:32 +0000 (18:58 -0800)]
Merge pull request #22750 from colemanw/fixProcessorPseudoconstant
Fix ContributionRecur.payment_processor_id pseudoconstant
Coleman Watts [Thu, 10 Feb 2022 19:40:06 +0000 (14:40 -0500)]
Fix ContributionRecur.payment_processor_id pseudoconstant
Before: Pseudoconstant mistakenly uses 'name' instead of title
After: Name and title are treated correctly
Coleman Watts [Wed, 9 Feb 2022 16:35:53 +0000 (11:35 -0500)]
dev/core#3063 APIv3 - Fix numeric option matching
Before: Option matching was skipped for all FK fields if a numeric value was given
After: Only skipped for `campaign_id` field, if positive integer given
The optimization was overly broad and had unintended side-effects
Eileen McNaughton [Thu, 10 Feb 2022 02:20:50 +0000 (15:20 +1300)]
Fix for #22685 financial acl aggression
Just realised this is required to make #22685 non-changey
Eileen McNaughton [Thu, 10 Feb 2022 00:07:57 +0000 (13:07 +1300)]
Merge pull request #22741 from MegaphoneJon/fix-duplicate-contact-typing
enforce required fields on Contact.duplicatecheck
colemanw [Wed, 9 Feb 2022 23:15:10 +0000 (18:15 -0500)]
Merge pull request #22714 from demeritcowboy/grant-searchbuilder
dev/core#3056 - Crash with search builder if civigrant not enabled and have admin rights
Jon Goldberg [Wed, 9 Feb 2022 20:56:11 +0000 (15:56 -0500)]
enforce required fields on Contact.duplicatecheck
demeritcowboy [Sun, 6 Feb 2022 01:06:48 +0000 (20:06 -0500)]
quickfix for crash if civigrant not enabled and have admin rights
Tim Otten [Wed, 9 Feb 2022 04:50:31 +0000 (20:50 -0800)]
Merge pull request #22727 from eileenmcnaughton/mod_money
dev/core#3059 Regression fix - be tolerant with smarty money
colemanw [Wed, 9 Feb 2022 01:22:06 +0000 (20:22 -0500)]
Merge pull request #22733 from totten/5.47-dedupe-check
(dev/core#3055) Fix dedupe check to not require elevated permissions
Jon Goldberg [Fri, 4 Feb 2022 17:14:01 +0000 (12:14 -0500)]
Fix dedupe check to not require elevated permissions
Eileen McNaughton [Tue, 8 Feb 2022 03:38:05 +0000 (16:38 +1300)]
Regression fix - be tolerant with smarty money
I've seen issues in extended reports and in core where already-formatted money from
custom fields is formatted again in the smarty layer and, with recent changes
, throwing an exception when the money is greater than 1000
(because the presence of a comma makes it invalid). This adds tolerance
that seems consistent with prior code
demeritcowboy [Mon, 7 Feb 2022 18:22:25 +0000 (13:22 -0500)]
Merge pull request #22716 from colemanw/sortableEntityFix
APIv4 SortableEntity - Fix sorting custom fields with option groups
Coleman Watts [Sun, 6 Feb 2022 20:01:20 +0000 (15:01 -0500)]
APIv4 SortableEntity - Fix sorting custom fields with option groups
Before: APIv4 would guess which fields to use for grouping when sorting by weight.
this caused a bug when sorting custom fields which also had an option_group_id, which
was incorrectly guessed to be used for grouping.
After: New `@groupWeightsBy` annotation removes the guesswork.
demeritcowboy [Mon, 7 Feb 2022 04:07:12 +0000 (23:07 -0500)]
Merge pull request #22717 from demeritcowboy/grant-stats
dev/core#3057 - Fix missing civigrant
demeritcowboy [Mon, 7 Feb 2022 02:26:17 +0000 (21:26 -0500)]
fix missing civigrant
CiviCRM [Sun, 6 Feb 2022 04:30:40 +0000 (04:30 +0000)]
Set version to 5.47.beta1
Tim Otten [Sun, 6 Feb 2022 04:09:51 +0000 (20:09 -0800)]
Merge pull request #22058 from kainuk/lecacy-auth
authx - Add configuration screen
colemanw [Sun, 6 Feb 2022 01:59:19 +0000 (20:59 -0500)]
Merge pull request #22687 from colemanw/cleanupComponentCheck
REF - Switch to using new `CRM_Core_Component::isEnabled()`
Tim Otten [Sat, 5 Feb 2022 21:47:19 +0000 (13:47 -0800)]
authx.setting.php - Add/tweak help text so it appears on the settings page.
Seamus Lee [Sat, 5 Feb 2022 22:05:38 +0000 (09:05 +1100)]
Merge pull request #22710 from braders/fulltext-template-accessibility
Improve field accessibility in legacycustomsearches
Tim Otten [Sat, 5 Feb 2022 21:16:27 +0000 (13:16 -0800)]
authx.setting.php - Change sizes and weights to make settings more readable
Klaas Eikelboom [Fri, 12 Nov 2021 19:14:35 +0000 (20:14 +0100)]
Civilint
Klaas Eikelboom [Mon, 4 Oct 2021 19:35:05 +0000 (21:35 +0200)]
This code seems obsolote
Klaas Eikelboom [Mon, 4 Oct 2021 19:34:13 +0000 (21:34 +0200)]
Add settings screen
colemanw [Sat, 5 Feb 2022 17:05:54 +0000 (12:05 -0500)]
Merge pull request #22709 from braders/dedupe-limit-smarty-notice
Don't throw PHP notice when rendering dedupefind template.
colemanw [Sat, 5 Feb 2022 15:40:18 +0000 (10:40 -0500)]
Merge pull request #19727 from totten/master-authx-rest
(dev/core#2077) Make 'civicrm/ajax/rest' interoperable with 'extern/rest.php' parameters
demeritcowboy [Sat, 5 Feb 2022 14:41:19 +0000 (09:41 -0500)]
Merge pull request #22705 from eileenmcnaughton/notice2
Enotice fixes with datepicker
Bradley Taylor [Sat, 5 Feb 2022 14:34:38 +0000 (14:34 +0000)]
Improve field accessibility in legacycustomsearches
demeritcowboy [Sat, 5 Feb 2022 14:22:00 +0000 (09:22 -0500)]
Merge pull request #22708 from braders/feature/priceset-notice-fix
Enotice fix with priceset template
Bradley Taylor [Sat, 5 Feb 2022 13:25:54 +0000 (13:25 +0000)]
Don't throw PHP notice when rendering dedupefind template.
Bradley Taylor [Sat, 5 Feb 2022 12:10:58 +0000 (12:10 +0000)]
Enotice fix with priceset template
Eileen McNaughton [Sat, 5 Feb 2022 01:23:10 +0000 (14:23 +1300)]
Enotice fixes with datepicker
Datepicker requires some fields to be set to avoid enotices (at least with grumpy mode disabled).
Eileen McNaughton [Sat, 5 Feb 2022 00:51:17 +0000 (13:51 +1300)]
Merge pull request #22704 from braders/remove-invalidprofiles-template-variable
Remove unused invalidProfiles variable, and simplify template.
Tim Otten [Sat, 5 Feb 2022 00:23:15 +0000 (16:23 -0800)]
authx - Extend support for legacy-auth to APIv4
Tim Otten [Fri, 4 Feb 2022 23:34:39 +0000 (15:34 -0800)]
Convert existing `X-Requested-With:` guards to `isWebServiceRequest()`
_Overview_: `civicrm/ajax/api4` and `returnJsonResponse()` inspect the
web-request to see if it comes via AJAX/REST. If so, the call is
allowed and formatted as JSON. The patch refines the test.
_Before_: `X-Requested-With:` signals that a call is AJAX/REST.
_After_: `X-Requested-With:` still signals that a call is AJAX/REST.
Additionally, if `authx` is enabled, then some requests will be treated as
AJAX/REST based on how they are authenticated (ie `xheader`/`X-Civi-Auth:`
and `param`/`?_authx=` are AJAX/REST).
Tim Otten [Fri, 4 Feb 2022 23:27:09 +0000 (15:27 -0800)]
(REF) CRM_Utils_REST::isWebServiceRequest - Mark public. Expand comments.
Bradley Taylor [Fri, 4 Feb 2022 19:39:03 +0000 (19:39 +0000)]
Remove unused invalidProfiles variable, and simplify template.
As well as simplifying things, this avoids PHP notices.
demeritcowboy [Fri, 4 Feb 2022 14:55:44 +0000 (09:55 -0500)]
Merge pull request #22697 from eileenmcnaughton/cont
Enotic fixes
Seamus Lee [Fri, 4 Feb 2022 02:49:02 +0000 (13:49 +1100)]
Merge pull request #22696 from civicrm/dependabot/npm_and_yarn/follow-redirects-1.14.7
Bump follow-redirects from 1.11.0 to 1.14.7
Seamus Lee [Thu, 3 Feb 2022 23:17:25 +0000 (10:17 +1100)]
Merge pull request #22695 from civicrm/dependabot/npm_and_yarn/engine.io-4.1.2
Bump engine.io from 4.1.1 to 4.1.2
Eileen McNaughton [Thu, 3 Feb 2022 22:49:50 +0000 (11:49 +1300)]
Enotic fixes
Seamus Lee [Thu, 3 Feb 2022 22:33:54 +0000 (09:33 +1100)]
Merge pull request #22693 from civicrm/dependabot/npm_and_yarn/ansi-regex-5.0.1
Bump ansi-regex from 5.0.0 to 5.0.1
dependabot[bot] [Thu, 3 Feb 2022 22:31:23 +0000 (22:31 +0000)]
Bump follow-redirects from 1.11.0 to 1.14.7
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.11.0 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.11.0...v1.14.7)
---
updated-dependencies:
- dependency-name: follow-redirects
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Eileen McNaughton [Thu, 3 Feb 2022 22:30:32 +0000 (11:30 +1300)]
Merge pull request #22694 from civicrm/dependabot/npm_and_yarn/log4js-6.4.1
Bump log4js from 6.3.0 to 6.4.1
Seamus Lee [Thu, 3 Feb 2022 22:11:56 +0000 (09:11 +1100)]
Merge pull request #22654 from colemanw/optionGroupName
[REF] Switch OptionGroup BAO to use new centralized logic to make name from title
dependabot[bot] [Thu, 3 Feb 2022 20:42:55 +0000 (20:42 +0000)]
Bump engine.io from 4.1.1 to 4.1.2
Bumps [engine.io](https://github.com/socketio/engine.io) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/socketio/engine.io/releases)
- [Changelog](https://github.com/socketio/engine.io/blob/4.1.2/CHANGELOG.md)
- [Commits](https://github.com/socketio/engine.io/compare/4.1.1...4.1.2)
---
updated-dependencies:
- dependency-name: engine.io
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Thu, 3 Feb 2022 20:42:55 +0000 (20:42 +0000)]
Bump log4js from 6.3.0 to 6.4.1
Bumps [log4js](https://github.com/log4js-node/log4js-node) from 6.3.0 to 6.4.1.
- [Release notes](https://github.com/log4js-node/log4js-node/releases)
- [Changelog](https://github.com/log4js-node/log4js-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/log4js-node/log4js-node/compare/v6.3.0...v6.4.1)
---
updated-dependencies:
- dependency-name: log4js
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Thu, 3 Feb 2022 20:42:50 +0000 (20:42 +0000)]
Bump ansi-regex from 5.0.0 to 5.0.1
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1)
---
updated-dependencies:
- dependency-name: ansi-regex
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Seamus Lee [Thu, 3 Feb 2022 20:42:25 +0000 (07:42 +1100)]
Merge pull request #22692 from demeritcowboy/composer
Update composer.json for composer 2.2 allow-plugins
demeritcowboy [Thu, 3 Feb 2022 18:32:14 +0000 (13:32 -0500)]
update for composer 2.2 allow-plugins
demeritcowboy [Thu, 3 Feb 2022 16:29:51 +0000 (11:29 -0500)]
Merge pull request #22691 from demeritcowboy/ckeditor-uninstall
Fix typo preventing uninstalling ckeditor4
demeritcowboy [Thu, 3 Feb 2022 14:20:41 +0000 (09:20 -0500)]
fix typo
Monish Deb [Thu, 3 Feb 2022 02:13:05 +0000 (07:43 +0530)]
Merge pull request #22685 from eileenmcnaughton/finacl
Move permission access handling for civicrm/admin/financial/financialType?reset=1 to extension
Coleman Watts [Wed, 2 Feb 2022 23:29:30 +0000 (18:29 -0500)]
REF - Switch to using new `CRM_Core_Component::isEnabled()`
Switches more verbose array searches to the new utility function.
Eileen McNaughton [Thu, 13 Jan 2022 04:56:44 +0000 (17:56 +1300)]
More permission access handling for civicrm/admin/financial/financialType?reset=1 to extension
(works for browse & edit)
colemanw [Wed, 2 Feb 2022 20:38:56 +0000 (15:38 -0500)]
Merge pull request #22675 from colemanw/customGroupNameIndex
CustomGroup - Ensure 'name' is always unique