civicrm-core.git
2 years agoCase Resources only returns 25 contacts
demeritcowboy [Fri, 29 Apr 2022 18:02:57 +0000 (14:02 -0400)]
Case Resources only returns 25 contacts

2 years agoMerge pull request #23330 from eileenmcnaughton/import_errors
colemanw [Sat, 30 Apr 2022 07:34:24 +0000 (09:34 +0200)]
Merge pull request #23330 from eileenmcnaughton/import_errors

[Import] [Ref] Simplify string concatenation

2 years agoMerge pull request #23322 from kurund/survey-title-fixes
colemanw [Sat, 30 Apr 2022 07:30:24 +0000 (09:30 +0200)]
Merge pull request #23322 from kurund/survey-title-fixes

make survey title available in form builder

2 years ago[Import] [Ref] Simplify string concatenation
Eileen McNaughton [Sat, 30 Apr 2022 04:26:37 +0000 (16:26 +1200)]
[Import] [Ref] Simplify string concatenation

2 years agoMerge pull request #23238 from ufundo/event-reminders-from-template-api4
Eileen McNaughton [Sat, 30 Apr 2022 02:21:12 +0000 (14:21 +1200)]
Merge pull request #23238 from ufundo/event-reminders-from-template-api4

Update copied event reminders to link to new event when creating from…

2 years agoMerge pull request #23304 from eileenmcnaughton/import_highlight
demeritcowboy [Fri, 29 Apr 2022 23:50:55 +0000 (19:50 -0400)]
Merge pull request #23304 from eileenmcnaughton/import_highlight

[REF][Import] (minor) Extract getHightlightedFields

2 years ago[REF][Import] Extract getHightlightedFields
Eileen McNaughton [Tue, 26 Apr 2022 19:29:20 +0000 (07:29 +1200)]
[REF][Import] Extract getHightlightedFields

2 years agoMerge pull request #23326 from civicrm/5.49
demeritcowboy [Fri, 29 Apr 2022 18:19:55 +0000 (14:19 -0400)]
Merge pull request #23326 from civicrm/5.49

5.49

2 years agoMerge pull request #23295 from eileenmcnaughton/549
demeritcowboy [Fri, 29 Apr 2022 16:29:40 +0000 (12:29 -0400)]
Merge pull request #23295 from eileenmcnaughton/549

dev/core#3084 Bug fix on line item financial types

2 years agomake survey title available in form builder
Kurund Jalmi [Thu, 28 Apr 2022 18:23:26 +0000 (19:23 +0100)]
make survey title available in form builder

2 years agoMerge pull request #23319 from colemanw/searchKitKeepLabel
demeritcowboy [Thu, 28 Apr 2022 13:05:49 +0000 (09:05 -0400)]
Merge pull request #23319 from colemanw/searchKitKeepLabel

SearchKit - Keep label when switching entity

2 years agoMerge pull request #23315 from colemanw/searchDisplayGridCss
colemanw [Thu, 28 Apr 2022 09:07:49 +0000 (11:07 +0200)]
Merge pull request #23315 from colemanw/searchDisplayGridCss

SearchKit - Move grid css to its own file

2 years agoSearchKit - Keep label when switching entity
Coleman Watts [Thu, 28 Apr 2022 07:58:52 +0000 (09:58 +0200)]
SearchKit - Keep label when switching entity

2 years agoMerge pull request #23316 from jmcclelland/petition-links
Seamus Lee [Thu, 28 Apr 2022 02:36:25 +0000 (12:36 +1000)]
Merge pull request #23316 from jmcclelland/petition-links

Make links to sign a petition easily accessible on the form.

2 years agoMerge pull request #23311 from colemanw/unusedEvent
Seamus Lee [Thu, 28 Apr 2022 02:36:06 +0000 (12:36 +1000)]
Merge pull request #23311 from colemanw/unusedEvent

APIv4 - Deprecate unnecessary event

2 years agoMake links to sign a petition easily accessible on the form.
Jamie McClelland [Wed, 27 Apr 2022 19:38:18 +0000 (15:38 -0400)]
Make links to sign a petition easily accessible on the form.

2 years agoAPIv4 - Move filtering of component entities higher up
Coleman Watts [Wed, 27 Apr 2022 16:55:47 +0000 (18:55 +0200)]
APIv4 - Move filtering of component entities higher up

Filtering out component entities at a low level was causing errors when trying
to get basic info about an entity from a disabled component.
It's better to do the filtering in the Entity.get action instead.

2 years agoAPIv4 - Deprecate unnecessary event
Coleman Watts [Wed, 27 Apr 2022 08:10:53 +0000 (10:10 +0200)]
APIv4 - Deprecate unnecessary event

Before: To implement a virtual API4 entity, an extension must listen to 2 events, one of which is redundant.
After: Redundant event no longer used, as the one event returns all necessary data.

All the info from `civi.api4.entityTypes` is sufficient to create an APIv4 request.
`civi.api4.createRequest` was redundant.

2 years agoSearchKit - Move grid css to its own file
Coleman Watts [Wed, 27 Apr 2022 18:06:05 +0000 (20:06 +0200)]
SearchKit - Move grid css to its own file

2 years agoMerge pull request #23015 from ginkgomzd/php8-unsupported-operand
demeritcowboy [Wed, 27 Apr 2022 12:33:14 +0000 (08:33 -0400)]
Merge pull request #23015 from ginkgomzd/php8-unsupported-operand

resolve TypeError: unsupported operand types: string + int;

2 years agoMerge pull request #23291 from eileenmcnaughton/import_output
demeritcowboy [Wed, 27 Apr 2022 12:24:30 +0000 (08:24 -0400)]
Merge pull request #23291 from eileenmcnaughton/import_output

dev/core#3414 Stop dropping temp table on finish of contact import job

2 years agoMerge pull request #23302 from demeritcowboy/symfony-cmf
Tim Otten [Wed, 27 Apr 2022 10:50:52 +0000 (03:50 -0700)]
Merge pull request #23302 from demeritcowboy/symfony-cmf

dev/drupal#176 - Symfony cmf removed from drupal 10

2 years agoMerge pull request #21513 from JKingsnorth/core-2846-1-improve-start-end-date-validation
Eileen McNaughton [Wed, 27 Apr 2022 09:20:35 +0000 (21:20 +1200)]
Merge pull request #21513 from JKingsnorth/core-2846-1-improve-start-end-date-validation

dev/core#2846 Towards validation of start and end dates. Forms.

2 years agoMerge pull request #23243 from colemanw/reconcile
Seamus Lee [Wed, 27 Apr 2022 07:59:09 +0000 (17:59 +1000)]
Merge pull request #23243 from colemanw/reconcile

APIv4 - Add `Managed::reconcile` action.

2 years agoMerge pull request #23309 from civicrm/5.49
Seamus Lee [Wed, 27 Apr 2022 07:57:12 +0000 (17:57 +1000)]
Merge pull request #23309 from civicrm/5.49

5.49

2 years agoMerge pull request #23303 from colemanw/afformMetaEvent
colemanw [Wed, 27 Apr 2022 07:21:53 +0000 (09:21 +0200)]
Merge pull request #23303 from colemanw/afformMetaEvent

Afform - Dispatch event to alter admin metadata; provide mixin

2 years agoMerge pull request #23280 from eileenmcnaughton/import_job
Seamus Lee [Wed, 27 Apr 2022 05:01:35 +0000 (15:01 +1000)]
Merge pull request #23280 from eileenmcnaughton/import_job

[REF] [Import] Ensure jobID is set in contact flow

2 years agoMerge pull request #23293 from eileenmcnaughton/import_deprecated
Seamus Lee [Wed, 27 Apr 2022 04:34:16 +0000 (14:34 +1000)]
Merge pull request #23293 from eileenmcnaughton/import_deprecated

[REF] [Import] call non-deprecated function instead of deprecated

2 years agoMerge pull request #23308 from eileenmcnaughton/import_fields
demeritcowboy [Tue, 26 Apr 2022 23:17:26 +0000 (19:17 -0400)]
Merge pull request #23308 from eileenmcnaughton/import_fields

[REF] [Import] [Trivial] Make 'mapper' field available as a submittable value throughout the flow

2 years agoMerge pull request #23307 from eileenmcnaughton/import_defaults
Eileen McNaughton [Tue, 26 Apr 2022 23:07:59 +0000 (11:07 +1200)]
Merge pull request #23307 from eileenmcnaughton/import_defaults

[REF] [Import] [Trivial] Make mapperKeys parameter optional in construct

2 years agoMerge pull request #23306 from eileenmcnaughton/import_notice
demeritcowboy [Tue, 26 Apr 2022 22:46:42 +0000 (18:46 -0400)]
Merge pull request #23306 from eileenmcnaughton/import_notice

[Import] Enotice fix on contact import field mapping screen

2 years agoMerge pull request #22837 from totten/master-authx-ignore-header
Tim Otten [Tue, 26 Apr 2022 21:52:53 +0000 (14:52 -0700)]
Merge pull request #22837 from totten/master-authx-ignore-header

(dev/core#3416) authx - If `Authorization:` header is disabled, then ignore it.

2 years ago[REF] [Import] [Trivial] Make 'mapper' field available as a submittable value through...
Eileen McNaughton [Tue, 26 Apr 2022 21:43:07 +0000 (09:43 +1200)]
[REF] [Import] [Trivial] Make 'mapper' field available as a submittable value throughout the flow

The fields defined here can be accessed from any field in
the flow, removing the need to pass the values from form to form

2 years ago[REF] [Import] [Trivial] Make mapperKeys parameter optional in construct
Eileen McNaughton [Tue, 26 Apr 2022 21:33:19 +0000 (09:33 +1200)]
[REF] [Import] [Trivial] Make mapperKeys parameter optional in construct

2 years ago[Import] E-notice fix
Eileen McNaughton [Tue, 26 Apr 2022 20:50:34 +0000 (08:50 +1200)]
[Import] E-notice fix

This fixes 1 of 2 notices on the Contact import field mapping screen.
- instead of assigning a variable for show-hide it uses jquery

2 years agoMerge pull request #23298 from artfulrobot/artfulrobot-21473-followup
Eileen McNaughton [Tue, 26 Apr 2022 19:01:58 +0000 (07:01 +1200)]
Merge pull request #23298 from artfulrobot/artfulrobot-21473-followup

Compare currencies as well as amounts on template Contribution change

2 years agokeep support for drupal 8
demeritcowboy [Tue, 26 Apr 2022 13:20:49 +0000 (09:20 -0400)]
keep support for drupal 8

2 years agocmf removed from drupal 10
demeritcowboy [Tue, 26 Apr 2022 03:19:54 +0000 (23:19 -0400)]
cmf removed from drupal 10

2 years agoAfform - Dispatch event to alter admin metadata; provide mixin
Coleman Watts [Tue, 26 Apr 2022 13:16:55 +0000 (15:16 +0200)]
Afform - Dispatch event to alter admin metadata; provide mixin

Instead of scanning files for Afform entities, this dispatches an event to allow them to be altered.
It provides a mixin which extensions can use to automatically do the file scanning.

2 years agoCompare currencies as well as amounts on template Contribution change
Rich Lott / Artful Robot [Mon, 25 Apr 2022 16:33:04 +0000 (17:33 +0100)]
Compare currencies as well as amounts on template Contribution change

Update CRM/Contribute/BAO/ContributionRecur.php

2 years agoMerge pull request #23300 from eileenmcnaughton/import_extract
colemanw [Tue, 26 Apr 2022 10:34:52 +0000 (12:34 +0200)]
Merge pull request #23300 from eileenmcnaughton/import_extract

[REF] [Import] [Trivial] Extract duplicate match options

2 years agoMerge pull request #23301 from eileenmcnaughton/549_amount
Matthew Wire [Tue, 26 Apr 2022 09:38:00 +0000 (10:38 +0100)]
Merge pull request #23301 from eileenmcnaughton/549_amount

Fix propertyBag regression on `amount`

2 years agodev/core#3084 Bug fix on line item financial types
Eileen McNaughton [Sun, 24 Apr 2022 21:12:48 +0000 (09:12 +1200)]
dev/core#3084 Bug fix on line item financial types

This initially caused test fails on test written for
https://lab.civicrm.org/dev/core/-/issues/860

However, I think the issue is flaws in the test, which
I have adjusted to have more accurate set up

2 years agoauthx_civicrm_enable - Don't enable `Authorization:` headers if there's plausible...
Tim Otten [Tue, 1 Mar 2022 23:07:19 +0000 (15:07 -0800)]
authx_civicrm_enable - Don't enable `Authorization:` headers if there's plausible conflict

Some deployments may have two layers of authorization:

(1) A generic/site-wide HTTP basic check (perhaps to prevent search-engines
    from finding the site; perhaps enforced by a reverse proxy)
(2) A Civi or CMS credential (eg session-cookie, ?_authx, or X-Civi-Auth:)

Authx sits in layer 2.  It should enable HTTP `Authorization:` handling
if-and-only-if there is NOT a pre-existing `Authorization:` mechanism.

To test this, I enabled the extension over APIv3 REST -- with/without a superfluous header:

```
curl -X POST -d 'entity=Extension&action=enable&json=%7B%22keys%22%3A%22authx%22%7D&api_key=FIXME_USER_KEY&key=FIXME_SITE_KEY' \
  'http://dmaster.127.0.0.1.nip.io:8001/sites/all/modules/civicrm/extern/rest.php'

curl -X POST -H 'Authorization: Bearer superfluous' -d 'entity=Extension&action=enable&json=%7B%22keys%22%3A%22authx%22%7D&api_key=FIXME_USER_KEY&key=FIXME_SITE_KEY' \
  'http://dmaster.127.0.0.1.nip.io:8001/sites/all/modules/civicrm/extern/rest.php'
```

2 years agoAllFlowsTest - Make `testJwtMiddleware()` less sensitive to interactions with other...
Tim Otten [Sat, 26 Feb 2022 00:54:28 +0000 (16:54 -0800)]
AllFlowsTest - Make `testJwtMiddleware()` less sensitive to interactions with other tests

2 years agoAllFlowsTest - If `Authorization:` support is disabled, then it's ignored completely.
Tim Otten [Sat, 26 Feb 2022 00:46:26 +0000 (16:46 -0800)]
AllFlowsTest - If `Authorization:` support is disabled, then it's ignored completely.

This means that the request is effectively anonymous -- the same as it would be if you had not sent an `Authorization:` header.

2 years agoauthx - If `Authorization:` header is disabled, then ignore it.
Tim Otten [Sat, 26 Feb 2022 00:21:29 +0000 (16:21 -0800)]
authx - If `Authorization:` header is disabled, then ignore it.

2 years agoAllFlowsTest - Add case `testIgnoredHeaderAuthorization()`
Tim Otten [Sat, 26 Feb 2022 00:20:55 +0000 (16:20 -0800)]
AllFlowsTest - Add case `testIgnoredHeaderAuthorization()`

2 years agoMerge pull request #23286 from eileenmcnaughton/mapping
Eileen McNaughton [Mon, 25 Apr 2022 21:38:03 +0000 (09:38 +1200)]
Merge pull request #23286 from eileenmcnaughton/mapping

[REF][Test] Update loadMappingTest to use form flow

2 years agodev/core#3413 Remove handling of total_amount form propertyBag
Eileen McNaughton [Mon, 25 Apr 2022 20:35:05 +0000 (08:35 +1200)]
dev/core#3413 Remove handling of total_amount form propertyBag

This appears to have caused a regression per
https://lab.civicrm.org/dev/core/-/issues/3413

In addition I don't think we should have a 'sloppy alternative'
to  being called with the correct documented
amount property

https://docs.civicrm.org/dev/en/latest/extensions/payment-processors/create/#available-parameters

2 years ago[REF] [Import] [Trivial] Extract duplicate match options
Eileen McNaughton [Mon, 25 Apr 2022 20:18:37 +0000 (08:18 +1200)]
[REF] [Import] [Trivial] Extract duplicate match options

As part of moving from passing variables from form to form & getting using
'get' we are retrieving onDuplicate via getSubmittedValue(), also extracting
to allow code blocks to clarify better

2 years ago[REF][Test] Update loadMappingTest to use form flow
Eileen McNaughton [Fri, 22 Apr 2022 05:14:00 +0000 (17:14 +1200)]
[REF][Test] Update loadMappingTest to use form flow

This makes it test more accurately what the form is doing....

2 years agoMerge pull request #23268 from totten/master-ext-load
demeritcowboy [Mon, 25 Apr 2022 16:15:07 +0000 (12:15 -0400)]
Merge pull request #23268 from totten/master-ext-load

dev/core#3184 - Definitively load mainfiles during bootstrap - Option 3

2 years agoMerge pull request #21943 from mattwire/gccacheignore
demeritcowboy [Mon, 25 Apr 2022 16:14:51 +0000 (12:14 -0400)]
Merge pull request #21943 from mattwire/gccacheignore

Simplify and improve performance of query to insert updated cache

2 years agoMerge pull request #23284 from eileenmcnaughton/import_contact_type
demeritcowboy [Sun, 24 Apr 2022 19:24:30 +0000 (15:24 -0400)]
Merge pull request #23284 from eileenmcnaughton/import_contact_type

[REF] [Import] Extract getContactType

2 years ago[REF] [Import] call non-deprecated function instead of deprecated
Eileen McNaughton [Sun, 24 Apr 2022 05:07:02 +0000 (17:07 +1200)]
[REF] [Import] call non-deprecated function instead of deprecated

2 years agoMerge pull request #23287 from kurund/update-supporter-url
Eileen McNaughton [Sun, 24 Apr 2022 07:45:08 +0000 (19:45 +1200)]
Merge pull request #23287 from kurund/update-supporter-url

update-supporter-url

2 years agoStop dropping temp table on finish of contact import job
Eileen McNaughton [Sat, 23 Apr 2022 23:44:39 +0000 (11:44 +1200)]
Stop dropping temp table on finish of contact import job

This is being done in order to support as-required downloading of output
csv from the temp table.

(note that viewing the temp table directly rather than down loading might
also be on the cards)

2 years agoMerge pull request #23285 from eileenmcnaughton/import_old_var
demeritcowboy [Fri, 22 Apr 2022 19:37:09 +0000 (15:37 -0400)]
Merge pull request #23285 from eileenmcnaughton/import_old_var

Remove an unset variable

2 years agoupdate-supporter-url
Kurund Jalmi [Fri, 22 Apr 2022 15:50:41 +0000 (16:50 +0100)]
update-supporter-url

2 years agoMerge pull request #23147 from braders/contactimage-accept-attr
demeritcowboy [Fri, 22 Apr 2022 15:45:05 +0000 (11:45 -0400)]
Merge pull request #23147 from braders/contactimage-accept-attr

Restrict allowed uploads - contact image

2 years agoRemove an unset variable
Eileen McNaughton [Fri, 22 Apr 2022 00:51:14 +0000 (12:51 +1200)]
Remove an unset variable

2 years ago[REF] [Import] Extract getContactType
Eileen McNaughton [Fri, 22 Apr 2022 00:11:17 +0000 (12:11 +1200)]
[REF] [Import] Extract getContactType

Note that the function on the MetaDataTrait is moved to the
Parser_Class - 3 forms use the trait - a unittest class,
the Parser_Class and MapField.

MapField was not calling the old function but the newly added one
clashes - and highlights that the contents of the function
should differ for the 2 scenarios - hence moving
off the Trait and onto the 3 classes that use it

2 years agoMerge pull request #23272 from eileenmcnaughton/import_contract
colemanw [Fri, 22 Apr 2022 00:16:38 +0000 (20:16 -0400)]
Merge pull request #23272 from eileenmcnaughton/import_contract

[REF] [Import] Simplify dataSource contract - remove unused preProcess

2 years agoMerge pull request #23277 from eileenmcnaughton/import_main
Eileen McNaughton [Thu, 21 Apr 2022 23:41:18 +0000 (11:41 +1200)]
Merge pull request #23277 from eileenmcnaughton/import_main

Whitespace cleanup in template file

2 years agoMerge pull request #23278 from demeritcowboy/case-tags-static
Eileen McNaughton [Thu, 21 Apr 2022 23:27:14 +0000 (11:27 +1200)]
Merge pull request #23278 from demeritcowboy/case-tags-static

Make static function static - processCaseTags

2 years agoWhitespace cleanup
Eileen McNaughton [Thu, 21 Apr 2022 21:01:26 +0000 (09:01 +1200)]
Whitespace cleanup

2 years ago[REF] [Import] Ensure jobID is set in contact flow
Eileen McNaughton [Thu, 21 Apr 2022 21:48:28 +0000 (09:48 +1200)]
[REF] [Import] Ensure jobID is set in contact flow

2 years agoMerge pull request #23275 from eileenmcnaughton/error
Eileen McNaughton [Thu, 21 Apr 2022 21:42:31 +0000 (09:42 +1200)]
Merge pull request #23275 from eileenmcnaughton/error

Remove another good intention - unused variables

2 years agoMerge pull request #22683 from mattwire/paymentstatushelpersall
demeritcowboy [Thu, 21 Apr 2022 21:30:57 +0000 (17:30 -0400)]
Merge pull request #22683 from mattwire/paymentstatushelpersall

dev/financial#141 - Update return parameters on all payment processors to match expected results

2 years agomake static static
demeritcowboy [Thu, 21 Apr 2022 21:20:40 +0000 (17:20 -0400)]
make static static

2 years agoMerge pull request #23263 from eileenmcnaughton/import_wippier
colemanw [Thu, 21 Apr 2022 20:06:53 +0000 (16:06 -0400)]
Merge pull request #23263 from eileenmcnaughton/import_wippier

 [Import] Rename dedupe rule id field from dedupe to dedupe_rule_id field

2 years agoRemove another good intention - unused variables
Eileen McNaughton [Thu, 21 Apr 2022 17:14:15 +0000 (05:14 +1200)]
Remove another good intention - unused variables

100% of the responses from setActiveFields are discarded and 100% of the time
the erroneousField value is not used. Hence it makes sense to remove them....

2 years agoMerge pull request #23269 from eileenmcnaughton/email
demeritcowboy [Thu, 21 Apr 2022 19:20:09 +0000 (15:20 -0400)]
Merge pull request #23269 from eileenmcnaughton/email

Remove preferred email format from inline edit

2 years agoMerge pull request #23274 from civicrm/5.49
Eileen McNaughton [Thu, 21 Apr 2022 16:31:23 +0000 (04:31 +1200)]
Merge pull request #23274 from civicrm/5.49

5.49 to master

2 years agoMerge pull request #23271 from colemanw/searchKitTestFix
Eileen McNaughton [Thu, 21 Apr 2022 16:31:02 +0000 (04:31 +1200)]
Merge pull request #23271 from colemanw/searchKitTestFix

SearchKit - Fix aggregation issues & test regression

2 years agoSimplify dataSource contract - remove unused preProcess
Eileen McNaughton [Thu, 21 Apr 2022 03:06:01 +0000 (15:06 +1200)]
Simplify dataSource contract - remove unused preProcess

The choice of required functions was not great - postProcess passes silly
params & preProcess is never used / always empty - this removes preProcess
and gets rid of the abstract class for postProcess (which
will be decommissioned in a follow up)

2 years ago[Import] Rename dedupe rule id field from dedupe to dedupe_rule_id field
Eileen McNaughton [Wed, 20 Apr 2022 10:54:35 +0000 (22:54 +1200)]
[Import] Rename dedupe rule id field from dedupe to dedupe_rule_id field

It is still dedupe internally as those places will 'age out'

2 years ago[REF] [Import] Clean up on map fields & preview templates in Contact import
Eileen McNaughton [Wed, 20 Apr 2022 06:18:38 +0000 (18:18 +1200)]
[REF] [Import] Clean up on map fields & preview templates in Contact import

This provides a bit of sanity to the MapTable.tpl which is included from
MapField and Preview - the focus being around getting
rid of all the section tags which rely on Count being assigned
and getting back to for-eaching the relevant arrays

2 years agoSearchKit - Fix aggregation issues
Coleman Watts [Thu, 21 Apr 2022 14:07:44 +0000 (10:07 -0400)]
SearchKit - Fix aggregation issues

In the UI, "Extra" fields like Contact.age_years were not being aggregated properly.

On the server, fixes mismatch when checking an aggregate field with a suffix.
Fixes recent test regression.

2 years agoUse hard-coding when variable is unchangeable
Eileen McNaughton [Tue, 19 Apr 2022 20:59:23 +0000 (08:59 +1200)]
Use hard-coding when variable is unchangeable

2 years agoMerge pull request #23245 from eileenmcnaughton/import_wip
Eileen McNaughton [Thu, 21 Apr 2022 05:20:13 +0000 (17:20 +1200)]
Merge pull request #23245 from eileenmcnaughton/import_wip

Import - start to use civicrm_user_job to track user imports

2 years agoMerge pull request #23264 from mlutfy/ui47scroll
Eileen McNaughton [Thu, 21 Apr 2022 04:56:52 +0000 (16:56 +1200)]
Merge pull request #23264 from mlutfy/ui47scroll

dev/user-interface#47 Disable scrolling on time inputs

2 years agoMerge pull request #23267 from civicrm/5.49
Eileen McNaughton [Thu, 21 Apr 2022 04:56:34 +0000 (16:56 +1200)]
Merge pull request #23267 from civicrm/5.49

5.49 to master

2 years agoMerge pull request #23265 from colemanw/pivotTablesFix
Eileen McNaughton [Thu, 21 Apr 2022 04:55:51 +0000 (16:55 +1200)]
Merge pull request #23265 from colemanw/pivotTablesFix

SearchKit - Fix selection of fields when creating a Data Segment

2 years agoRemove preferred email format from inline edit
Eileen McNaughton [Thu, 21 Apr 2022 04:20:45 +0000 (16:20 +1200)]
Remove preferred email format from inline edit

We removed other places in the UI where this shows up....

2 years agodev/core#3184 - Definitively load mainfiles during bootstrap
Tim Otten [Thu, 21 Apr 2022 03:52:09 +0000 (20:52 -0700)]
dev/core#3184 - Definitively load mainfiles during bootstrap

2 years agoMerge pull request #23266 from colemanw/castToArray
Eileen McNaughton [Thu, 21 Apr 2022 02:52:09 +0000 (14:52 +1200)]
Merge pull request #23266 from colemanw/castToArray

APIv4 - Avoid php error

2 years agoAPIv4 - Avoid php error
Coleman Watts [Thu, 21 Apr 2022 00:21:29 +0000 (20:21 -0400)]
APIv4 - Avoid php error

Prevents a php error when calling `array_merge()` on `null`.

2 years agoMerge pull request #23246 from jmcclelland/CustomCheckboxContributionImport
Eileen McNaughton [Thu, 21 Apr 2022 00:19:25 +0000 (12:19 +1200)]
Merge pull request #23246 from jmcclelland/CustomCheckboxContributionImport

ensure checkbox custom fields on contributions import properly

2 years agoSearchKit - Fix selection of fields when creating a Data Segment
Coleman Watts [Wed, 20 Apr 2022 22:41:00 +0000 (18:41 -0400)]
SearchKit - Fix selection of fields when creating a Data Segment

2 years agoMerge pull request #23059 from colemanw/pivotTables
Eileen McNaughton [Wed, 20 Apr 2022 21:51:29 +0000 (09:51 +1200)]
Merge pull request #23059 from colemanw/pivotTables

SearchKit - Add data segmentation functionality

2 years agodev/user-interface#47 Disable scrolling on time inputs
Mathieu Lutfy [Wed, 20 Apr 2022 17:44:02 +0000 (13:44 -0400)]
dev/user-interface#47 Disable scrolling on time inputs

2 years agoMerge pull request #23159 from eileenmcnaughton/event
colemanw [Wed, 20 Apr 2022 15:14:28 +0000 (11:14 -0400)]
Merge pull request #23159 from eileenmcnaughton/event

Minor simplification of getAmountLevelText

2 years agoMerge pull request #23216 from eileenmcnaughton/import_more
colemanw [Wed, 20 Apr 2022 15:12:25 +0000 (11:12 -0400)]
Merge pull request #23216 from eileenmcnaughton/import_more

[REF] [Import] Use shared file instead of now-identical files

2 years agoMerge pull request #23190 from eileenmcnaughton/pradeep
colemanw [Wed, 20 Apr 2022 15:11:29 +0000 (11:11 -0400)]
Merge pull request #23190 from eileenmcnaughton/pradeep

Start to fix misnamed FinancialTrxn bao

2 years agoMerge pull request #23213 from eileenmcnaughton/post
colemanw [Wed, 20 Apr 2022 15:07:01 +0000 (11:07 -0400)]
Merge pull request #23213 from eileenmcnaughton/post

[REF] Do not pass form properties within the form

2 years agoMerge pull request #23219 from eileenmcnaughton/import_cust
colemanw [Wed, 20 Apr 2022 15:05:23 +0000 (11:05 -0400)]
Merge pull request #23219 from eileenmcnaughton/import_cust

[REF] [Import] Standardise import text for CustomData import

2 years agoMerge pull request #23224 from totten/master-signing-signage
colemanw [Wed, 20 Apr 2022 15:03:51 +0000 (11:03 -0400)]
Merge pull request #23224 from totten/master-signing-signage

System Check - Add a reminder about CIVICRM_SIGN_KEYS.

2 years agoMerge pull request #23185 from eileenmcnaughton/smarty_wiz
colemanw [Wed, 20 Apr 2022 15:02:23 +0000 (11:02 -0400)]
Merge pull request #23185 from eileenmcnaughton/smarty_wiz

Do not escape wizard class - procede straight to Hogwarts