Coleman Watts [Sun, 13 Mar 2022 06:26:10 +0000 (01:26 -0500)]
Fix backward-compatability for new method in CRM_Contact_BAO_Query_Hook
The method getDefaultReturnProperties was just added to CRM_Contact_BAO_Query_Hook,
but some extensions do not yet implement it, and also do not extend that class so
cannot inherit the default method.
This adds a guard around calling the new method to avoid crashes.
Eileen McNaughton [Thu, 10 Mar 2022 01:59:33 +0000 (14:59 +1300)]
Merge pull request #22921 from totten/5.48-yml
(NFC) contributor-key.yml - Fix syntax error
Tim Otten [Wed, 9 Mar 2022 23:26:50 +0000 (15:26 -0800)]
contributor-key.yml - Fix syntax error
Matthew Wire [Wed, 9 Mar 2022 21:44:01 +0000 (21:44 +0000)]
Merge pull request #22898 from MegaphoneJon/timezone-check-condition
Don't perform event timezone check if CiviEvent is disabled
Jon Goldberg [Mon, 7 Mar 2022 15:39:07 +0000 (10:39 -0500)]
Don't perform event timezone check if CiviEvent is disabled
colemanw [Wed, 9 Mar 2022 16:28:49 +0000 (11:28 -0500)]
Merge pull request #22913 from colemanw/civiGrantTypes2
CiviGrant - Don't auto-create any grant types
Coleman Watts [Tue, 8 Mar 2022 13:51:41 +0000 (08:51 -0500)]
CiviGrant - Don't auto-create any grant types
colemanw [Wed, 9 Mar 2022 13:41:06 +0000 (08:41 -0500)]
Merge pull request #22911 from colemanw/grant-reports2
dev/core#3100 - Remove grant leftovers from core xml. Remove empty grant reports menu
Coleman Watts [Wed, 9 Mar 2022 01:36:42 +0000 (20:36 -0500)]
Regenerate sql
demeritcowboy [Sat, 5 Mar 2022 23:38:35 +0000 (18:38 -0500)]
empty grant reports menu
Coleman Watts [Tue, 8 Mar 2022 22:37:39 +0000 (17:37 -0500)]
Remove unused grant reports from upgrader
Seamus Lee [Tue, 8 Mar 2022 21:59:22 +0000 (08:59 +1100)]
Merge pull request #22870 from eileenmcnaughton/line
Only acl line items based on contribution
Seamus Lee [Mon, 7 Mar 2022 22:54:45 +0000 (09:54 +1100)]
Merge pull request #22865 from demeritcowboy/contributionview
dev/core#3094 - Crash on contribution view when don't have event/participant permissions
demeritcowboy [Mon, 7 Mar 2022 16:18:06 +0000 (11:18 -0500)]
Merge pull request #22897 from demeritcowboy/customview
dev/core#3104 - Crash when viewing a contact page - Call to undefined method CRM_Contact_Page_View_Summary::addExpectedSmartyVariables()
demeritcowboy [Mon, 7 Mar 2022 14:25:30 +0000 (09:25 -0500)]
do same thing as CRM_Core_Form
CiviCRM [Mon, 7 Mar 2022 00:11:34 +0000 (00:11 +0000)]
Set version to 5.48.beta1
Tim Otten [Sun, 6 Mar 2022 23:49:12 +0000 (15:49 -0800)]
Merge pull request #22868 from totten/master-flush2
Refresh entity list after updating custom group (self_hook_*)
demeritcowboy [Sun, 6 Mar 2022 19:36:33 +0000 (14:36 -0500)]
Merge pull request #22896 from colemanw/api4ExplorerCopy
APIv4 Explorer - Add "copy" button to quicly copy code to clipboard
Coleman Watts [Sun, 6 Mar 2022 16:57:54 +0000 (11:57 -0500)]
APIv4 Explorer - Add "copy" button and output executable php
Makes it easy to select and copy generated code.
This makes the "Export" action easier to use, a "Copy" button automatically
selects text, and the PHP formatted code begins with "return" and ends with a semicolon.
demeritcowboy [Sun, 6 Mar 2022 17:06:43 +0000 (12:06 -0500)]
Merge pull request #22894 from demeritcowboy/contributionview-notice4
smarty/php notices on contribution view part 4
demeritcowboy [Sun, 6 Mar 2022 16:02:14 +0000 (11:02 -0500)]
Merge pull request #22895 from braders/static-ajax-methods
Mark AJAX methods as static
demeritcowboy [Sun, 6 Mar 2022 14:40:27 +0000 (09:40 -0500)]
Merge pull request #22892 from braders/ensure-tabheader-keys-are-assigned
Avoid e-notices on pages with tabs
Bradley Taylor [Sun, 6 Mar 2022 14:03:28 +0000 (14:03 +0000)]
Mark AJAX methods as static
Bradley Taylor [Sat, 5 Mar 2022 15:26:43 +0000 (15:26 +0000)]
Avoid e-notices on pages with tabs
demeritcowboy [Sat, 5 Mar 2022 05:06:16 +0000 (00:06 -0500)]
smarty/php notices
Seamus Lee [Sat, 5 Mar 2022 03:06:10 +0000 (14:06 +1100)]
Merge pull request #22891 from seamuslee001/master
5.47
Seamus Lee [Sat, 5 Mar 2022 02:59:26 +0000 (13:59 +1100)]
Merge in 5.47
Tim Otten [Sat, 5 Mar 2022 02:15:33 +0000 (18:15 -0800)]
Merge pull request #22889 from totten/5.47-bump0
5.47.0 - Bump version. Add notes from RC period.
Tim Otten [Sat, 5 Mar 2022 02:07:53 +0000 (18:07 -0800)]
release-notes/5.47.0.md - Add 22885
Seamus Lee [Sat, 5 Mar 2022 01:32:35 +0000 (12:32 +1100)]
Merge pull request #22885 from eileenmcnaughton/lang
dev/core#3095 Permit setting of format_locale, prefer if set
Tim Otten [Sat, 5 Mar 2022 01:07:59 +0000 (17:07 -0800)]
Merge pull request #22883 from colemanw/managedEntityMatch
ManagedEntities - Allow "match" param to convert existing records to …
Tim Otten [Fri, 4 Mar 2022 23:49:09 +0000 (15:49 -0800)]
(NFC) `en_NZ` label should look like other `en_*` labels
Tim Otten [Fri, 4 Mar 2022 23:46:49 +0000 (15:46 -0800)]
format_locale - Present single-value option. Fix display of null value.
Overview: Fix display of new setting in admin form.
Before: Field incorrectly displays as multi-value selection.
After: Field displays as single-value selection. The null value is specifically allowed.
Seamus Lee [Fri, 4 Mar 2022 23:15:50 +0000 (10:15 +1100)]
Merge pull request #22888 from civicrm/5.47
5.47
Tim Otten [Fri, 4 Mar 2022 23:06:18 +0000 (15:06 -0800)]
release-notes/5.47.0.md - Auto clean (https://gist.github.com/totten/
acff49e6dd77947349a1df26d5002003)
Tim Otten [Fri, 4 Mar 2022 23:02:51 +0000 (15:02 -0800)]
release-notes/5.47.0.md - Add various RC-stage PRs
Tim Otten [Fri, 4 Mar 2022 22:59:41 +0000 (14:59 -0800)]
release-notes/5.47.0.md - Change date
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
Eileen McNaughton [Thu, 3 Mar 2022 23:30:10 +0000 (12:30 +1300)]
Fix the world
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 [Fri, 4 Mar 2022 01:27:39 +0000 (12:27 +1100)]
Merge pull request #22884 from civicrm/5.47
5.47
Eileen McNaughton [Thu, 3 Mar 2022 23:17:19 +0000 (12:17 +1300)]
dev/core#3095 Permit setting of format_locale, prefer if set
This is a minimal patch to address https://lab.civicrm.org/dev/core/-/issues/3095
in time for 5.47. With this set it is possible to change the format locale to
English, Canada or English, Australian (but not NZ!)
and the currency will only be displayed before dollar amounts NOT of that
currency.
This should be enough to mitigate that regression feeling but missing are
1) fixing the admin form to hide irrelevant settings if format_locale is set
2) the psuedoconstant is cludgey - existing stuff doesn't seem to work so
I added a function - also - if we ARE going to use this option group we
should .... add NZ to it
Seamus Lee [Thu, 3 Mar 2022 22:11:15 +0000 (09:11 +1100)]
Merge pull request #22879 from colemanw/fixUndefinedVars
Fix undeclared javascript variables
Coleman Watts [Thu, 3 Mar 2022 21:35:52 +0000 (16:35 -0500)]
ManagedEntities - Allow "match" param to convert existing records to managed entities
This can help ease the pain of declaring managed entities which may or may not
already exist - now they can be matched by name or other unique identifier.
Yashodha Chaku [Thu, 3 Mar 2022 14:45:41 +0000 (20:15 +0530)]
Merge pull request #22874 from civicrm/mailing_token
Contact token should show contact's info instead of logged in contact
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.
Seamus Lee [Wed, 2 Mar 2022 22:35:56 +0000 (09:35 +1100)]
Merge pull request #22875 from civicrm/dependabot/npm_and_yarn/karma-6.3.16
Bump karma from 6.3.14 to 6.3.16
Seamus Lee [Wed, 2 Mar 2022 22:26:33 +0000 (09:26 +1100)]
Merge pull request #22869 from demeritcowboy/contributionview-notices2
php/smarty notices on contribution view part 2
demeritcowboy [Wed, 2 Mar 2022 16:41:48 +0000 (11:41 -0500)]
Merge pull request #22876 from rashedulislam/add-as-a-contributor
added as a contributor
Md Rashedul Islam [Wed, 2 Mar 2022 14:44:12 +0000 (20:44 +0600)]
added as a contributor
demeritcowboy [Wed, 2 Mar 2022 13:52:26 +0000 (08:52 -0500)]
Merge pull request #22872 from rashedulislam/attachment-civicrm_api3_create_error
Call to undefined function civicrm_api3_create_error() in civicrm/civ…
dependabot[bot] [Wed, 2 Mar 2022 13:30:27 +0000 (13:30 +0000)]
Bump karma from 6.3.14 to 6.3.16
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.14 to 6.3.16.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.14...v6.3.16)
---
updated-dependencies:
- dependency-name: karma
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com>
Yashodha Chaku [Wed, 2 Mar 2022 11:41:02 +0000 (17:11 +0530)]
Merge pull request #22438 from eileenmcnaughton/format
Format money on transaction list
Monish Deb [Wed, 2 Mar 2022 09:52:11 +0000 (15:22 +0530)]
Contact token should show contact's info instead of logged in contact
Seamus Lee [Wed, 2 Mar 2022 06:16:34 +0000 (17:16 +1100)]
Merge pull request #22873 from civicrm/5.47
5.47
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
Md Rashedul Islam [Wed, 2 Mar 2022 06:03:33 +0000 (12:03 +0600)]
Call to undefined function civicrm_api3_create_error() in civicrm/civicrm/CRM/Core/Page/AJAX/Attachment.php:65
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).
Eileen McNaughton [Wed, 2 Mar 2022 03:56:17 +0000 (16:56 +1300)]
Only acl line items based on contribution
The query becomes insane if we allow membership, participant ids to bubble up here
demeritcowboy [Wed, 2 Mar 2022 03:39:09 +0000 (22:39 -0500)]
Merge pull request #22867 from totten/master-logdetail
(NFC) LoggingDetailTest - Improve reliability of test
Tim Otten [Wed, 2 Mar 2022 03:02:22 +0000 (19:02 -0800)]
Refresh entity list after updating custom group (self_hook_*)
Overview
----------------------------------------
The CustomGroups are used to generate virtual entities (if they set `is_multiple`). Toggling `is_multiple`
should cause the virtual entity to be added or removed.
Reproduction steps
----------------------------------------
1. Create a custom data group. Leave default `is_multiple=0`.
2. View "API Explorer". Look for the virtual entity. (It's not there. Properly so.)
3. Edit custom data group. Change to `is_multiple=1`.
4. Reload "API Explorer". Look for the virtual entity.
Before
----------------------------------------
The entity does not appear. You have to do a system-flush.
After
----------------------------------------
The entity does appear.
Tim Otten [Wed, 2 Mar 2022 02:58:26 +0000 (18:58 -0800)]
CustomValueTest - Highlight cache bug
demeritcowboy [Wed, 2 Mar 2022 02:46:56 +0000 (21:46 -0500)]
php/smarty notices
Tim Otten [Wed, 2 Mar 2022 02:23:28 +0000 (18:23 -0800)]
Merge pull request #22866 from demeritcowboy/contributionview-notices
php notices on contributionview
Tim Otten [Wed, 2 Mar 2022 01:51:00 +0000 (17:51 -0800)]
(NFC) LoggingDetailTest - Improve reliability of test
Before
-----------------
If you run this test repeatedly, it may alternately pass and fail. The
percentage of passes-vs-fails can vary widely (depending on the computer
where you execute).
To test this, I went to a deployment (on `test-3`) which had a fairly
high probability of failure (*failure in roughly 3/4 invocations*).
After
-----------------
On the same system, it passes consistently (*no failures after 15 invocations*).
Matthew Wire [Wed, 2 Mar 2022 00:04:47 +0000 (00:04 +0000)]
Merge pull request #22859 from civicrm/5.47
5.47
Tim Otten [Tue, 1 Mar 2022 23:54:41 +0000 (15:54 -0800)]
Merge pull request #22860 from totten/master-mem-date-test
(NFC) Membership Tests - Update assertions to match behavior circa leap-day
demeritcowboy [Tue, 1 Mar 2022 23:44:20 +0000 (18:44 -0500)]
php notices
Seamus Lee [Tue, 1 Mar 2022 22:36:50 +0000 (09:36 +1100)]
Merge pull request #22864 from eileenmcnaughton/fin
Add handling for civimember disabled
demeritcowboy [Tue, 1 Mar 2022 21:21:05 +0000 (16:21 -0500)]
don't crash for users without participant permissions when viewing contributions
Eileen McNaughton [Tue, 1 Mar 2022 20:12:04 +0000 (09:12 +1300)]
Add handling for civimember disabled
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).
Tim Otten [Tue, 1 Mar 2022 05:17:02 +0000 (21:17 -0800)]
Merge pull request #22812 from totten/master-queue-schema
(dev/core#1304) Queues - Define schema for runner, run_count, lease_time, et al
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
Seamus Lee [Tue, 1 Mar 2022 02:21:08 +0000 (13:21 +1100)]
Merge pull request #22857 from seamuslee001/master
5.47
Seamus Lee [Tue, 1 Mar 2022 02:13:02 +0000 (13:13 +1100)]
Merge in 5.47
Tim Otten [Tue, 1 Mar 2022 02:08:29 +0000 (18:08 -0800)]
Queue.retry_limit - Set explicit default to 0. Update comments/docs.
Tim Otten [Tue, 1 Mar 2022 00:45:10 +0000 (16:45 -0800)]
QueueItem - Upgrades from <v4.2 are not supported. Remove special createTable().
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
Tim Otten [Tue, 1 Mar 2022 00:36:29 +0000 (16:36 -0800)]
Queue.batch_limit - Simplify docblock comments
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 22:25:09 +0000 (17:25 -0500)]
Merge pull request #22242 from MegaphoneJon/reporting-85
fixes report#85 - Don't crash Contact Logging Detail report when viewing a contribution
Eileen McNaughton [Mon, 28 Feb 2022 21:17:13 +0000 (10:17 +1300)]
Merge pull request #20093 from larssandergreen/mailings-AB-test-improvements
dev/core#2100 Improve A/B test report page and API Mailing stats
Jon Goldberg [Mon, 13 Dec 2021 19:14:55 +0000 (14:14 -0500)]
fixes reporting#85 - Don't crash Contact Logging Detail report when viewing a contribution
demeritcowboy [Mon, 28 Feb 2022 18:56:18 +0000 (13:56 -0500)]
Merge pull request #22852 from civicrm/5.47
5.47
Matthew Wire [Mon, 28 Feb 2022 15:30:54 +0000 (15:30 +0000)]
Merge pull request #22732 from braders/ui-45-contrib-participant-links
dev/user-interface#45 Show associated participants on contributionView form
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
Seamus Lee [Mon, 28 Feb 2022 04:23:23 +0000 (15:23 +1100)]
Merge pull request #22849 from colemanw/fixApiExplorerError
Fix API4 Explorer undefined variable error
Coleman Watts [Mon, 28 Feb 2022 02:02:16 +0000 (21:02 -0500)]
Fix API4 Explorer undefined variable error
Eileen McNaughton [Sun, 27 Feb 2022 23:06:41 +0000 (12:06 +1300)]
Merge pull request #22848 from braders/extension-manager-notices
Avoid PHP undefined index notices on extension pages