civicrm-core.git
3 years agoAfform - Fix loading entities from url args
Coleman Watts [Mon, 26 Apr 2021 04:22:52 +0000 (00:22 -0400)]
Afform - Fix loading entities from url args

This broke when we stopped using ngRoute.
Now entities can be loaded with a url like civicrm/my/afform#!?Individual1=123

3 years agoMerge pull request #20136 from eileenmcnaughton/dom
colemanw [Sun, 25 Apr 2021 23:03:15 +0000 (19:03 -0400)]
Merge pull request #20136 from eileenmcnaughton/dom

[REF] Move functions back to class that uses it

3 years agoMerge pull request #20141 from colemanw/genericTpl
Eileen McNaughton [Sun, 25 Apr 2021 20:30:38 +0000 (08:30 +1200)]
Merge pull request #20141 from colemanw/genericTpl

AfformGui - Specify admin tpl in entity config file & fall-back to ge…

3 years agoAfformGui - Specify admin tpl in entity config file & fall-back to generic
Coleman Watts [Sun, 25 Apr 2021 17:51:51 +0000 (13:51 -0400)]
AfformGui - Specify admin tpl in entity config file & fall-back to generic

3 years agoMerge pull request #19986 from scardinius/core-2516
Matthew Wire [Sun, 25 Apr 2021 10:40:00 +0000 (11:40 +0100)]
Merge pull request #19986 from scardinius/core-2516

dev/core#2516 Invalidate only smart groups

3 years agoMerge pull request #20140 from civicrm/5.37
Matthew Wire [Sun, 25 Apr 2021 10:22:33 +0000 (11:22 +0100)]
Merge pull request #20140 from civicrm/5.37

5.37

3 years agoMerge pull request #20127 from agileware/CIVICRM-1718
Matthew Wire [Sun, 25 Apr 2021 10:21:42 +0000 (11:21 +0100)]
Merge pull request #20127 from agileware/CIVICRM-1718

Set default terms = 1 in (edit) Membership form javascript

3 years agoMerge pull request #20118 from demeritcowboy/actionlinks-extract
Matthew Wire [Sun, 25 Apr 2021 10:19:43 +0000 (11:19 +0100)]
Merge pull request #20118 from demeritcowboy/actionlinks-extract

[REF] dev/core#2509 - Pull activity actionLinks creation into separate function

3 years ago[REF] Move functions back to class that uses it
eileen [Sat, 24 Apr 2021 23:20:15 +0000 (11:20 +1200)]
[REF] Move functions back to class that uses it

3 years agoMerge pull request #20132 from colemanw/renameSearchKit
Eileen McNaughton [Sat, 24 Apr 2021 21:43:56 +0000 (09:43 +1200)]
Merge pull request #20132 from colemanw/renameSearchKit

Replace string org.civicrm.search -> org.civicrm.search_kit

3 years agoReplace string org.civicrm.search -> org.civicrm.search_kit
Coleman Watts [Sat, 24 Apr 2021 15:30:21 +0000 (11:30 -0400)]
Replace string org.civicrm.search -> org.civicrm.search_kit

Followup to renaming the extension, this fixes strings with the old name.

3 years agoMerge pull request #20130 from colemanw/searchKitLinks
colemanw [Fri, 23 Apr 2021 18:25:52 +0000 (14:25 -0400)]
Merge pull request #20130 from colemanw/searchKitLinks

APIv4 - Deprecate nonstandard syntax for implicit joins

3 years agoAPIv4 - Deprecate nonstandard syntax for implicit joins
Coleman Watts [Fri, 23 Apr 2021 14:55:45 +0000 (10:55 -0400)]
APIv4 - Deprecate nonstandard syntax for implicit joins

The APIv4 prototype used a string-manipulation hack to make implicit joins appear more friendly,
e.g. it would transform `contact_id.*` to `contact.*`.
However this made the generation of such joins less predictable,
as not all FK fields end in `_id` (notably, custom ContactRef fields do not).

This preserves the nonstandard syntax for backward-compat while favoring the new syntx
in the API Explorer.

3 years agoMerge pull request #20124 from colemanw/renameSearchKit
Seamus Lee [Fri, 23 Apr 2021 07:15:14 +0000 (17:15 +1000)]
Merge pull request #20124 from colemanw/renameSearchKit

dev/core#2556 Rename extension org.civicrm.search -> org.civicrm.search_kit

3 years agoCIVICRM-1718: Default terms = 1 in (edit) Membership form javascript
Francis Whittle [Fri, 23 Apr 2021 03:17:18 +0000 (13:17 +1000)]
CIVICRM-1718: Default terms = 1 in (edit) Membership form javascript

3 years agoMerge pull request #20122 from eileenmcnaughton/mgd
colemanw [Thu, 22 Apr 2021 21:01:10 +0000 (17:01 -0400)]
Merge pull request #20122 from eileenmcnaughton/mgd

Enotice fix

3 years agoMerge pull request #20112 from francescbassas/patch-19
Eileen McNaughton [Thu, 22 Apr 2021 21:00:53 +0000 (09:00 +1200)]
Merge pull request #20112 from francescbassas/patch-19

Add contact source column in some Reports

3 years agoRefresh extension cache after renaming search_kit extension
Coleman Watts [Thu, 22 Apr 2021 19:13:24 +0000 (15:13 -0400)]
Refresh extension cache after renaming search_kit extension

3 years agodev/core#2556 Rename extension org.civicrm.search -> org.civicrm.search_kit
Coleman Watts [Thu, 22 Apr 2021 15:41:58 +0000 (11:41 -0400)]
dev/core#2556 Rename extension org.civicrm.search -> org.civicrm.search_kit

This avoids a namespace conflict in drupal 7, and is generally more descriptive
See https://lab.civicrm.org/dev/core/-/issues/2556

3 years agoAdd contact source column for basic contact fields
francescbassas [Thu, 22 Apr 2021 07:05:32 +0000 (09:05 +0200)]
Add contact source column for basic contact fields

3 years agoEnotice fix
eileen [Thu, 22 Apr 2021 06:25:53 +0000 (18:25 +1200)]
Enotice fix

3 years agoMerge pull request #20119 from civicrm/5.37
Eileen McNaughton [Thu, 22 Apr 2021 02:05:43 +0000 (14:05 +1200)]
Merge pull request #20119 from civicrm/5.37

5.37

3 years agoMerge pull request #20117 from colemanw/searchKitFixContactRef
colemanw [Wed, 21 Apr 2021 23:35:22 +0000 (19:35 -0400)]
Merge pull request #20117 from colemanw/searchKitFixContactRef

SearchKit - Fix display of contact reference fields (single-value)

3 years agoMerge pull request #20085 from mlutfy/fixDrupal8MenuTranslation
Seamus Lee [Wed, 21 Apr 2021 23:03:10 +0000 (09:03 +1000)]
Merge pull request #20085 from mlutfy/fixDrupal8MenuTranslation

Fix Drupal8 CiviCRM menu translation on multilingual (and ajax calls)

3 years agoAdd release notes for 5.36.1, 5.35.2
CiviCRM [Fri, 16 Apr 2021 23:56:41 +0000 (09:56 +1000)]
Add release notes for 5.36.1, 5.35.2

3 years agoSearchKit - Fix display of contact reference fields (single-value)
Coleman Watts [Wed, 21 Apr 2021 19:27:52 +0000 (15:27 -0400)]
SearchKit - Fix display of contact reference fields (single-value)

This fixes the display of contact reference fields, giving feature parity
with other FK fields. Both ID and Display Name are shown as available columns.

This does not address the more difficult question of how to join
multi-valued contact reference fields with contact display names.

3 years agoCRM.url - Encode url path if slashes in placeholder were also encoded
Coleman Watts [Wed, 21 Apr 2021 20:06:54 +0000 (16:06 -0400)]
CRM.url - Encode url path if slashes in placeholder were also encoded

3 years agoMerge pull request #20116 from totten/master-ext-uninst
Tim Otten [Wed, 21 Apr 2021 21:14:27 +0000 (14:14 -0700)]
Merge pull request #20116 from totten/master-ext-uninst

Extensions - Setup <classloader> during "enable" and "uninstall"

3 years agoExtensions - In case of dirty removal, skip classloader
Tim Otten [Wed, 21 Apr 2021 19:28:22 +0000 (12:28 -0700)]
Extensions - In case of dirty removal, skip classloader

3 years agopull actionLinks creation into separate function
demeritcowboy [Wed, 21 Apr 2021 19:00:10 +0000 (15:00 -0400)]
pull actionLinks creation into separate function

3 years agoMerge pull request #20114 from demeritcowboy/simplify-actionlink2
colemanw [Wed, 21 Apr 2021 17:28:04 +0000 (13:28 -0400)]
Merge pull request #20114 from demeritcowboy/simplify-actionlink2

dev/core#2509 - Remove duplicate setting of activity subject field and replace a few CRM_Utils_Array::value

3 years agoExtensions - Setup <classloader> during "enable" and "uninstall"
Tim Otten [Wed, 21 Apr 2021 16:43:56 +0000 (09:43 -0700)]
Extensions - Setup <classloader> during "enable" and "uninstall"

This is an analog/follow-up to https://github.com/civicrm/civicrm-core/pull/20091

Why is this necessary? Recall that a typical admin will go through this lifecycle:

1. Enable extension $x
2. Disable extension $x
3. Either:
   * (a) Re-enable extension $x
   * (b) Uninstall extension $x

Step `#2` disables the classloader for purposes of regular page-loading. However, when you
get to step `#3a` or `#3b`, then you need the classloader again.

3 years agosimplification
demeritcowboy [Wed, 21 Apr 2021 14:09:20 +0000 (10:09 -0400)]
simplification

3 years agoMerge pull request #20090 from totten/master-ext-upgrader
colemanw [Wed, 21 Apr 2021 13:58:53 +0000 (09:58 -0400)]
Merge pull request #20090 from totten/master-ext-upgrader

dev/core#2547 - Add base-upgrader to core

3 years agoMerge pull request #20105 from eileenmcnaughton/v4
colemanw [Wed, 21 Apr 2021 12:00:04 +0000 (08:00 -0400)]
Merge pull request #20105 from eileenmcnaughton/v4

Save entities created by api v4 to managed

3 years agoMerge pull request #20106 from demeritcowboy/simplify-actionlink
Eileen McNaughton [Wed, 21 Apr 2021 08:53:36 +0000 (20:53 +1200)]
Merge pull request #20106 from demeritcowboy/simplify-actionlink

dev/core#2509 - Remove unnecessary variable to make it easier to extract function that creates action links

3 years agoMerge pull request #20107 from omarabuhussein/update-queue-item-data-field
Seamus Lee [Wed, 21 Apr 2021 07:08:35 +0000 (17:08 +1000)]
Merge pull request #20107 from omarabuhussein/update-queue-item-data-field

Increase civicrm_queue_item.data field size

3 years agoMerge pull request #20110 from eileenmcnaughton/err_more
Seamus Lee [Wed, 21 Apr 2021 07:02:17 +0000 (17:02 +1000)]
Merge pull request #20110 from eileenmcnaughton/err_more

Include more data in error message

3 years agoext/oauth-client - Switch to CRM_Extension_Upgrader_Base
Tim Otten [Sat, 17 Apr 2021 07:47:43 +0000 (00:47 -0700)]
ext/oauth-client - Switch to CRM_Extension_Upgrader_Base

3 years agoext/search - Switch to CRM_Extension_Upgrader_Base
Tim Otten [Sat, 17 Apr 2021 06:46:15 +0000 (23:46 -0700)]
ext/search - Switch to CRM_Extension_Upgrader_Base

3 years agoExtensions - Add test-case for invoking upgrader classes
Tim Otten [Wed, 21 Apr 2021 06:27:11 +0000 (23:27 -0700)]
Extensions - Add test-case for invoking upgrader classes

This is essentially a copy of CRM_Extension_Manager_ModuleTest, adapted to
use the upgrader class instead of lifecycle-hooks.

3 years agoExtensions - Define the upgrader base class
Tim Otten [Sat, 17 Apr 2021 06:23:20 +0000 (23:23 -0700)]
Extensions - Define the upgrader base class

This class is based on refactoring the civix template.

Major sections have been split out into traits.  This should make it more
readable (and potentially make it easier to remix).

This base-class should generally provide an equivalent DX for subclass authors:

* Variables have the same names.
* Most method signatures are identical (e.g.  `executeFoo()`)
* Some methods have been redeclared in equivalent form (`addTask()` - using splat instead `func_get_args()`).
* Two internal functions have slightly diff signatures (`enqueuePendingRevisions()`, `_queueAdapter()``).

3 years agoExtensions - If there is an `<upgrader>`, then send it lifecycle notifications (w...
Tim Otten [Sat, 17 Apr 2021 11:28:29 +0000 (04:28 -0700)]
Extensions - If there is an `<upgrader>`, then send it lifecycle notifications (w/top-sort)

3 years agoinfo.xml - Parse the `<upgrader>` tag
Tim Otten [Sat, 17 Apr 2021 03:38:14 +0000 (20:38 -0700)]
info.xml - Parse the `<upgrader>` tag

3 years agoExtensions - Define the upgrader interface
Tim Otten [Sat, 17 Apr 2021 11:28:04 +0000 (04:28 -0700)]
Extensions - Define the upgrader interface

3 years agoInclude more data in error message
eileen [Wed, 21 Apr 2021 04:37:35 +0000 (16:37 +1200)]
Include more data in error message

3 years agoMerge pull request #19989 from olivierh65/patch-1
Tim Otten [Wed, 21 Apr 2021 02:51:58 +0000 (19:51 -0700)]
Merge pull request #19989 from olivierh65/patch-1

dev/core#2490 Drupal8: Fix CMS intergration table mapping

3 years agoMerge pull request #20108 from colemanw/contact-actions-ribbon
Seamus Lee [Wed, 21 Apr 2021 00:57:41 +0000 (10:57 +1000)]
Merge pull request #20108 from colemanw/contact-actions-ribbon

Add 'contact-actions-ribbon' region

3 years agoMerge pull request #20101 from JKingsnorth/patch-18
Eileen McNaughton [Tue, 20 Apr 2021 21:55:34 +0000 (09:55 +1200)]
Merge pull request #20101 from JKingsnorth/patch-18

dev/core#2549 Fix undefined index when merging websites

3 years agoAdd 'contact-actions-ribbon' region
Coleman Watts [Tue, 20 Apr 2021 20:10:46 +0000 (16:10 -0400)]
Add 'contact-actions-ribbon' region

3 years agoAdd upgrade to update civicrm_queue_item.data field to LONGTEXT
Omar abu hussein [Tue, 20 Apr 2021 12:12:49 +0000 (13:12 +0100)]
Add upgrade to update civicrm_queue_item.data field to LONGTEXT

3 years agoIncrease civicrm_queue_item.data field size
Omar abu hussein [Tue, 20 Apr 2021 11:47:40 +0000 (12:47 +0100)]
Increase civicrm_queue_item.data field size

civicrm_queue_item.data field holds information about the task in the
job queue that is going to be excuted. But if we are using queues to
import large data (as we might do in an extension such as
nz.co.fuzion.csvimport) then the current field type might not be able to
handle the data size. So here I am changing it from TEXT to LONGTEXT to
accomdate for such cases.

3 years agoMerge pull request #20053 from eileenmcnaughton/money
Seamus Lee [Tue, 20 Apr 2021 09:35:03 +0000 (19:35 +1000)]
Merge pull request #20053 from eileenmcnaughton/money

dev/core#2505 Fix formatLocaleNumeric

3 years agoSave entities created by api v4 to managed
eileen [Tue, 20 Apr 2021 03:24:05 +0000 (15:24 +1200)]
Save entities created by api v4 to managed

This fixes an issue where entities that only have v4 apis were not saving to
civicrm_managed because the id was being incorrectly fetched

Change-Id: I9b20de6dcc665d22824743b033acbdc889663045

3 years agosimplification
demeritcowboy [Tue, 20 Apr 2021 01:52:23 +0000 (21:52 -0400)]
simplification

3 years agoAPIv4 - Fix gatekeeper checks across joins
Coleman Watts [Tue, 13 Apr 2021 12:17:01 +0000 (08:17 -0400)]
APIv4 - Fix gatekeeper checks across joins

3 years agoAPIv4 - Add test to ensure gatekeeper permissions are checked across joins
Coleman Watts [Tue, 13 Apr 2021 12:14:59 +0000 (08:14 -0400)]
APIv4 - Add test to ensure gatekeeper permissions are checked across joins

3 years agoMerge pull request #20103 from civicrm/5.37
Eileen McNaughton [Mon, 19 Apr 2021 22:38:57 +0000 (10:38 +1200)]
Merge pull request #20103 from civicrm/5.37

5.37

3 years agoMerge pull request #20104 from seamuslee001/regen_grant_dao
Seamus Lee [Mon, 19 Apr 2021 22:38:29 +0000 (08:38 +1000)]
Merge pull request #20104 from seamuslee001/regen_grant_dao

[NFC] Regenerate Grant DAO

3 years ago[NFC] Regenerate Grant DAO
Seamus Lee [Mon, 19 Apr 2021 21:10:05 +0000 (07:10 +1000)]
[NFC] Regenerate Grant DAO

3 years agoMerge pull request #20002 from jaapjansma/dev_53_2
Eileen McNaughton [Mon, 19 Apr 2021 19:42:50 +0000 (07:42 +1200)]
Merge pull request #20002 from jaapjansma/dev_53_2

dev/report#53: search on relationship and case (2)

3 years agoMerge pull request #20099 from eileenmcnaughton/ref
Mathieu Lu [Mon, 19 Apr 2021 19:36:33 +0000 (15:36 -0400)]
Merge pull request #20099 from eileenmcnaughton/ref

Remove unused functions

3 years agoMerge pull request #20058 from larssandergreen/re-use-mailing
Tim Otten [Mon, 19 Apr 2021 19:36:08 +0000 (12:36 -0700)]
Merge pull request #20058 from larssandergreen/re-use-mailing

dev/mail#90 - Allow re-use mailing on draft mailings and adhoc mailings

3 years agoMerge pull request #20094 from seamuslee001/fix_install_search_display_table_56
colemanw [Mon, 19 Apr 2021 16:35:51 +0000 (12:35 -0400)]
Merge pull request #20094 from seamuslee001/fix_install_search_display_table_56

[REF] Fix installation of the search display table on MySQL 5.36 in t…

3 years agoMerge pull request #20100 from eileenmcnaughton/afform
colemanw [Mon, 19 Apr 2021 15:52:26 +0000 (11:52 -0400)]
Merge pull request #20100 from eileenmcnaughton/afform

Fix the MOST out-of-date parts of the afform readme

3 years agoFixed failing test
Jaap Jansma [Mon, 19 Apr 2021 10:58:08 +0000 (12:58 +0200)]
Fixed failing test

3 years agodev/core#2549 Fix undefined index when merging websites
John Kingsnorth [Mon, 19 Apr 2021 08:35:57 +0000 (09:35 +0100)]
dev/core#2549 Fix undefined index when merging websites

3 years agoFix the MOST out-of-date parts of the afform readme
eileen [Mon, 19 Apr 2021 06:28:15 +0000 (18:28 +1200)]
Fix the MOST out-of-date parts of the afform readme

I was looking for afform docs and this documentation still appears to be the only
documentation there is :-(

This PR addresses some of the most out-of-date parts but I think we want to
agree how to document it & start addressing that

3 years agoMerge pull request #20091 from totten/master-ext-instclass
Eileen McNaughton [Mon, 19 Apr 2021 06:07:02 +0000 (18:07 +1200)]
Merge pull request #20091 from totten/master-ext-instclass

Extensions - Setup `<classloader>` during installation

3 years agoRemove unused functions
eileen [Mon, 19 Apr 2021 03:11:31 +0000 (15:11 +1200)]
Remove unused functions

These protected functions were extracted as part of the process of testing and
transitioning to using the token compatibility subscriber - however, the
cleanup of actually removing them once we switched got missed.

As they are protected their unusedness is easy to confirm

3 years agoMerge pull request #20036 from eileenmcnaughton/dedupe
Seamus Lee [Mon, 19 Apr 2021 01:22:15 +0000 (11:22 +1000)]
Merge pull request #20036 from eileenmcnaughton/dedupe

Alter dedupe code to call api rather than bao->save()

3 years ago[REF] Fix installation of the search display table on MySQL 5.36 in tests
Seamus Lee [Sun, 18 Apr 2021 00:52:01 +0000 (10:52 +1000)]
[REF] Fix installation of the search display table on MySQL 5.36 in tests

3 years agoMerge pull request #20089 from demeritcowboy/approx
Seamus Lee [Sat, 17 Apr 2021 21:52:53 +0000 (07:52 +1000)]
Merge pull request #20089 from demeritcowboy/approx

[NFC/Unit Test] - Help avoid problems when using assertApproxEquals with integers instead of fractions

3 years agoMerge pull request #20088 from seamuslee001/nfc_test_fix
Tim Otten [Sat, 17 Apr 2021 20:10:07 +0000 (13:10 -0700)]
Merge pull request #20088 from seamuslee001/nfc_test_fix

(NFC) Fix possible flacky tests by splitting the parts of the checksu…

3 years agoExtensions - Setup `<classloader>` during installation
Tim Otten [Sat, 17 Apr 2021 11:23:28 +0000 (04:23 -0700)]
Extensions - Setup `<classloader>` during installation

3 years agoChange Re-use to Copy
Lars SG [Sat, 17 Apr 2021 03:06:30 +0000 (21:06 -0600)]
Change Re-use to Copy

3 years agoavoid problems
demeritcowboy [Sat, 17 Apr 2021 02:31:14 +0000 (22:31 -0400)]
avoid problems

3 years agoUpdate CRM/Mailing/Controller/Send.php
Tim Otten [Sat, 17 Apr 2021 02:07:40 +0000 (19:07 -0700)]
Update CRM/Mailing/Controller/Send.php

3 years ago(NFC) Fix possible flacky tests by splitting the parts of the checksum up so that...
Seamus Lee [Fri, 16 Apr 2021 23:28:44 +0000 (09:28 +1000)]
(NFC) Fix possible flacky tests by splitting the parts of the checksum up so that the timestamp part can be tested using ApproxEquals assertion

Update test as per Dave D

3 years agoMerge pull request #20086 from civicrm/5.37
Seamus Lee [Sat, 17 Apr 2021 00:41:32 +0000 (10:41 +1000)]
Merge pull request #20086 from civicrm/5.37

5.37

3 years agoMerge pull request #20076 from eileenmcnaughton/token
Seamus Lee [Fri, 16 Apr 2021 22:01:28 +0000 (08:01 +1000)]
Merge pull request #20076 from eileenmcnaughton/token

Simplify mailing check

3 years agoMerge pull request #20083 from mlutfy/dev2543on537
Seamus Lee [Fri, 16 Apr 2021 21:57:59 +0000 (07:57 +1000)]
Merge pull request #20083 from mlutfy/dev2543on537

dev/core#2543 Fix Membership Edit PHP fatal when no recorded payment

3 years agoMerge pull request #20084 from agh1/5.37.0-releasenotes-initial
Seamus Lee [Fri, 16 Apr 2021 21:56:37 +0000 (07:56 +1000)]
Merge pull request #20084 from agh1/5.37.0-releasenotes-initial

5.37.0 release notes initial run

3 years agoChanged " - Copy" append to "Copy of " prepend for consistency
Lars SG [Fri, 16 Apr 2021 21:54:21 +0000 (15:54 -0600)]
Changed " - Copy" append to "Copy of " prepend for consistency

3 years agoAdd " - Copy" to the end of the new mailing name when cloning
Lars SG [Fri, 16 Apr 2021 21:51:26 +0000 (15:51 -0600)]
Add " - Copy" to the end of the new mailing name when cloning

3 years agoFix Drupal8 CiviCRM menu translation on multilingual
Mathieu Lutfy [Fri, 16 Apr 2021 21:17:43 +0000 (17:17 -0400)]
Fix Drupal8 CiviCRM menu translation on multilingual

3 years agoSimplify mailing check
eileen [Thu, 15 Apr 2021 23:53:30 +0000 (11:53 +1200)]
Simplify mailing check

This should do the same thing - note org is never defined so replaceOrgTokens does
nothing (& is not used anywhere else)

3 years ago5.37.0 release notes: added boilerplate
Andrew Hunt [Fri, 16 Apr 2021 17:40:00 +0000 (13:40 -0400)]
5.37.0 release notes: added boilerplate

3 years ago5.37.0 release notes: raw from script
Andrew Hunt [Fri, 16 Apr 2021 17:36:48 +0000 (13:36 -0400)]
5.37.0 release notes: raw from script

3 years agodev/core#2543 Fix Membership Edit PHP fatal when no recorded payment
Mathieu Lutfy [Fri, 16 Apr 2021 12:51:48 +0000 (08:51 -0400)]
dev/core#2543 Fix Membership Edit PHP fatal when no recorded payment

3 years agoMerge pull request #20018 from seamuslee001/dev_core_2522
colemanw [Fri, 16 Apr 2021 12:38:29 +0000 (08:38 -0400)]
Merge pull request #20018 from seamuslee001/dev_core_2522

dev/core#2522 Add in Submit Action and redirect handling post form su…

3 years agoMerge pull request #20079 from totten/master-logmgr
Seamus Lee [Fri, 16 Apr 2021 05:46:48 +0000 (15:46 +1000)]
Merge pull request #20079 from totten/master-logmgr

community/feature-request#12 - Allow named logging channels

3 years agoMerge pull request #20080 from seamuslee001/dev_core_403
Eileen McNaughton [Fri, 16 Apr 2021 04:27:28 +0000 (16:27 +1200)]
Merge pull request #20080 from seamuslee001/dev_core_403

dev/core#403 Fix Petition Confirmation Email template by removing the…

3 years agodev/core#2522 Add in Submit Action and redirect handling post form submit
Seamus Lee [Fri, 9 Apr 2021 08:21:05 +0000 (18:21 +1000)]
dev/core#2522 Add in Submit Action and redirect handling post form submit

Move fields to the bottom of the config form and also rework the submission code as per suggestion from coleman and also ensure that the submit_action and redirect are exposed in the front end metadata

Remove debugging

Revmoe submit action field as no longer required

Make improvements as per Coleman's review

Update text as per Coleamn and fix regex to allos for ? = # & options in urls

Fix Regex to do some wildcard matching

3 years agoMerge pull request #20064 from eileenmcnaughton/info
colemanw [Fri, 16 Apr 2021 03:12:10 +0000 (23:12 -0400)]
Merge pull request #20064 from eileenmcnaughton/info

dev/core#2536 Trim strings from info.xml in extensions

3 years agoMerge pull request #20067 from civicrm/5.37
Seamus Lee [Fri, 16 Apr 2021 02:17:44 +0000 (12:17 +1000)]
Merge pull request #20067 from civicrm/5.37

5.37

3 years agodev/core#403 Fix Petition Confirmation Email template by removing the trailing space...
Seamus Lee [Fri, 16 Apr 2021 02:05:34 +0000 (12:05 +1000)]
dev/core#403 Fix Petition Confirmation Email template by removing the trailing space on the confirmation url from the href tag

3 years agocommunity/feature-request#12 - Allow named logging channels
Tim Otten [Fri, 16 Apr 2021 01:49:27 +0000 (18:49 -0700)]
community/feature-request#12 - Allow named logging channels

Overview
----------------------------------------

Make it easier to route log messages based on their topic (e.g. CiviContribute-related logs vs CiviMail-related logs).

Before
------

`Civi::log()` always returns the same instance of `LoggerInterface`, with no
clear way to differentiate logs of different business subsystems.

After
-----

`Civi::log(...)` allows you to optionally request a `LoggerInterface` for a specific theme, e.g.

```php
Civi::log('mail')->error('Failed to connect to SMTP server');
Civi::log('ipn')->warning('Transaction rejected by payment processor');
```

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

A few things going on here:

* Extensions may start using their own logs (`Civi::log('myext')`) without any special effort.
* It is possible to replace or customize specific logs by defining a service `log.CHANNEL_NAME`.
* The `psr_log_manager` is a service. An extension like https://lab.civicrm.org/extensions/monolog/
  can replace the `psr_log_manager` and use the channel-name in its own way.

There is a limitation here in that the list of channels is open-ended.  It
will be impossible to (eg) detect that a log-user has made a typo in the
channel-name.  However, this seems like the better trade-off if the
alternative is that extensions face races during
installation/uninstallation.

3 years agoMerge pull request #19886 from eileenmcnaughton/import
Seamus Lee [Fri, 16 Apr 2021 01:44:36 +0000 (11:44 +1000)]
Merge pull request #19886 from eileenmcnaughton/import

Fix for importing preferred language (and other fields) by label

3 years agoMerge pull request #20071 from eileenmcnaughton/537d
Seamus Lee [Fri, 16 Apr 2021 00:35:19 +0000 (10:35 +1000)]
Merge pull request #20071 from eileenmcnaughton/537d

dev/core#2498 dedupe rule saving fix