civicrm-core.git
3 years ago[REF] Remove unused parameter
Eileen McNaughton [Sun, 12 Sep 2021 23:46:07 +0000 (11:46 +1200)]
[REF] Remove unused parameter

There are no longer any cases in git universe that pass this parameter

3 years agoMerge pull request #21429 from eileenmcnaughton/tok_hook2
colemanw [Sun, 12 Sep 2021 21:40:20 +0000 (17:40 -0400)]
Merge pull request #21429 from eileenmcnaughton/tok_hook2

Consolidate building of contact token list

3 years agoMerge pull request #21383 from eileenmcnaughton/case_tokens
colemanw [Sun, 12 Sep 2021 21:38:27 +0000 (17:38 -0400)]
Merge pull request #21383 from eileenmcnaughton/case_tokens

dev/core#2817 Add CaseToken processor

3 years agoMerge pull request #21441 from demeritcowboy/dashboard-fail2
Eileen McNaughton [Sun, 12 Sep 2021 21:25:21 +0000 (09:25 +1200)]
Merge pull request #21441 from demeritcowboy/dashboard-fail2

dev/core#2829 - "Trying to access array offset on value of type null" on dashboard

3 years agoMerge pull request #21443 from demeritcowboy/test-fix-2
Eileen McNaughton [Sun, 12 Sep 2021 21:17:29 +0000 (09:17 +1200)]
Merge pull request #21443 from demeritcowboy/test-fix-2

Alternate to https://github.com/civicrm/civicrm-core/pull/21442

3 years agoMerge pull request #21428 from totten/master-tp-filter
colemanw [Sun, 12 Sep 2021 20:05:50 +0000 (16:05 -0400)]
Merge pull request #21428 from totten/master-tp-filter

TokenProcessor - Allow basic filter/modifier expressions

3 years agoMerge pull request #21440 from eileenmcnaughton/mgd_test
colemanw [Sun, 12 Sep 2021 20:00:15 +0000 (16:00 -0400)]
Merge pull request #21440 from eileenmcnaughton/mgd_test

dev/core#2823 fix test to be more like real function usage

3 years agocontact with email might not exist
demeritcowboy [Sun, 12 Sep 2021 13:45:11 +0000 (09:45 -0400)]
contact with email might not exist

3 years agodashboard has no bridge
demeritcowboy [Sun, 12 Sep 2021 12:02:19 +0000 (08:02 -0400)]
dashboard has no bridge

3 years agodev/core#2823 fix test to be more like real function usage
Eileen McNaughton [Sun, 12 Sep 2021 05:42:24 +0000 (17:42 +1200)]
dev/core#2823 fix test to be more like real function usage

3 years agoMerge pull request #21437 from demeritcowboy/dashboard-fail
Eileen McNaughton [Sat, 11 Sep 2021 23:46:42 +0000 (11:46 +1200)]
Merge pull request #21437 from demeritcowboy/dashboard-fail

dev/core#2829 - unit test for nonempty dashboard

3 years agotest for nonempty dashboard
demeritcowboy [Sat, 11 Sep 2021 18:51:39 +0000 (14:51 -0400)]
test for nonempty dashboard

3 years agoMerge pull request #21399 from eileenmcnaughton/mgd
colemanw [Sat, 11 Sep 2021 15:14:54 +0000 (11:14 -0400)]
Merge pull request #21399 from eileenmcnaughton/mgd

dev/core#2823 Extract code to load the declarations and call from the constructor

3 years agoMerge pull request #21400 from eileenmcnaughton/val
colemanw [Sat, 11 Sep 2021 15:10:48 +0000 (11:10 -0400)]
Merge pull request #21400 from eileenmcnaughton/val

dev/core#2823 Move validation into validation function

3 years agoMerge pull request #21434 from demeritcowboy/upgrade-text
Eileen McNaughton [Sat, 11 Sep 2021 03:06:05 +0000 (15:06 +1200)]
Merge pull request #21434 from demeritcowboy/upgrade-text

dev/core#2828 - Make up for message template text version update from 5.20 that never happened

3 years agoMerge pull request #21211 from colemanw/onDeletePrimary
Eileen McNaughton [Sat, 11 Sep 2021 00:46:39 +0000 (12:46 +1200)]
Merge pull request #21211 from colemanw/onDeletePrimary

[REF] Move Email, Address, etc. is_primary handling on delete to a hook (dev/core#2757)

3 years agobetter late than never
demeritcowboy [Sat, 11 Sep 2021 00:15:41 +0000 (20:15 -0400)]
better late than never

3 years agoMerge pull request #21424 from colemanw/apiJoinBridgeCustomFields
Eileen McNaughton [Fri, 10 Sep 2021 23:13:42 +0000 (11:13 +1200)]
Merge pull request #21424 from colemanw/apiJoinBridgeCustomFields

SearchKit - Support custom fields in bridge join entities

3 years agoMerge pull request #21431 from colemanw/searchTableAlign
Eileen McNaughton [Fri, 10 Sep 2021 21:57:39 +0000 (09:57 +1200)]
Merge pull request #21431 from colemanw/searchTableAlign

SearchKit - Fix alignment in table headers

3 years agoMerge pull request #21198 from colemanw/fkConstraint
Eileen McNaughton [Fri, 10 Sep 2021 21:02:19 +0000 (09:02 +1200)]
Merge pull request #21198 from colemanw/fkConstraint

[REF] Mapping - Check FK on delete with SQL instead of PHP (dev/core#2757)

3 years agoSearchKit - Fix alignment in table headers
Coleman Watts [Fri, 10 Sep 2021 14:28:19 +0000 (10:28 -0400)]
SearchKit - Fix alignment in table headers

3 years agoMapping - Check FK on delete with SQL instead of with PHP
Coleman Watts [Fri, 20 Aug 2021 17:24:48 +0000 (13:24 -0400)]
Mapping - Check FK on delete with SQL instead of with PHP

3 years agoMove Email, Address, etc. is_primary handling on delete to a hook
Coleman Watts [Sun, 22 Aug 2021 00:00:32 +0000 (20:00 -0400)]
Move Email, Address, etc. is_primary handling on delete to a hook

Previously this was all done in a delegated function.
This moves that logic to a hook listener.

3 years agoMerge pull request #21426 from eileenmcnaughton/api4
Seamus Lee [Fri, 10 Sep 2021 07:55:54 +0000 (17:55 +1000)]
Merge pull request #21426 from eileenmcnaughton/api4

Replace expensive query with cheaper one

3 years agoTokenProcessor - Allow basic filter/modifier expressions
Tim Otten [Thu, 9 Sep 2021 23:26:08 +0000 (16:26 -0700)]
TokenProcessor - Allow basic filter/modifier expressions

Before
------

`Hello {foo.bar}`

After
-----

`Hello {foo.bar|upper}` and `Hello {foo.bar|lower}`

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

This only supports tokens that supply values through `civi.token.eval`.  At the time of
this commit, most `{contact.*}` tokens still use `TokenCompatSubscriber::onRender()` to
hack-in their values and won't work until they switch over.

The regex which recognizes the filter is pretty tight (`\w+`).  This can be relaxed
somewhat by a subsequent change, but I'd say such a change has a burden to demonstrate
safety/interoparbility when running in Token-Smarty format.  (e.g.  demonstrate that
matching of open/close symbols works correctly).

3 years agoReplace expensive query with cheaper one
Eileen McNaughton [Thu, 9 Sep 2021 22:43:37 +0000 (10:43 +1200)]
Replace expensive query with cheaper one

Rather than retrieve everything with a legacy function, just get what we want....

Note I commented on how silly I think it is but no change to outcome

3 years agoConsolidate building of contact token list
Eileen McNaughton [Fri, 10 Sep 2021 02:28:00 +0000 (14:28 +1200)]
Consolidate building of contact token list

3 years agoExtend test cover on token fields
Eileen McNaughton [Fri, 10 Sep 2021 01:34:46 +0000 (13:34 +1200)]
Extend test cover on token fields

Extends test cover to check advertised tokens for contacts and to check
those advertised in hooks are included

3 years agoAdd upgrade message
Eileen McNaughton [Fri, 10 Sep 2021 04:03:02 +0000 (16:03 +1200)]
Add upgrade message

3 years agodev/core#2817 Add CaseToken processor
Eileen McNaughton [Mon, 6 Sep 2021 09:29:50 +0000 (21:29 +1200)]
dev/core#2817 Add CaseToken processor

Note this isn't quite passing yet - it highlights that the pre-existing case tokens do
different stuff with date fields. Thinking

3 years agoFix booleans to use :label format
Eileen McNaughton [Fri, 10 Sep 2021 03:59:42 +0000 (15:59 +1200)]
Fix booleans to use :label format

3 years agoAdd token processor for Contribution Recur
Eileen McNaughton [Tue, 31 Aug 2021 04:21:37 +0000 (16:21 +1200)]
Add token processor for Contribution Recur

This adds the token processor using our preferred outputs + 100% test cover.

3 years agoMerge pull request #21416 from eileenmcnaughton/dom_toke
Seamus Lee [Fri, 10 Sep 2021 00:37:02 +0000 (10:37 +1000)]
Merge pull request #21416 from eileenmcnaughton/dom_toke

[REF] Extract function to getDomainTokens

3 years agoMerge pull request #21408 from colemanw/bumpMinUpgradeVer
Eileen McNaughton [Fri, 10 Sep 2021 00:30:02 +0000 (12:30 +1200)]
Merge pull request #21408 from colemanw/bumpMinUpgradeVer

Bump minimum upgradable version to 4.5.9

3 years agoMerge pull request #21425 from eileenmcnaughton/error
Eileen McNaughton [Fri, 10 Sep 2021 00:29:45 +0000 (12:29 +1200)]
Merge pull request #21425 from eileenmcnaughton/error

Remove error handling for core error being returned

3 years agoMerge pull request #21414 from eileenmcnaughton/greet
Seamus Lee [Thu, 9 Sep 2021 23:13:07 +0000 (09:13 +1000)]
Merge pull request #21414 from eileenmcnaughton/greet

dev/core#2814 Remove redundant call to `replaceContactTokens`

3 years agoMerge pull request #21422 from demeritcowboy/smarty-find-activities
Seamus Lee [Thu, 9 Sep 2021 23:12:47 +0000 (09:12 +1000)]
Merge pull request #21422 from demeritcowboy/smarty-find-activities

Smarty notices on Find Activities results page

3 years ago(REF) TokenProcessor - Use preg_replace_callback() instead of strtr()
Tim Otten [Thu, 9 Sep 2021 22:38:35 +0000 (15:38 -0700)]
(REF) TokenProcessor - Use preg_replace_callback() instead of strtr()

This will allow more complicated token expressions.

3 years ago(NFC) TokenProcessor - Docblock
Tim Otten [Thu, 9 Sep 2021 22:37:26 +0000 (15:37 -0700)]
(NFC) TokenProcessor - Docblock

3 years agoRemove error handling for core error being returned
Eileen McNaughton [Thu, 9 Sep 2021 22:23:05 +0000 (10:23 +1200)]
Remove error handling for core error being returned

This would be throwing an exception - also it isn't an error situation

3 years agoSearchKit - Support custom fields in bridge join entities
Coleman Watts [Thu, 9 Sep 2021 21:50:57 +0000 (17:50 -0400)]
SearchKit - Support custom fields in bridge join entities

This fixes bridge joins in APIv4 to allow selecting custom fields that belong to the bridge entity
as if they were part of the joined entity. This was already working for core fields.

3 years agosmarty notices
demeritcowboy [Thu, 9 Sep 2021 15:31:24 +0000 (11:31 -0400)]
smarty notices

3 years agoRemove redundant call
Eileen McNaughton [Thu, 9 Sep 2021 02:01:42 +0000 (14:01 +1200)]
Remove redundant call

3 years agoMerge pull request #21418 from eileenmcnaughton/toke2
Tim Otten [Thu, 9 Sep 2021 21:15:01 +0000 (14:15 -0700)]
Merge pull request #21418 from eileenmcnaughton/toke2

[REF] Remove cruft

3 years agoMerge pull request #21421 from demeritcowboy/tag-table
Eileen McNaughton [Thu, 9 Sep 2021 20:52:03 +0000 (08:52 +1200)]
Merge pull request #21421 from demeritcowboy/tag-table

Smarty notice on Find Activities / Find Cases

3 years agosmarty notice
demeritcowboy [Thu, 9 Sep 2021 14:57:40 +0000 (10:57 -0400)]
smarty notice

3 years agoMerge pull request #21417 from eileenmcnaughton/cont_mode
demeritcowboy [Thu, 9 Sep 2021 14:37:56 +0000 (10:37 -0400)]
Merge pull request #21417 from eileenmcnaughton/cont_mode

Follow up on removing contributeMode from templates

3 years agoMerge pull request #21419 from civicrm/5.42
colemanw [Thu, 9 Sep 2021 13:08:31 +0000 (09:08 -0400)]
Merge pull request #21419 from civicrm/5.42

Merge 5.42 to master

3 years agoMerge pull request #21411 from colemanw/fixSearchKitAugmentSelectClause
colemanw [Thu, 9 Sep 2021 13:07:17 +0000 (09:07 -0400)]
Merge pull request #21411 from colemanw/fixSearchKitAugmentSelectClause

SearchKit - Fix aggregated joins

3 years ago[REF] Extract function to getDomainTokens
Eileen McNaughton [Thu, 9 Sep 2021 06:38:58 +0000 (18:38 +1200)]
[REF] Extract function to getDomainTokens

This caches the whole token set by domain+locale+html rather than just part.

I am thinking about where this should do - on the BAO_Domain class?
Or on a token processor class (eventually it would only be
called from a token processor class)

Test cover in 'BAO_MessageTemplateTest.testDomainTokens'

3 years ago[REF] Remove cruft
Eileen McNaughton [Thu, 9 Sep 2021 07:18:16 +0000 (19:18 +1200)]
[REF] Remove cruft

As the comment says - it's weird. Also I found the related code has been removed

3 years agoFollow up on removing contributeMode from templates
Eileen McNaughton [Thu, 9 Sep 2021 07:04:39 +0000 (19:04 +1200)]
Follow up on removing contributeMode from templates

Per https://github.com/civicrm/civicrm-core/pull/21059
its a really long time since this was in the stock templates

3 years agoMerge pull request #21059 from eileenmcnaughton/contribuion_mode
Eileen McNaughton [Thu, 9 Sep 2021 06:58:22 +0000 (18:58 +1200)]
Merge pull request #21059 from eileenmcnaughton/contribuion_mode

dev/core#2748 Remove unused token assigns

3 years agodev/core#2823 Extract code to load the declarations and call from the constructor
Eileen McNaughton [Wed, 8 Sep 2021 02:10:28 +0000 (14:10 +1200)]
dev/core#2823 Extract code to load the declarations and call from the constructor

The declarations are only used in object context so it makes sense to load
them in the constructor. In addition they are ALWAYS loaded except in test usage
(it does seem a bit silly having the option to pass them in only for tests
but we can ignore that for now - I commented it)

3 years agodev/core#2823 Move validation into validation function
Eileen McNaughton [Wed, 8 Sep 2021 02:32:43 +0000 (14:32 +1200)]
dev/core#2823 Move validation into validation function

As the code comments suggest the handling of a module being unrecognised sould
be handled in the validate not the enable function

3 years agoMerge pull request #21412 from eileenmcnaughton/protected
colemanw [Thu, 9 Sep 2021 05:31:35 +0000 (01:31 -0400)]
Merge pull request #21412 from eileenmcnaughton/protected

dev/core#2823 update function visibility to protected

3 years agoMerge pull request #21174 from mattwire/unsubscribemessaging
demeritcowboy [Thu, 9 Sep 2021 00:39:39 +0000 (20:39 -0400)]
Merge pull request #21174 from mattwire/unsubscribemessaging

Mailing Unsubscribe Form: Show if email is already unsubscribed

3 years agodev/core#2748 Remove unused token assigns
Eileen McNaughton [Sat, 7 Aug 2021 07:18:30 +0000 (19:18 +1200)]
dev/core#2748 Remove unused token assigns

3 years agodev/core#2823 update function visibility to protected
Eileen McNaughton [Wed, 8 Sep 2021 23:36:31 +0000 (11:36 +1200)]
dev/core#2823 update function visibility to protected

This makes some internal functions 'protected'. I did a universer search for them.

Making them protected means that when I look to clean them up it is
clear that we only need to worry about how the class
interacts with them

3 years agoMerge pull request #21410 from demeritcowboy/smarty-individual
Eileen McNaughton [Wed, 8 Sep 2021 22:25:50 +0000 (10:25 +1200)]
Merge pull request #21410 from demeritcowboy/smarty-individual

Smarty warning about missing contact subtype on New Individual

3 years agoMerge pull request #21409 from demeritcowboy/double-root
Eileen McNaughton [Wed, 8 Sep 2021 22:00:41 +0000 (10:00 +1200)]
Merge pull request #21409 from demeritcowboy/double-root

Remove duplicate global declaration in civicrm.settings.php template

3 years agoMerge pull request #21405 from colemanw/tableStyle
Eileen McNaughton [Wed, 8 Sep 2021 21:36:51 +0000 (09:36 +1200)]
Merge pull request #21405 from colemanw/tableStyle

SearchKit & Afform - Use Bootstrap table styles on admin screens

3 years agoSearchKit - Exclude links from aggregated joins
Coleman Watts [Wed, 8 Sep 2021 21:16:58 +0000 (17:16 -0400)]
SearchKit - Exclude links from aggregated joins

3 years agosubtype might legitimately be empty
demeritcowboy [Wed, 8 Sep 2021 20:27:38 +0000 (16:27 -0400)]
subtype might legitimately be empty

3 years agoremove duplicate declaration
demeritcowboy [Wed, 8 Sep 2021 20:09:41 +0000 (16:09 -0400)]
remove duplicate declaration

3 years agoSearchKit - Partial backport of 4afe3e
Coleman Watts [Wed, 8 Sep 2021 18:47:40 +0000 (14:47 -0400)]
SearchKit - Partial backport of 4afe3e

3 years agoBump minimum upgradable version to 4.5.9
Coleman Watts [Wed, 8 Sep 2021 18:19:52 +0000 (14:19 -0400)]
Bump minimum upgradable version to 4.5.9

3 years agoMerge pull request #21406 from demeritcowboy/comma
colemanw [Wed, 8 Sep 2021 17:43:48 +0000 (13:43 -0400)]
Merge pull request #21406 from demeritcowboy/comma

[search kit] Semicolon vs comma

3 years agocomma
demeritcowboy [Wed, 8 Sep 2021 17:08:04 +0000 (13:08 -0400)]
comma

3 years agoMerge pull request #21404 from colemanw/fixSearchDeleteConfirm
demeritcowboy [Wed, 8 Sep 2021 14:26:09 +0000 (10:26 -0400)]
Merge pull request #21404 from colemanw/fixSearchDeleteConfirm

Fixes dev/core#2826 SearchKit - Fix delete search confirm dialog

3 years agoAfform - Use bootstrap table classes on admin table
Coleman Watts [Wed, 8 Sep 2021 14:13:43 +0000 (10:13 -0400)]
Afform - Use bootstrap table classes on admin table

3 years agoSearchKit - Use bootstrap table classes on admin screens
Coleman Watts [Wed, 8 Sep 2021 14:10:17 +0000 (10:10 -0400)]
SearchKit - Use bootstrap table classes on admin screens

3 years agoSearchKit - Fix delete search confirm dialog
Coleman Watts [Wed, 8 Sep 2021 12:31:54 +0000 (08:31 -0400)]
SearchKit - Fix delete search confirm dialog

Fixes dev/core#2826

3 years agoMerge pull request #21397 from colemanw/tableStyles
Eileen McNaughton [Wed, 8 Sep 2021 05:48:13 +0000 (17:48 +1200)]
Merge pull request #21397 from colemanw/tableStyles

SearchKit - Support bootstrap styles in search display tables

3 years agoMerge pull request #21381 from eileenmcnaughton/ent
Eileen McNaughton [Wed, 8 Sep 2021 05:38:26 +0000 (17:38 +1200)]
Merge pull request #21381 from eileenmcnaughton/ent

dev/core#2817 Block submission of pdf with text including token format that is ambiguous with the processor

3 years agoMerge pull request #21394 from colemanw/debounceGetResults
Eileen McNaughton [Wed, 8 Sep 2021 05:37:27 +0000 (17:37 +1200)]
Merge pull request #21394 from colemanw/debounceGetResults

SearchKit - Prevent race conditions in search display loading

3 years agoMerge pull request #21388 from colemanw/searchKitFilter
Eileen McNaughton [Wed, 8 Sep 2021 05:35:39 +0000 (17:35 +1200)]
Merge pull request #21388 from colemanw/searchKitFilter

SearchKit - Filter search listing by creator

3 years agodev/core#2823 Move validation into validation function
Eileen McNaughton [Wed, 8 Sep 2021 02:32:43 +0000 (14:32 +1200)]
dev/core#2823 Move validation into validation function

As the code comments suggest the handling of a module being unrecognised sould
be handled in the validate not the enable function

3 years agoBlock submission with token format that is ambiguous with the processor
Eileen McNaughton [Mon, 6 Sep 2021 08:26:04 +0000 (20:26 +1200)]
Block submission with token format that is ambiguous with the processor

3 years agoMerge pull request #21398 from demeritcowboy/basic-email-test
Seamus Lee [Wed, 8 Sep 2021 02:40:10 +0000 (12:40 +1000)]
Merge pull request #21398 from demeritcowboy/basic-email-test

[NFC] Put back email test without tokens and enhance a little

3 years agoadd test without tokens
demeritcowboy [Wed, 8 Sep 2021 01:06:27 +0000 (21:06 -0400)]
add test without tokens

3 years agoSearchKit - Support bootstrap styles in search display tables
Coleman Watts [Tue, 7 Sep 2021 23:31:29 +0000 (19:31 -0400)]
SearchKit - Support bootstrap styles in search display tables

3 years agoMerge pull request #21396 from seamuslee001/fix_upgrade
Seamus Lee [Wed, 8 Sep 2021 01:04:46 +0000 (11:04 +1000)]
Merge pull request #21396 from seamuslee001/fix_upgrade

Fix Upgrade step to ensure all fields are converted correctly as well

3 years agoMerge pull request #21395 from eileenmcnaughton/mgd
Eileen McNaughton [Wed, 8 Sep 2021 00:06:17 +0000 (12:06 +1200)]
Merge pull request #21395 from eileenmcnaughton/mgd

dev/core#2823 Make protected functions non-static

3 years agoMerge pull request #20995 from ixiam/dev-import-phone-extension
demeritcowboy [Tue, 7 Sep 2021 23:54:50 +0000 (19:54 -0400)]
Merge pull request #20995 from ixiam/dev-import-phone-extension

Import csv-Fix not importing extension in phones

3 years agoFix Upgrade step to ensure all fields are converted correctly as well
Seamus Lee [Tue, 7 Sep 2021 23:16:54 +0000 (09:16 +1000)]
Fix Upgrade step to ensure all fields are converted correctly as well

3 years agodev/core#2823 Make protected functions non-static
Eileen McNaughton [Tue, 7 Sep 2021 21:57:11 +0000 (09:57 +1200)]
dev/core#2823 Make protected functions non-static

It's really hard to see why this class uses a mix of static & non-static functions
for internal (protected) functions. I suspect *history*. This makes
them all non-static

3 years agoSearchKit - Filter search listing by author, adding support for OR in filters
Coleman Watts [Mon, 6 Sep 2021 23:40:10 +0000 (19:40 -0400)]
SearchKit - Filter search listing by author, adding support for OR in filters

3 years agoSearchKit - Prevent race conditions in search display loading
Coleman Watts [Tue, 7 Sep 2021 18:36:58 +0000 (14:36 -0400)]
SearchKit - Prevent race conditions in search display loading

- Increases debounce timeout from 100 to 800 ms
- Internally tracks the requests to ensure that later requests always take priority

3 years agoMerge pull request #21186 from demeritcowboy/multiint
colemanw [Tue, 7 Sep 2021 13:15:12 +0000 (09:15 -0400)]
Merge pull request #21186 from demeritcowboy/multiint

dev/core#2772 - Don't crash for custom fields of type int that are multi-select

3 years agoMerge pull request #20822 from seamuslee001/use_product_api_form_hook
colemanw [Tue, 7 Sep 2021 13:10:56 +0000 (09:10 -0400)]
Merge pull request #20822 from seamuslee001/use_product_api_form_hook

[REF] Update Product Create to use hooks and also switch the manage p…

3 years agoIndicate if email is already unsubscribed.
Matthew Wire [Wed, 18 Aug 2021 14:50:37 +0000 (15:50 +0100)]
Indicate if email is already unsubscribed.

3 years agoMerge pull request #21389 from seamuslee001/relationship_cache_table_fix
Matthew Wire [Tue, 7 Sep 2021 10:21:53 +0000 (11:21 +0100)]
Merge pull request #21389 from seamuslee001/relationship_cache_table_fix

[REF] Add in upgrade step to align the relationship cache table colla…

3 years agoMerge pull request #21380 from eileenmcnaughton/case_opts
Matthew Wire [Tue, 7 Sep 2021 10:20:21 +0000 (11:20 +0100)]
Merge pull request #21380 from eileenmcnaughton/case_opts

dev/core#2817 towards deprecating legacy `replaceCaseTokens`

3 years agoMerge pull request #21386 from seamuslee001/test_sendemail
Eileen McNaughton [Tue, 7 Sep 2021 03:20:52 +0000 (15:20 +1200)]
Merge pull request #21386 from seamuslee001/test_sendemail

[NFC] Extend send email test to cover for contact tokens being replaced

3 years agoMerge pull request #21390 from seamuslee001/function_type_hints_upgrade
Eileen McNaughton [Tue, 7 Sep 2021 03:20:28 +0000 (15:20 +1200)]
Merge pull request #21390 from seamuslee001/function_type_hints_upgrade

[NFC] Add in type hints to template upgrade functions

3 years ago[NFC] Add in type hints to template upgrade functions
Seamus Lee [Tue, 7 Sep 2021 01:27:07 +0000 (11:27 +1000)]
[NFC] Add in type hints to template upgrade functions

3 years ago[REF] Add in upgrade step to align the relationship cache table collation and charset...
Seamus Lee [Tue, 7 Sep 2021 01:23:06 +0000 (11:23 +1000)]
[REF] Add in upgrade step to align the relationship cache table collation and charset with the other tables

3 years agoMerge pull request #21382 from mattwire/collate
Seamus Lee [Tue, 7 Sep 2021 01:16:42 +0000 (11:16 +1000)]
Merge pull request #21382 from mattwire/collate

Don't specify character set for civicrm_relationship_cache table

3 years agoMerge pull request #21385 from eileenmcnaughton/email_fix
Seamus Lee [Mon, 6 Sep 2021 23:50:01 +0000 (09:50 +1000)]
Merge pull request #21385 from eileenmcnaughton/email_fix

dev/core#2814 Fix activity:sendEmail follow up