civicrm-core.git
2 years agoFix bug where log hook is ignored on custom field create
Eileen McNaughton [Tue, 21 Sep 2021 00:52:26 +0000 (12:52 +1200)]
Fix bug where log hook is ignored on custom field create

It is possible to specify that various tables should not
result in a log table via the `alterLogTables` hook.

This is useful for excluding tables of low information
value or tables like summary fields that are calculated
values. However, when altering custom fields this
hook's output was being ignored as it was going through
the specific path of
which did not have awareness of this hook.

This code path is the primary use for this function.

It's also called via createMissingLogTables - but in
that case the calculation is already done. It is not
elsewhere in git universe and the return value
is never used, so I removed it

2 years agoMerge pull request #21578 from civicrm/5.42
Eileen McNaughton [Wed, 22 Sep 2021 19:31:22 +0000 (07:31 +1200)]
Merge pull request #21578 from civicrm/5.42

5.42 to master

2 years agoMerge pull request #21575 from agh1/5.42.0-releasenotes-initial
Eileen McNaughton [Wed, 22 Sep 2021 19:30:30 +0000 (07:30 +1200)]
Merge pull request #21575 from agh1/5.42.0-releasenotes-initial

5.42.0 release notes initial run

2 years ago5.42.0 release notes: added boilerplate
Andie Hunt [Wed, 22 Sep 2021 15:45:21 +0000 (11:45 -0400)]
5.42.0 release notes: added boilerplate

2 years ago5.42.0 release notes: raw from script
Andie Hunt [Wed, 22 Sep 2021 15:44:57 +0000 (11:44 -0400)]
5.42.0 release notes: raw from script

2 years agoMerge pull request #21554 from eileenmcnaughton/loop
demeritcowboy [Wed, 22 Sep 2021 13:51:02 +0000 (09:51 -0400)]
Merge pull request #21554 from eileenmcnaughton/loop

[REF] Remove illusion of looping

2 years agoMerge pull request #21563 from eileenmcnaughton/ev_toke
Eileen McNaughton [Wed, 22 Sep 2021 01:39:52 +0000 (13:39 +1200)]
Merge pull request #21563 from eileenmcnaughton/ev_toke

Initial test on event tokens

2 years agoMerge pull request #21566 from eileenmcnaughton/render
colemanw [Wed, 22 Sep 2021 00:23:43 +0000 (20:23 -0400)]
Merge pull request #21566 from eileenmcnaughton/render

Remove deprecated code lines

2 years agoTest cleanup
Eileen McNaughton [Tue, 21 Sep 2021 19:31:29 +0000 (07:31 +1200)]
Test cleanup

Fixes passing null to event create. Remove some tests duplicated by syntaxconformance

2 years agoMerge pull request #21555 from eileenmcnaughton/money
Matthew Wire [Tue, 21 Sep 2021 22:07:43 +0000 (23:07 +0100)]
Merge pull request #21555 from eileenmcnaughton/money

dev/core#2493 Add support for money laundry in `getSubmittedValue`

2 years agoMerge pull request #21430 from mattwire/flushcache
Matthew Wire [Tue, 21 Sep 2021 22:03:50 +0000 (23:03 +0100)]
Merge pull request #21430 from mattwire/flushcache

flushCaches should respect permitCacheFlushMode. Also flush caches which have a NULL cache_date

2 years agoRemove deprecated code lines
Eileen McNaughton [Tue, 21 Sep 2021 21:33:44 +0000 (09:33 +1200)]
Remove deprecated code lines

These have been deprecated for around 8 months
, are not used in core, and are in code where
5.43 will already require extra testing so let's remove
so we can simplify

2 years agoInitial test on event tokens
Eileen McNaughton [Tue, 21 Sep 2021 09:06:13 +0000 (21:06 +1200)]
Initial test on event tokens

Note there is an issue to do with caching affecting the custom token but
it's out of scope on this test

2 years agoMerge pull request #21553 from eileenmcnaughton/email2
demeritcowboy [Tue, 21 Sep 2021 19:34:24 +0000 (15:34 -0400)]
Merge pull request #21553 from eileenmcnaughton/email2

[Ref] Extend email trait test, process more sanely

2 years agoMerge pull request #21494 from eileenmcnaughton/compat
Tim Otten [Tue, 21 Sep 2021 10:09:11 +0000 (03:09 -0700)]
Merge pull request #21494 from eileenmcnaughton/compat

dev/core#2814 TokenCompatSubscriber - evaluate contact tokens during civi.token.eval phase

2 years agoMerge pull request #21374 from ufundo/event-custom-tokens
Eileen McNaughton [Tue, 21 Sep 2021 09:55:34 +0000 (21:55 +1200)]
Merge pull request #21374 from ufundo/event-custom-tokens

Fix event custom field tokens in scheduled reminders

2 years agoMerge pull request #21560 from demeritcowboy/report-query-string
Eileen McNaughton [Tue, 21 Sep 2021 07:18:30 +0000 (19:18 +1200)]
Merge pull request #21560 from demeritcowboy/report-query-string

CiviReport - avoid error in test environments when using built-in php web server

2 years ago[Ref] Extend email trait test, process more sanely
Eileen McNaughton [Mon, 20 Sep 2021 21:00:29 +0000 (09:00 +1200)]
[Ref] Extend email trait test, process more sanely

2 years ago[REF] Extract getFromValues, add test
Eileen McNaughton [Sun, 19 Sep 2021 10:44:20 +0000 (22:44 +1200)]
[REF] Extract getFromValues, add test

This extracts the code used to get the from values, moves the default setting
to the default and adds a test.

The goal is actually to add a test on the submit function
but it's proving to be challenging so this at least gets the
default setting tested.

Note that this code used to be on a static class, not a trait, and
some stuff is in weird places - in particular stuff that
should be in setDefaults and postProcess is happening on
preProcess. However, most
of the classes that override this
trait do not do much more than call the trait so that helps at
least

2 years agoMerge pull request #21561 from civicrm/5.42
Eileen McNaughton [Tue, 21 Sep 2021 04:38:05 +0000 (16:38 +1200)]
Merge pull request #21561 from civicrm/5.42

5.42 to master

2 years agoMerge pull request #21559 from eileenmcnaughton/542
Eileen McNaughton [Tue, 21 Sep 2021 04:37:33 +0000 (16:37 +1200)]
Merge pull request #21559 from eileenmcnaughton/542

dev/core#2843 push new link to the end

2 years agoavoid error in test environments using built-in php web server
demeritcowboy [Tue, 21 Sep 2021 04:10:50 +0000 (00:10 -0400)]
avoid error in test environments using built-in php web server

2 years agoFix signature_html to return html
Eileen McNaughton [Sat, 18 Sep 2021 02:21:41 +0000 (14:21 +1200)]
Fix signature_html to return html

This seems to be more in line with processor expectations

2 years agoAdd enough hack-handling to make this PR not change outputs
Eileen McNaughton [Fri, 17 Sep 2021 22:05:32 +0000 (10:05 +1200)]
Add enough hack-handling to make this PR not change outputs

2 years agodev/core#2814 TokenCompatSubscriber - evaluate contact tokens during civi.token.eval...
Eileen McNaughton [Thu, 16 Sep 2021 04:03:39 +0000 (16:03 +1200)]
dev/core#2814 TokenCompatSubscriber - evaluate contact tokens during civi.token.eval phase

m

2 years agoMerge pull request #21558 from eileenmcnaughton/no_gender
Seamus Lee [Tue, 21 Sep 2021 03:28:03 +0000 (13:28 +1000)]
Merge pull request #21558 from eileenmcnaughton/no_gender

Stop testing for gender_id output that was described as 'legacy' years ago

2 years agodev/core#2843 push new link to the end
Eileen McNaughton [Sat, 18 Sep 2021 20:58:47 +0000 (08:58 +1200)]
dev/core#2843 push new link to the end

As discussed in https://lab.civicrm.org/dev/core/-/issues/2843
this makes the UI change less for users & reduces confusion

2 years agoStop testing for gender_id output that was described as 'legacy' years ago
Eileen McNaughton [Sat, 18 Sep 2021 02:21:50 +0000 (14:21 +1200)]
Stop testing for gender_id output that was described as 'legacy' years ago

This token is not 'advertised' in the widget. I think removing this

2 years agoMerge pull request #21530 from eileenmcnaughton/badger2
Eileen McNaughton [Tue, 21 Sep 2021 01:18:37 +0000 (13:18 +1200)]
Merge pull request #21530 from eileenmcnaughton/badger2

Convert event badges to use token processor

2 years agoConvert event badges to use token processor
Eileen McNaughton [Sat, 18 Sep 2021 22:49:29 +0000 (10:49 +1200)]
Convert event badges to use token processor

This adds the token processor class for participants and
switches the one place where we currently resolve participant
tokens to use it.

In the process I upgrade the badge tokens with a syntax change and
drop a few more that are actually
a) weird / seemingly accidentally exposed and
b) not really part of the participant entity

ie event template title & default role id

With participant tokens we have been fortunate not
to let a non-standard implementation go out
so it's only the event badges which are
a bit obscure / less used / less likely to be
blindly used. I have added token replacement
but I think it will be all very edge case

2 years agoMerge pull request #21520 from eileenmcnaughton/badger
Seamus Lee [Mon, 20 Sep 2021 23:11:19 +0000 (09:11 +1000)]
Merge pull request #21520 from eileenmcnaughton/badger

Participant tokens - remove / replace unsupportable from badges (conversion preparation)

2 years agoMerge pull request #21537 from eileenmcnaughton/ev_token2
Seamus Lee [Mon, 20 Sep 2021 22:46:08 +0000 (08:46 +1000)]
Merge pull request #21537 from eileenmcnaughton/ev_token2

Use the processor function to get event tokens

2 years agoMerge pull request #21552 from eileenmcnaughton/test_clean
Seamus Lee [Mon, 20 Sep 2021 22:41:11 +0000 (08:41 +1000)]
Merge pull request #21552 from eileenmcnaughton/test_clean

Cleanup on test tear downs

2 years agodev/core#2493 Add support for money fields to
Eileen McNaughton [Mon, 20 Sep 2021 21:44:27 +0000 (09:44 +1200)]
dev/core#2493 Add support for money fields to

This ensures that any money fields retrieved by  are
in a machine usable format.

We've been switching to this function rather than 'passing around arrays'
but we need to ensure this function is returning clean money to
prevent regressions.

2 years agoMerge pull request #21550 from demeritcowboy/template-missed
Eileen McNaughton [Mon, 20 Sep 2021 21:23:01 +0000 (09:23 +1200)]
Merge pull request #21550 from demeritcowboy/template-missed

Missed message template updates from 5.39/5.40

2 years ago[REF] Remove illusion of looping
Eileen McNaughton [Mon, 20 Sep 2021 21:15:11 +0000 (09:15 +1200)]
[REF] Remove illusion of looping

This foreach actually only copes with 1 values. Making that clearer makes it more readable

2 years agoMerge pull request #21490 from eileenmcnaughton/case_email
demeritcowboy [Mon, 20 Sep 2021 20:06:40 +0000 (16:06 -0400)]
Merge pull request #21490 from eileenmcnaughton/case_email

dev/core#2554 Remove code to assign contact to the template in sendEmail

2 years agoCleanup on test tear downs
Eileen McNaughton [Mon, 20 Sep 2021 19:55:57 +0000 (07:55 +1200)]
Cleanup on test tear downs

2 years agoMerge pull request #21509 from JMAConsulting/core_2820
Eileen McNaughton [Mon, 20 Sep 2021 19:44:02 +0000 (07:44 +1200)]
Merge pull request #21509 from JMAConsulting/core_2820

dev/core#2820: Deduping produces bad results after a rule change

2 years agoMerge pull request #21508 from eileenmcnaughton/date
colemanw [Mon, 20 Sep 2021 17:34:54 +0000 (13:34 -0400)]
Merge pull request #21508 from eileenmcnaughton/date

Add support for CiviCRM date formats in crmDate

2 years agoMerge pull request #21493 from eileenmcnaughton/pdf
colemanw [Mon, 20 Sep 2021 17:32:54 +0000 (13:32 -0400)]
Merge pull request #21493 from eileenmcnaughton/pdf

dev/core#2839 Fix addition of _preview to filename

2 years agoMerge pull request #21547 from agileware/CIVIBLD-280
colemanw [Mon, 20 Sep 2021 17:30:39 +0000 (13:30 -0400)]
Merge pull request #21547 from agileware/CIVIBLD-280

View Contribution page, move the Done button to the last button, currently shown in the middle

2 years agoMerge pull request #21549 from artfulrobot/artfulrobot-htmlencoding-api-output
colemanw [Mon, 20 Sep 2021 17:29:39 +0000 (13:29 -0400)]
Merge pull request #21549 from artfulrobot/artfulrobot-htmlencoding-api-output

Add test and fix for API4 failing to decode strings stored as HTML

2 years agoMerge pull request #21546 from agileware/CIVIBLD-279
colemanw [Mon, 20 Sep 2021 17:29:21 +0000 (13:29 -0400)]
Merge pull request #21546 from agileware/CIVIBLD-279

Replace "Print Invoice" and "Print Invoice and Credit Note" buttons with label "Download Invoice" and "Download Invoice and Credit Note"

2 years agoMerge pull request #21533 from colemanw/relEdit
colemanw [Mon, 20 Sep 2021 16:29:52 +0000 (12:29 -0400)]
Merge pull request #21533 from colemanw/relEdit

SearchKit - Fix in-place edit of relationships and dates

2 years agomissed from 5.39/5.40
demeritcowboy [Mon, 20 Sep 2021 14:41:56 +0000 (10:41 -0400)]
missed from 5.39/5.40

2 years agoAPIv4 - Decode output of write operations
Rich Lott / Artful Robot [Mon, 20 Sep 2021 13:52:21 +0000 (14:52 +0100)]
APIv4 - Decode output of write operations

CiviCRM regrettably stores most strings as HTML in the database.
This fixes the output of APIv4 write operations to decode them and return non-html

2 years agoMerge pull request #21548 from eileenmcnaughton/cleanup
Seamus Lee [Mon, 20 Sep 2021 08:42:21 +0000 (18:42 +1000)]
Merge pull request #21548 from eileenmcnaughton/cleanup

Test tearDown fixes

2 years agoTest tearDown fixes
Eileen McNaughton [Mon, 20 Sep 2021 01:45:42 +0000 (13:45 +1200)]
Test tearDown fixes

Fixes places where parent:tearDown not called and civicrm_file &
civicrm_entity_file not truncated

Also note - increasing use of fail() rather than allowing
exceptions to bubble up in test functions in order
to not let tearDown be such a distraction & require annotation

2 years agoMerge pull request #21543 from eileenmcnaughton/notice3
Eileen McNaughton [Mon, 20 Sep 2021 01:30:37 +0000 (13:30 +1200)]
Merge pull request #21543 from eileenmcnaughton/notice3

Tpl notice fix

2 years agoMerge pull request #21545 from eileenmcnaughton/tpl5
Eileen McNaughton [Mon, 20 Sep 2021 01:30:21 +0000 (13:30 +1200)]
Merge pull request #21545 from eileenmcnaughton/tpl5

tpl enotice fixes on extensions page

2 years agoCIVIBLD-280 View Contribution page, move the Done button to the last button, currentl...
Justin Freeman [Mon, 20 Sep 2021 01:05:05 +0000 (11:05 +1000)]
CIVIBLD-280 View Contribution page, move the Done button to the last button, currently shown in the middle

2 years agoCIVIBLD-279 Replace "Print Invoice" and "Print Invoice and Credit Note" buttons with...
Justin Freeman [Mon, 20 Sep 2021 00:39:23 +0000 (10:39 +1000)]
CIVIBLD-279 Replace "Print Invoice" and "Print Invoice and Credit Note" buttons with label "Download Invoice" and "Download Invoice and Credit Note"

2 years agoTpl notice fix
Eileen McNaughton [Sun, 19 Sep 2021 21:15:58 +0000 (09:15 +1200)]
Tpl notice fix

2 years agotpl enotice fixes on extensions page
Eileen McNaughton [Sun, 19 Sep 2021 23:14:37 +0000 (11:14 +1200)]
tpl enotice fixes on extensions page

2 years agoMerge pull request #21544 from eileenmcnaughton/tpl4
Eileen McNaughton [Sun, 19 Sep 2021 23:08:10 +0000 (11:08 +1200)]
Merge pull request #21544 from eileenmcnaughton/tpl4

Tpl notice fixes

2 years agoMerge pull request #21542 from eileenmcnaughton/notice2
Eileen McNaughton [Sun, 19 Sep 2021 23:07:48 +0000 (11:07 +1200)]
Merge pull request #21542 from eileenmcnaughton/notice2

Tpl enotice fixes

2 years agoMerge pull request #21541 from eileenmcnaughton/notice
Eileen McNaughton [Sun, 19 Sep 2021 23:07:31 +0000 (11:07 +1200)]
Merge pull request #21541 from eileenmcnaughton/notice

Enotice fixes in tpls

2 years agoTpl notice fixes
Eileen McNaughton [Sun, 19 Sep 2021 21:18:26 +0000 (09:18 +1200)]
Tpl notice fixes

2 years agoTpl enotice fixes
Eileen McNaughton [Sun, 19 Sep 2021 21:14:29 +0000 (09:14 +1200)]
Tpl enotice fixes

2 years agoEnotice fixes in tpls
Eileen McNaughton [Sun, 19 Sep 2021 20:29:47 +0000 (08:29 +1200)]
Enotice fixes in tpls

2 years agoMerge pull request #21152 from eileenmcnaughton/batch_order
Seamus Lee [Sun, 19 Sep 2021 20:28:59 +0000 (06:28 +1000)]
Merge pull request #21152 from eileenmcnaughton/batch_order

dev/core#2717 Use order api for new membership create in batch

2 years agoMerge pull request #21526 from mattwire/viewrecur_phpnotice
demeritcowboy [Sun, 19 Sep 2021 16:29:17 +0000 (12:29 -0400)]
Merge pull request #21526 from mattwire/viewrecur_phpnotice

Fix PHP notices in contributionrecur tpl

2 years agoMerge pull request #21529 from eileenmcnaughton/view
Matthew Wire [Sun, 19 Sep 2021 10:17:11 +0000 (11:17 +0100)]
Merge pull request #21529 from eileenmcnaughton/view

dev/core#2843 push new link to the end

2 years agoMerge pull request #21495 from colemanw/fieldsForJoin
Eileen McNaughton [Sun, 19 Sep 2021 06:54:05 +0000 (18:54 +1200)]
Merge pull request #21495 from colemanw/fieldsForJoin

SearchKit - Exclude custom fields from ON clause selector

2 years agoMerge pull request #21535 from colemanw/concat_ws
Eileen McNaughton [Sun, 19 Sep 2021 06:33:15 +0000 (18:33 +1200)]
Merge pull request #21535 from colemanw/concat_ws

Add CONCAT_WS fn to APIv4 and UI support in SearchKit

2 years agoUse the procesor function to get event tokens
Eileen McNaughton [Sun, 19 Sep 2021 04:14:42 +0000 (16:14 +1200)]
Use the procesor function to get event tokens

2 years agoStart adding tests on event tokens
Eileen McNaughton [Sun, 19 Sep 2021 04:09:11 +0000 (16:09 +1200)]
Start adding tests on event tokens

This reconciles the 2 ways of listing event tokens. (The way
we are about to deprecate doesn't list custom fields but
can just call the other

2 years agoAdd CONCAT_WS fn to APIv4 and UI support in SearchKit
Coleman Watts [Sun, 19 Sep 2021 03:32:04 +0000 (23:32 -0400)]
Add CONCAT_WS fn to APIv4 and UI support in SearchKit

2 years agoMerge pull request #21510 from eileenmcnaughton/domain_tokens
colemanw [Sun, 19 Sep 2021 01:50:00 +0000 (21:50 -0400)]
Merge pull request #21510 from eileenmcnaughton/domain_tokens

[REF] Extract domain tokens to their own class

2 years agoSearchKit - Fix in-place edit of relationships and dates
Coleman Watts [Sun, 19 Sep 2021 01:37:03 +0000 (21:37 -0400)]
SearchKit - Fix in-place edit of relationships and dates

Date fields were not rendering correctly, and relationships
could not be edited due to the read-only nature of the relationshipCache table.

2 years agoMerge pull request #21528 from colemanw/fieldTransform
Eileen McNaughton [Sun, 19 Sep 2021 01:29:04 +0000 (13:29 +1200)]
Merge pull request #21528 from colemanw/fieldTransform

SearchKit - Support multiple arguments to field transformations aka SQL functions

2 years agodev/core#2839 Fix addition of _preview to filename
Eileen McNaughton [Thu, 16 Sep 2021 03:26:35 +0000 (15:26 +1200)]
dev/core#2839 Fix addition of _preview to filename

Note this also standardises the buttons with the other forms meaning that
the preview buttons is now available

I think this is more standardised & hence clearer ....

2 years agodev/core#2843 push new link to the end
Eileen McNaughton [Sat, 18 Sep 2021 20:58:47 +0000 (08:58 +1200)]
dev/core#2843 push new link to the end

As discussed in https://lab.civicrm.org/dev/core/-/issues/2843
this makes the UI change less for users & reduces confusion

2 years agoSearchKit - Add UI for multiple function arguments
Coleman Watts [Sat, 18 Sep 2021 14:17:22 +0000 (10:17 -0400)]
SearchKit - Add UI for multiple function arguments

2 years agoAPIv4 - add descriptions to sql functions
Coleman Watts [Fri, 17 Sep 2021 19:37:30 +0000 (15:37 -0400)]
APIv4 - add descriptions to sql functions

2 years agoSearchKit - Refactor SearchAdmin.parseExpr to handle multiple function arguments
Coleman Watts [Thu, 16 Sep 2021 21:59:31 +0000 (17:59 -0400)]
SearchKit - Refactor SearchAdmin.parseExpr to handle multiple function arguments

2 years agoMerge pull request #21523 from eileenmcnaughton/dep
Mathieu Lu [Sat, 18 Sep 2021 13:27:43 +0000 (09:27 -0400)]
Merge pull request #21523 from eileenmcnaughton/dep

Annotate deprecated token functions

2 years agoMerge pull request #21516 from wmortada/contributors-3sd
Mathieu Lu [Sat, 18 Sep 2021 13:26:25 +0000 (09:26 -0400)]
Merge pull request #21516 from wmortada/contributors-3sd

Update contributors for Third Sector Design

2 years agoFix smart group cache clear test so group we're clearing is actually a smart group
Matthew Wire [Fri, 17 Sep 2021 12:59:51 +0000 (13:59 +0100)]
Fix smart group cache clear test so group we're clearing is actually a smart group

2 years agoflushCaches should respect permitCacheFlushMode. Also flush caches which have a NULL...
Matthew Wire [Fri, 10 Sep 2021 09:42:05 +0000 (10:42 +0100)]
flushCaches should respect permitCacheFlushMode. Also flush caches which have a NULL cache_date

2 years agoFix PHP notices in contributionrecur tpl - this also hides some fields if empty
Matthew Wire [Sat, 18 Sep 2021 08:59:42 +0000 (09:59 +0100)]
Fix PHP notices in contributionrecur tpl - this also hides some fields if empty

2 years agoRemove 'bad' tokens from badge tokens
Eileen McNaughton [Fri, 17 Sep 2021 20:39:14 +0000 (08:39 +1200)]
Remove 'bad' tokens from badge tokens

These tokens are
a) non-standard, not easily supported
b) illogical in the only current core usage context
that currently uses these tokens (event badges)
c) partially broken - currency returns nothing, note doesn't make sense

2 years agoRemove duplicate print label tokens
Eileen McNaughton [Fri, 17 Sep 2021 20:28:47 +0000 (08:28 +1200)]
Remove duplicate print label tokens

There are literally 2 tokens for the same option in the drop down.. remove the non-standard one

2 years agoFlesh out participant token test
Eileen McNaughton [Fri, 17 Sep 2021 20:20:37 +0000 (08:20 +1200)]
Flesh out participant token test

m

2 years ago[REF] Extract domain tokens to their own class
Eileen McNaughton [Fri, 17 Sep 2021 06:14:20 +0000 (18:14 +1200)]
[REF] Extract domain tokens to their own class

Note that the moved function was only extracted a few days ago.

2 years agoAnnotate deprecated functions
Eileen McNaughton [Sat, 18 Sep 2021 00:18:46 +0000 (12:18 +1200)]
Annotate deprecated functions

This also adds noisy deprecation to 2 functions
replaceComponentTokens - I thnk this has been out of use for a while. Only 1 reference in universe from
and extension that does not seem to be maintained (commits in 2016 from Sarah Gladstone).
replaceOrgTokens - no core calls since 5.39

2 years agoMerge pull request #21384 from mattwire/groupcontactcache
Eileen McNaughton [Fri, 17 Sep 2021 23:48:52 +0000 (11:48 +1200)]
Merge pull request #21384 from mattwire/groupcontactcache

Don't clear the GroupContactCache until we're ready to insert the new version

2 years agoAdd Kurund
William Mortada [Fri, 17 Sep 2021 14:49:27 +0000 (15:49 +0100)]
Add Kurund

2 years agoMerge pull request #21506 from eileenmcnaughton/member_tokens
colemanw [Fri, 17 Sep 2021 21:05:26 +0000 (17:05 -0400)]
Merge pull request #21506 from eileenmcnaughton/member_tokens

dev/core#2832 Extend Membership tokens to 'listen' and add test cover

2 years agoMerge pull request #21518 from francescbassas/patch-19
Eileen McNaughton [Fri, 17 Sep 2021 20:51:44 +0000 (08:51 +1200)]
Merge pull request #21518 from francescbassas/patch-19

Fix syntax error on a ts() function call

2 years agoMerge pull request #21515 from civicrm/5.42
Eileen McNaughton [Fri, 17 Sep 2021 19:45:02 +0000 (07:45 +1200)]
Merge pull request #21515 from civicrm/5.42

5.42 to master

2 years agoAdd space
francescbassas [Fri, 17 Sep 2021 17:20:35 +0000 (19:20 +0200)]
Add space
Formatting
Close ts() function

2 years agoUpdate company for William Mortada
William Mortada [Fri, 17 Sep 2021 14:42:36 +0000 (15:42 +0100)]
Update company for William Mortada

2 years agoMerge pull request #21512 from JMAConsulting/core_2816_42
demeritcowboy [Fri, 17 Sep 2021 13:14:01 +0000 (09:14 -0400)]
Merge pull request #21512 from JMAConsulting/core_2816_42

dev/core#2816: New contribution can't be saved when validation fails …

2 years agoMerge pull request #21489 from eileenmcnaughton/act_toke
demeritcowboy [Fri, 17 Sep 2021 12:39:46 +0000 (08:39 -0400)]
Merge pull request #21489 from eileenmcnaughton/act_toke

Fix activity tokens

2 years agodev/core#2816: New contribution can't be saved when validation fails on first try
Monish Deb [Fri, 17 Sep 2021 10:42:54 +0000 (16:12 +0530)]
dev/core#2816: New contribution can't be saved when validation fails on first try

2 years agoAdd support for CiviCRM date formats in crmDate
Eileen McNaughton [Thu, 16 Sep 2021 22:22:33 +0000 (10:22 +1200)]
Add support for CiviCRM date formats in crmDate

2 years agodev/core#2820: Deduping produces bad results after a rule change
Monish Deb [Fri, 17 Sep 2021 04:59:40 +0000 (10:29 +0530)]
dev/core#2820: Deduping produces bad results after a rule change

2 years agodev/core#2832 Extend Membership tokens to 'listen' and add test cover
Eileen McNaughton [Mon, 13 Sep 2021 06:23:47 +0000 (18:23 +1200)]
dev/core#2832 Extend Membership tokens to 'listen' and add test cover