civicrm-core.git
3 years agoMerge pull request #20169 from ixiam/dev_issue#2574
Eileen McNaughton [Tue, 27 Apr 2021 20:18:05 +0000 (08:18 +1200)]
Merge pull request #20169 from ixiam/dev_issue#2574

Fixes issue with state/province & country not translating values

3 years agoMerge pull request #20164 from mattwire/recaptcharegistrationbuildcustom
Eileen McNaughton [Tue, 27 Apr 2021 19:57:20 +0000 (07:57 +1200)]
Merge pull request #20164 from mattwire/recaptcharegistrationbuildcustom

REF reCAPTCHA Simplify buildCustom function on Registration form

3 years agoFixes issue with state/province & country not translating values
Vangelis Pantazis [Tue, 27 Apr 2021 18:09:10 +0000 (19:09 +0100)]
Fixes issue with state/province & country not translating values

3 years agoMerge pull request #20165 from mattwire/recaptchasignaturebuildcustom
demeritcowboy [Tue, 27 Apr 2021 15:23:14 +0000 (11:23 -0400)]
Merge pull request #20165 from mattwire/recaptchasignaturebuildcustom

REF reCAPTCHA Simplify buildCustom function on Signature form

3 years agoviewOnly parameter is not used in buildCustom for Signature
Matthew Wire [Mon, 26 Apr 2021 21:52:22 +0000 (22:52 +0100)]
viewOnly parameter is not used in buildCustom for Signature

3 years agoviewOnly parameter is not used in buildCustom for Registration
Matthew Wire [Mon, 26 Apr 2021 21:52:43 +0000 (22:52 +0100)]
viewOnly parameter is not used in buildCustom for Registration

3 years agoSimplify buildCustom function
Matthew Wire [Tue, 27 Apr 2021 09:49:36 +0000 (10:49 +0100)]
Simplify buildCustom function

3 years agoFix typos in comments and remove unused lines
Matthew Wire [Tue, 27 Apr 2021 09:46:26 +0000 (10:46 +0100)]
Fix typos in comments and remove unused lines

3 years agoMerge pull request #20159 from eileenmcnaughton/actsh
Seamus Lee [Tue, 27 Apr 2021 09:08:27 +0000 (19:08 +1000)]
Merge pull request #20159 from eileenmcnaughton/actsh

[REF] Minor tidy up - use writeRecord

3 years agoMerge pull request #20157 from lemniscus/oauth-client
Eileen McNaughton [Tue, 27 Apr 2021 06:59:54 +0000 (18:59 +1200)]
Merge pull request #20157 from lemniscus/oauth-client

Fix a copy-and-paste error in the field definitions for OAuthSysToken

3 years agoMerge pull request #20155 from eileenmcnaughton/pdf
Eileen McNaughton [Tue, 27 Apr 2021 06:09:10 +0000 (18:09 +1200)]
Merge pull request #20155 from eileenmcnaughton/pdf

[REF] Move more functions back to pdfLetter class

3 years ago[REF] Minor tidy up - use writeRecord
eileen [Tue, 27 Apr 2021 05:47:35 +0000 (17:47 +1200)]
[REF] Minor tidy up - use writeRecord

This tidy up gets rid of 2 unused variables & an obsolete pass-by-ref and switches to a
preferred function call. Note that as a by-product hooks will now be called

3 years agoFix a copy-and-paste error in the field definitions for OAuthSysToken
Noah Miller [Tue, 27 Apr 2021 05:19:20 +0000 (22:19 -0700)]
Fix a copy-and-paste error in the field definitions for OAuthSysToken

3 years ago[REF] Move more functions bask to pdfLetter class
eileen [Tue, 27 Apr 2021 02:41:34 +0000 (14:41 +1200)]
[REF] Move more functions bask to pdfLetter class

As with the previous moves this is
1) covered by unit tests
2) just code moving around

But note that this doesn't move whole functions but moves the
contents of postProcess & buildQuickForm back into the same functions
on the 'actual' class

3 years agoMerge pull request #20134 from colemanw/searchKitLinks
colemanw [Tue, 27 Apr 2021 02:52:00 +0000 (22:52 -0400)]
Merge pull request #20134 from colemanw/searchKitLinks

Search Kit links improvements

3 years agoMerge pull request #20143 from eileenmcnaughton/pdf
colemanw [Tue, 27 Apr 2021 02:30:09 +0000 (22:30 -0400)]
Merge pull request #20143 from eileenmcnaughton/pdf

Move more functions to the pdfLetter class

3 years agoMerge pull request #20154 from civicrm/5.37
Tim Otten [Tue, 27 Apr 2021 02:25:59 +0000 (19:25 -0700)]
Merge pull request #20154 from civicrm/5.37

5.37

3 years agoMerge pull request #20111 from seamuslee001/wordpress_security_status_check_fix
Eileen McNaughton [Tue, 27 Apr 2021 01:58:52 +0000 (13:58 +1200)]
Merge pull request #20111 from seamuslee001/wordpress_security_status_check_fix

[REF] Fix Security status check urls to work on WordPress

3 years agoMerge pull request #20148 from seamuslee001/dev_core_2564
Seamus Lee [Tue, 27 Apr 2021 00:45:40 +0000 (10:45 +1000)]
Merge pull request #20148 from seamuslee001/dev_core_2564

dev/core#2564 Fix class constants for when using phpseclib v1

3 years agoMerge pull request #19991 from eileenmcnaughton/order
Seamus Lee [Mon, 26 Apr 2021 23:40:09 +0000 (09:40 +1000)]
Merge pull request #19991 from eileenmcnaughton/order

dev/core#2493 Default to not cleaning money for order.create api

3 years agoMerge pull request #20151 from civicrm/5.37
Eileen McNaughton [Mon, 26 Apr 2021 23:22:18 +0000 (11:22 +1200)]
Merge pull request #20151 from civicrm/5.37

5.37 to master

3 years agoMerge pull request #20142 from colemanw/fixMultiValueContactRefFieldDedupe
Eileen McNaughton [Mon, 26 Apr 2021 23:20:34 +0000 (11:20 +1200)]
Merge pull request #20142 from colemanw/fixMultiValueContactRefFieldDedupe

Fix hard crash when deduping if any multiValued ContactRef fields exist

3 years agoFix hard crash when deduping if any multiValued ContactRef fields exist
Coleman Watts [Sun, 25 Apr 2021 18:58:00 +0000 (14:58 -0400)]
Fix hard crash when deduping if any multiValued ContactRef fields exist

Fixes https://lab.civicrm.org/dev/core/-/issues/2561

3 years agoMerge pull request #20026 from totten/master-authx-details
Tim Otten [Mon, 26 Apr 2021 21:12:29 +0000 (14:12 -0700)]
Merge pull request #20026 from totten/master-authx-details

Authx - Retain authentication outcome/metadata

3 years agodev/core#2564 - PhpseclibCipherSuite - Support v1 constants
Tim Otten [Mon, 26 Apr 2021 21:05:45 +0000 (14:05 -0700)]
dev/core#2564 - PhpseclibCipherSuite - Support v1 constants

3 years agoMerge pull request #20137 from colemanw/fixCustomSerialize
colemanw [Mon, 26 Apr 2021 19:48:01 +0000 (15:48 -0400)]
Merge pull request #20137 from colemanw/fixCustomSerialize

dev/core#2506 Fix unserializing custom values during form reload

3 years agodev/core#2564 Fix class constants for when using phpseclib v1
Seamus Lee [Mon, 26 Apr 2021 07:56:55 +0000 (17:56 +1000)]
dev/core#2564 Fix class constants for when using phpseclib v1

3 years agoMove more functions to the pdfLetter function
eileen [Sun, 25 Apr 2021 23:24:37 +0000 (11:24 +1200)]
Move more functions to the pdfLetter function

This 'common' form isn't really common - it's silly. This PR removes all
the gotcha instances of 'self::' to make it easier to decommission this file

Note that there are no calls to the class outside core in git universe

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 agoFix unserializing custom values to work during form reload
Coleman Watts [Sun, 25 Apr 2021 02:58:46 +0000 (22:58 -0400)]
Fix unserializing custom values to work during form reload

Fixes https://lab.civicrm.org/dev/core/-/issues/2506
MultiValued custom ContactRef fields were losing their value
during form reload if there was a validation error.

3 years agoSearchKit - Improve link titles to match entity titles
Coleman Watts [Sat, 24 Apr 2021 22:27:11 +0000 (18:27 -0400)]
SearchKit - Improve link titles to match entity titles

3 years agoSearchKit - Improve UX for adding links to a search display
Coleman Watts [Sat, 24 Apr 2021 13:49:57 +0000 (09:49 -0400)]
SearchKit - Improve UX for adding links to a search display

When adding links to a column, it will now only show relevant links to the entity in the column.
When adding a column of links/buttons, it will make all links available as before,
but by default will only show the ones relevant to the main entity.

3 years agoSearchKit - Fix links to implicitly joined entities
Coleman Watts [Fri, 23 Apr 2021 18:23:20 +0000 (14:23 -0400)]
SearchKit - Fix links to implicitly joined entities

This improves link construction to propery replace tokens in explicit joins and implicit joins.

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 ago[REF] Fix Security status check urls to work on WordPress
Seamus Lee [Wed, 21 Apr 2021 06:52:49 +0000 (16:52 +1000)]
[REF] Fix Security status check urls to work on WordPress

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