civicrm-core.git
2 years agodev/core#2122 - TimezoneRevertTrait - Tweak messaging
Tim Otten [Thu, 24 Mar 2022 07:21:29 +0000 (00:21 -0700)]
dev/core#2122 - TimezoneRevertTrait - Tweak messaging

2 years agodev/core#2122 - TimezoneRevertTrait - Split out messaging across bullets
Tim Otten [Wed, 23 Mar 2022 04:46:33 +0000 (21:46 -0700)]
dev/core#2122 - TimezoneRevertTrait - Split out messaging across bullets

2 years agodev/core#2122 - For 5.48.beta2, use TimezoneRevertTrait and updates msg tpls
Tim Otten [Wed, 23 Mar 2022 00:17:37 +0000 (17:17 -0700)]
dev/core#2122 - For 5.48.beta2, use TimezoneRevertTrait and updates msg tpls

2 years agodev/core#2122 - Add TimezoneRevertTrait (shared by 5.47/5.48)
demeritcowboy [Wed, 23 Mar 2022 00:08:01 +0000 (17:08 -0700)]
dev/core#2122 - Add TimezoneRevertTrait (shared by 5.47/5.48)

Based on upgrade-steps from demerit. Adapted to trait by totten.

2 years agoSet version to 5.48.beta2
Tim Otten [Wed, 23 Mar 2022 00:15:10 +0000 (17:15 -0700)]
Set version to 5.48.beta2

2 years agoMerge pull request #22930 from demeritcowboy/revert-event-timezone
Tim Otten [Thu, 24 Mar 2022 03:53:12 +0000 (20:53 -0700)]
Merge pull request #22930 from demeritcowboy/revert-event-timezone

dev/core#2122 - Revert event timezone

2 years agoMerge pull request #23001 from agh1/5.48.0-releasenotes-initial
Tim Otten [Tue, 22 Mar 2022 22:52:49 +0000 (15:52 -0700)]
Merge pull request #23001 from agh1/5.48.0-releasenotes-initial

5.48.0 release notes initial run

2 years agoMerge pull request #22997 from colemanw/fixDeletingAfformWithSavedSearch
colemanw [Tue, 22 Mar 2022 15:50:51 +0000 (11:50 -0400)]
Merge pull request #22997 from colemanw/fixDeletingAfformWithSavedSearch

Fix deleting afforms when deleting saved search

2 years ago5.48.0 release notes: added boilerplate
Andie Hunt [Tue, 22 Mar 2022 15:26:28 +0000 (11:26 -0400)]
5.48.0 release notes: added boilerplate

2 years ago5.48.0 release notes: initial run
Andie Hunt [Tue, 22 Mar 2022 15:21:20 +0000 (11:21 -0400)]
5.48.0 release notes: initial run

2 years agoMerge pull request #22985 from demeritcowboy/postupgrademessage-2
Tim Otten [Tue, 22 Mar 2022 05:54:04 +0000 (22:54 -0700)]
Merge pull request #22985 from demeritcowboy/postupgrademessage-2

dev/core#3119 - Post-upgrade messages no longer being displayed

2 years agoMerge pull request #22998 from seamuslee001/update_guzzlehttp_18
Seamus Lee [Tue, 22 Mar 2022 03:00:42 +0000 (14:00 +1100)]
Merge pull request #22998 from seamuslee001/update_guzzlehttp_18

[REF] Update Guzzlehttp/psr7 version to be 1.8.5

2 years ago[REF] Update Guzzlehttp/psr7 version to be 1.8.5
Seamus Lee [Tue, 22 Mar 2022 00:01:37 +0000 (11:01 +1100)]
[REF] Update Guzzlehttp/psr7 version to be 1.8.5

2 years agoFix deleting afforms when deleting saved search
Coleman Watts [Mon, 21 Mar 2022 23:28:02 +0000 (19:28 -0400)]
Fix deleting afforms when deleting saved search

A typo in the code was preventing afforms from being deleted with a corresponding saved search,
and may have led to afforms being deleted incorrectly!

2 years agoCRM_Upgrade_Form::doFinish() - Narrower call to session-reset
Tim Otten [Mon, 21 Mar 2022 22:04:08 +0000 (15:04 -0700)]
CRM_Upgrade_Form::doFinish() - Narrower call to session-reset

The main call(s) to `rebuildMenuAndCaches()` do clear out most caches.  It's
_just_ the session that has been skipped.

2 years agoPost-upgrade messages no longer being displayed (part 2)
Tim Otten [Mon, 21 Mar 2022 21:38:48 +0000 (14:38 -0700)]
Post-upgrade messages no longer being displayed (part 2)

This line is only hit if the upgrader activates CiviGrant.

2 years agopostupgrade messages no longer being displayed
demeritcowboy [Sat, 19 Mar 2022 19:33:56 +0000 (15:33 -0400)]
postupgrade messages no longer being displayed

2 years agoMerge pull request #22963 from colemanw/fixAfformBlocks
demeritcowboy [Sat, 19 Mar 2022 19:19:51 +0000 (15:19 -0400)]
Merge pull request #22963 from colemanw/fixAfformBlocks

Afform - Fix saving and editing entity blocks

2 years agoMerge pull request #22976 from demeritcowboy/civireport-false
Eileen McNaughton [Sat, 19 Mar 2022 00:30:40 +0000 (13:30 +1300)]
Merge pull request #22976 from demeritcowboy/civireport-false

dev/core#3126 - CiviReport statistics appearing twice on page

2 years agofalse is true
demeritcowboy [Fri, 18 Mar 2022 20:38:06 +0000 (16:38 -0400)]
false is true

2 years agoMerge pull request #22964 from pradpnayak/fixfatalerror3
demeritcowboy [Fri, 18 Mar 2022 02:41:38 +0000 (22:41 -0400)]
Merge pull request #22964 from pradpnayak/fixfatalerror3

(Regression) - fixed tags form field display on New/Edit contact screen

2 years agofixed tags form field display on New/Edit contact screen
Pradeep Nayak [Thu, 17 Mar 2022 21:35:54 +0000 (21:35 +0000)]
fixed tags form field display on New/Edit contact screen

2 years agoAfform - Fix saving and editing entity blocks
Coleman Watts [Thu, 17 Mar 2022 18:16:44 +0000 (14:16 -0400)]
Afform - Fix saving and editing entity blocks

Fixes dev/core#3120
Regression caused by #21218
Also fixes undefined variable errors when editing a block.

2 years agoFix issues picked up by stylechecker
Seamus Lee [Thu, 17 Mar 2022 09:53:17 +0000 (20:53 +1100)]
Fix issues picked up by stylechecker

2 years agosecurity/core#112 Fix viewing contributions when user doesn't have acess to civicontr...
Seamus Lee [Tue, 1 Mar 2022 03:32:28 +0000 (14:32 +1100)]
security/core#112 Fix viewing contributions when user doesn't have acess to civicontribute or edit contributions permissions

2 years agosecurity/core#113 Apply patch from Mathieu to fix SQLI in participant import
Seamus Lee [Thu, 3 Mar 2022 06:23:19 +0000 (17:23 +1100)]
security/core#113 Apply patch from Mathieu to fix SQLI in participant import

2 years agoUpgrade CKEditor to 4.18
Seamus Lee [Wed, 16 Mar 2022 19:58:23 +0000 (06:58 +1100)]
Upgrade CKEditor to 4.18

2 years ago(security/core#111) Refine prose/naming
Tim Otten [Wed, 16 Mar 2022 09:27:19 +0000 (02:27 -0700)]
(security/core#111) Refine prose/naming

2 years agosecurity/core#111 Add in Status check for if Anonymous Users have edit contributions...
Seamus Lee [Wed, 16 Mar 2022 08:33:54 +0000 (01:33 -0700)]
security/core#111 Add in Status check for if Anonymous Users have edit contributions and or access CiviContribute Permissions

2 years agoCRM_Core_Permission - Allow checking of anon-perms by authenticated-users
CiviCRM [Wed, 16 Mar 2022 08:30:48 +0000 (01:30 -0700)]
CRM_Core_Permission - Allow checking of anon-perms by authenticated-users

Each CRM_Core_Permission_* adapter allows you to check the permissions on
behalf of some other user. However, if that "other user" is "anonymous",
then they are prone to mishandling.

2 years agoE2E Tests - Add coverage for variations on `Permission::check($perm,$cid)`
Tim Otten [Wed, 16 Mar 2022 03:37:33 +0000 (20:37 -0700)]
E2E Tests - Add coverage for variations on `Permission::check($perm,$cid)`

2 years agocomposer.json - Update jquery UI 1.13.0 => 1.13.1
Tim Otten [Wed, 16 Mar 2022 05:33:29 +0000 (22:33 -0700)]
composer.json - Update jquery UI 1.13.0 => 1.13.1

2 years agoMerge pull request #22948 from pradpnayak/fixfatalerror3
Seamus Lee [Tue, 15 Mar 2022 21:24:48 +0000 (08:24 +1100)]
Merge pull request #22948 from pradpnayak/fixfatalerror3

Return array for setdefaults

2 years agoReturn array for setdefaults
Pradeep Nayak [Tue, 15 Mar 2022 11:08:51 +0000 (11:08 +0000)]
Return array for setdefaults

2 years agoMerge pull request #22944 from colemanw/SoftDeleteActionTrait
demeritcowboy [Mon, 14 Mar 2022 18:12:06 +0000 (14:12 -0400)]
Merge pull request #22944 from colemanw/SoftDeleteActionTrait

[REF] Rename SoftDeleteEntity -> SoftDeleteActionTrait

2 years agoRename SoftDeleteEntity -> SoftDeleteActionTrait
Coleman Watts [Mon, 14 Mar 2022 15:18:25 +0000 (11:18 -0400)]
Rename SoftDeleteEntity -> SoftDeleteActionTrait

The trait is used by actions, not by entities.

2 years agoMerge pull request #22933 from colemanw/fixQueryHook
demeritcowboy [Sun, 13 Mar 2022 17:04:51 +0000 (13:04 -0400)]
Merge pull request #22933 from colemanw/fixQueryHook

Fix backward-compatability for new method in CRM_Contact_BAO_Query_Hook

2 years agoMerge pull request #22932 from eileenmcnaughton/upit
colemanw [Sun, 13 Mar 2022 15:41:04 +0000 (11:41 -0400)]
Merge pull request #22932 from eileenmcnaughton/upit

dev/core#3112 Clear caches to avoid error on upgrade

2 years agoFix backward-compatability for new method in CRM_Contact_BAO_Query_Hook
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.

2 years agoMerge pull request #22929 from colemanw/afformELementFix
demeritcowboy [Sun, 13 Mar 2022 13:55:05 +0000 (09:55 -0400)]
Merge pull request #22929 from colemanw/afformELementFix

Afform Gui - Fix selecting html element of text box

2 years agodev/core#3112 Clear caches to avoid error on upgrade
Eileen McNaughton [Sun, 13 Mar 2022 05:10:43 +0000 (18:10 +1300)]
dev/core#3112 Clear caches to avoid error on upgrade

There may be a better place for this - but at least here is is clear to the api call that
can fail without it .... if the metadata cache is populated from an earlier version the
table_name key may not exist & hence the api call fails with no table_name
in the from clause

2 years agoregenerate civicrm_generated
demeritcowboy [Sat, 12 Mar 2022 16:51:54 +0000 (11:51 -0500)]
regenerate civicrm_generated

2 years agoregenerate DAO
demeritcowboy [Sat, 12 Mar 2022 16:47:00 +0000 (11:47 -0500)]
regenerate DAO

2 years agoRevert "default event timezone for sample data"
demeritcowboy [Sat, 12 Mar 2022 16:38:10 +0000 (11:38 -0500)]
Revert "default event timezone for sample data"

This reverts commit 321eb9080a8523af9e03564f83eef206f9f325c0.

2 years agorevert 20476
demeritcowboy [Sat, 12 Mar 2022 16:36:58 +0000 (11:36 -0500)]
revert 20476

2 years agoAfform Gui - Fix selecting html element of text box
Coleman Watts [Thu, 10 Mar 2022 01:42:09 +0000 (20:42 -0500)]
Afform Gui - Fix selecting html element of text box

2 years agoMerge pull request #22921 from totten/5.48-yml
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

2 years agocontributor-key.yml - Fix syntax error
Tim Otten [Wed, 9 Mar 2022 23:26:50 +0000 (15:26 -0800)]
contributor-key.yml - Fix syntax error

2 years agoMerge pull request #22898 from MegaphoneJon/timezone-check-condition
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

2 years agoDon'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

2 years agoMerge pull request #22913 from colemanw/civiGrantTypes2
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

2 years agoCiviGrant - 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

2 years agoMerge pull request #22911 from colemanw/grant-reports2
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

2 years agoRegenerate sql
Coleman Watts [Wed, 9 Mar 2022 01:36:42 +0000 (20:36 -0500)]
Regenerate sql

2 years agoempty grant reports menu
demeritcowboy [Sat, 5 Mar 2022 23:38:35 +0000 (18:38 -0500)]
empty grant reports menu

2 years agoRemove unused grant reports from upgrader
Coleman Watts [Tue, 8 Mar 2022 22:37:39 +0000 (17:37 -0500)]
Remove unused grant reports from upgrader

2 years agoMerge pull request #22870 from eileenmcnaughton/line
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

2 years agoMerge pull request #22865 from demeritcowboy/contributionview
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

2 years agoMerge pull request #22897 from demeritcowboy/customview
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()

2 years agodo same thing as CRM_Core_Form
demeritcowboy [Mon, 7 Mar 2022 14:25:30 +0000 (09:25 -0500)]
do same thing as CRM_Core_Form

2 years agoSet version to 5.48.beta1
CiviCRM [Mon, 7 Mar 2022 00:11:34 +0000 (00:11 +0000)]
Set version to 5.48.beta1

2 years agoMerge pull request #22868 from totten/master-flush2
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_*)

2 years agoMerge pull request #22896 from colemanw/api4ExplorerCopy
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

2 years agoAPIv4 Explorer - Add "copy" button and output executable php
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.

2 years agoMerge pull request #22894 from demeritcowboy/contributionview-notice4
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

2 years agoMerge pull request #22895 from braders/static-ajax-methods
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

2 years agoMerge pull request #22892 from braders/ensure-tabheader-keys-are-assigned
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

2 years agoMark AJAX methods as static
Bradley Taylor [Sun, 6 Mar 2022 14:03:28 +0000 (14:03 +0000)]
Mark AJAX methods as static

2 years agoAvoid e-notices on pages with tabs
Bradley Taylor [Sat, 5 Mar 2022 15:26:43 +0000 (15:26 +0000)]
Avoid e-notices on pages with tabs

2 years agosmarty/php notices
demeritcowboy [Sat, 5 Mar 2022 05:06:16 +0000 (00:06 -0500)]
smarty/php notices

2 years agoMerge pull request #22891 from seamuslee001/master
Seamus Lee [Sat, 5 Mar 2022 03:06:10 +0000 (14:06 +1100)]
Merge pull request #22891 from seamuslee001/master

5.47

2 years agoMerge in 5.47
Seamus Lee [Sat, 5 Mar 2022 02:59:26 +0000 (13:59 +1100)]
Merge in 5.47

2 years agoMerge pull request #22889 from totten/5.47-bump0
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.

2 years agorelease-notes/5.47.0.md - Add 22885
Tim Otten [Sat, 5 Mar 2022 02:07:53 +0000 (18:07 -0800)]
release-notes/5.47.0.md - Add 22885

2 years agoMerge pull request #22885 from eileenmcnaughton/lang
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

2 years agoMerge pull request #22883 from colemanw/managedEntityMatch
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 …

2 years ago(NFC) `en_NZ` label should look like other `en_*` labels
Tim Otten [Fri, 4 Mar 2022 23:49:09 +0000 (15:49 -0800)]
(NFC) `en_NZ` label should look like other `en_*` labels

2 years agoformat_locale - Present single-value option. Fix display of null value.
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.

2 years agoMerge pull request #22888 from civicrm/5.47
Seamus Lee [Fri, 4 Mar 2022 23:15:50 +0000 (10:15 +1100)]
Merge pull request #22888 from civicrm/5.47

5.47

2 years agorelease-notes/5.47.0.md - Auto clean (https://gist.github.com/totten/acff49e6dd779473...
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)

2 years agorelease-notes/5.47.0.md - Add various RC-stage PRs
Tim Otten [Fri, 4 Mar 2022 23:02:51 +0000 (15:02 -0800)]
release-notes/5.47.0.md - Add various RC-stage PRs

2 years agorelease-notes/5.47.0.md - Change date
Tim Otten [Fri, 4 Mar 2022 22:59:41 +0000 (14:59 -0800)]
release-notes/5.47.0.md - Change date

2 years agoSet version to 5.47.0
Tim Otten [Fri, 4 Mar 2022 23:03:19 +0000 (15:03 -0800)]
Set version to 5.47.0

2 years agoMerge pull request #22881 from colemanw/civiGrantFixSecondAttempt
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

2 years agoFix the world
Eileen McNaughton [Thu, 3 Mar 2022 23:30:10 +0000 (12:30 +1300)]
Fix the world

2 years agoFiveFortySeven - Ensure that `civicrm_search_display` is up-to-date
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.

2 years agoFiveFortySeven - Leave `civigrant` inactive during inconsistent period
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).

2 years agoManagedEntities - Ignore `$ignoreUpgradeMode`
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).

2 years agoCiviGrant - Ensure dependencies are installed
Coleman Watts [Thu, 3 Mar 2022 14:35:43 +0000 (09:35 -0500)]
CiviGrant - Ensure dependencies are installed

Fixes dev/core#3093

2 years agoUpgrader - Add enable extension as a reusable upgrade task
Tim Otten [Thu, 3 Mar 2022 05:48:25 +0000 (21:48 -0800)]
Upgrader - Add enable extension as a reusable upgrade task

2 years agoMerge pull request #22884 from civicrm/5.47
Seamus Lee [Fri, 4 Mar 2022 01:27:39 +0000 (12:27 +1100)]
Merge pull request #22884 from civicrm/5.47

5.47

2 years agodev/core#3095 Permit setting of format_locale, prefer if set
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

2 years agoMerge pull request #22879 from colemanw/fixUndefinedVars
Seamus Lee [Thu, 3 Mar 2022 22:11:15 +0000 (09:11 +1100)]
Merge pull request #22879 from colemanw/fixUndefinedVars

Fix undeclared javascript variables

2 years agoManagedEntities - Allow "match" param to convert existing records to managed entities
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.

2 years agoMerge pull request #22874 from civicrm/mailing_token
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

2 years agoCRM/Upgrade - Define queue weights. Put finalization step in the queue.
Tim Otten [Thu, 3 Mar 2022 05:34:31 +0000 (21:34 -0800)]
CRM/Upgrade - Define queue weights. Put finalization step in the queue.

2 years agoFix undefined javascript variables
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.

2 years agoMerge pull request #22875 from civicrm/dependabot/npm_and_yarn/karma-6.3.16
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

2 years agoMerge pull request #22869 from demeritcowboy/contributionview-notices2
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

2 years agoMerge pull request #22876 from rashedulislam/add-as-a-contributor
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