civicrm-core.git
3 years agoAfform - delete unused entityDefaults dir
Coleman Watts [Wed, 27 Jan 2021 14:14:42 +0000 (09:14 -0500)]
Afform - delete unused entityDefaults dir

3 years agoAfformAdmin - use api-callback for loading metadata
Coleman Watts [Mon, 25 Jan 2021 15:51:55 +0000 (10:51 -0500)]
AfformAdmin - use api-callback for loading metadata

This switches from pre-loading all field data, to a more incremental approach of only loading the data needed by the form being edited,
then loading more metadata if additional entities or blocks are added to the form.

The Afform.loadAdminData api action is added to facilitate loading metadata for different types of afforms,
and incrementally loading metadata for new entities & blocks as they are added to an afform being edited.

3 years agoSearchKit - improve handling of dynamic tags for search displays
Coleman Watts [Sat, 23 Jan 2021 20:36:40 +0000 (15:36 -0500)]
SearchKit - improve handling of dynamic tags for search displays

The searchDisplay.type option list now includes tags instead of downstream code needing to construct them,
And the standalone pages for search displays now use server-generated partials instead of an ad-hoc switch on the client side.

3 years agoAfform - Move entity boilerplate out of runtime code & into metadata files
Coleman Watts [Fri, 22 Jan 2021 21:41:55 +0000 (16:41 -0500)]
Afform - Move entity boilerplate out of runtime code & into metadata files

3 years agoAfform - move angular dependency mapper code to its own class
Coleman Watts [Fri, 22 Jan 2021 18:19:53 +0000 (13:19 -0500)]
Afform - move angular dependency mapper code to its own class

3 years agoMerge pull request #19425 from colemanw/searchBulkActions
Eileen McNaughton [Fri, 29 Jan 2021 23:41:58 +0000 (12:41 +1300)]
Merge pull request #19425 from colemanw/searchBulkActions

dev/core#2310 Searchkit - Perform bulk updates in batches; improve user feedback.

3 years agoMerge pull request #19462 from demeritcowboy/api4-reldate
Eileen McNaughton [Fri, 29 Jan 2021 22:42:01 +0000 (11:42 +1300)]
Merge pull request #19462 from demeritcowboy/api4-reldate

dev/core#2339 - Fix failing relativeDate test

3 years agodon't let dates roll over and then not match
demeritcowboy [Fri, 29 Jan 2021 21:09:21 +0000 (16:09 -0500)]
don't let dates roll over and then not match

3 years agoMerge pull request #19459 from wintermoor/patch-2
Seamus Lee [Fri, 29 Jan 2021 10:11:47 +0000 (21:11 +1100)]
Merge pull request #19459 from wintermoor/patch-2

Update contributor-key.yml

3 years agoUpdate contributor-key.yml
wintermoor [Fri, 29 Jan 2021 07:14:29 +0000 (08:14 +0100)]
Update contributor-key.yml

3 years agoMerge pull request #19438 from colemanw/afformDropAttrSupport
colemanw [Fri, 29 Jan 2021 04:02:42 +0000 (23:02 -0500)]
Merge pull request #19438 from colemanw/afformDropAttrSupport

Afform - Drop directive support for attribute, only support elements as afforms

3 years agoMerge pull request #19412 from JKingsnorth/patch-17
Eileen McNaughton [Fri, 29 Jan 2021 03:40:14 +0000 (16:40 +1300)]
Merge pull request #19412 from JKingsnorth/patch-17

dev/core#2305 Fix schema differences in MariaDB 10.2.x+

3 years agoMerge pull request #19456 from eileenmcnaughton/act_update
Seamus Lee [Fri, 29 Jan 2021 02:49:40 +0000 (13:49 +1100)]
Merge pull request #19456 from eileenmcnaughton/act_update

Do not set source_contact_id in summary function

3 years agooauth-client - Switch from (a)ttribute notation to (e)lement notation
Tim Otten [Fri, 29 Jan 2021 00:22:46 +0000 (16:22 -0800)]
oauth-client - Switch from (a)ttribute notation to (e)lement notation

3 years agoMerge pull request #19452 from colemanw/searchKitCustom
Eileen McNaughton [Thu, 28 Jan 2021 23:11:01 +0000 (12:11 +1300)]
Merge pull request #19452 from colemanw/searchKitCustom

SearchKit: Add support for multi-record custom field groups

3 years agoDo not set source_contact_id in summary function
eileen [Tue, 19 Jan 2021 01:15:13 +0000 (14:15 +1300)]
Do not set source_contact_id in summary function

This params array is discarded so this acheives nothing

3 years agoMerge pull request #19111 from eileenmcnaughton/act_custom
Seamus Lee [Thu, 28 Jan 2021 22:49:07 +0000 (09:49 +1100)]
Merge pull request #19111 from eileenmcnaughton/act_custom

dev/core#866, dev/core#1318 Fix failure to import checkboxes for activities

3 years agoMerge pull request #19454 from alifrumin/revrec
Eileen McNaughton [Thu, 28 Jan 2021 21:49:33 +0000 (10:49 +1300)]
Merge pull request #19454 from alifrumin/revrec

[dev/financial#164] Cannot edit contribution with revenue recognition date in a past year

3 years agoMerge pull request #19451 from wintermoor/patch-1
Eileen McNaughton [Thu, 28 Jan 2021 21:43:03 +0000 (10:43 +1300)]
Merge pull request #19451 from wintermoor/patch-1

Update TemplateList.tpl

3 years agofix revenue recognition date
Alice Frumin [Thu, 28 Jan 2021 19:18:23 +0000 (14:18 -0500)]
fix revenue recognition date

3 years agoafform - Add note to backlog.md about element/attribute modes
Tim Otten [Thu, 28 Jan 2021 01:15:35 +0000 (17:15 -0800)]
afform - Add note to backlog.md about element/attribute modes

The expectation is that this is not used very much.  At the moment, we don't
have a validation mechanism to warn if this expectation is broken. But whenever
we get it, it might be good to check.

3 years agoMerge pull request #19439 from eileenmcnaughton/act_req
Seamus Lee [Wed, 27 Jan 2021 20:36:22 +0000 (07:36 +1100)]
Merge pull request #19439 from eileenmcnaughton/act_req

dev/core#2308 do not require fields if activity_id is present

3 years agoMerge pull request #19453 from demeritcowboy/translate
Seamus Lee [Wed, 27 Jan 2021 19:44:49 +0000 (06:44 +1100)]
Merge pull request #19453 from demeritcowboy/translate

dev/translation#64 - Using %1%2 seems to confuse transifex - System status check Cms.php

3 years agodon't confuse transifex
demeritcowboy [Wed, 27 Jan 2021 15:57:42 +0000 (10:57 -0500)]
don't confuse transifex

3 years agoSearchKit: Add support for multi-record custom field groups
Coleman Watts [Wed, 27 Jan 2021 13:32:48 +0000 (08:32 -0500)]
SearchKit: Add support for multi-record custom field groups

This adds support for multi-record custom field group pseudo-entities to be added to the search as joins

3 years agoUpdate TemplateList.tpl
wintermoor [Wed, 27 Jan 2021 12:46:37 +0000 (13:46 +0100)]
Update TemplateList.tpl

missing {ts} string

3 years agoMerge pull request #19449 from mattwire/paymentgetspec
Tim Otten [Wed, 27 Jan 2021 07:17:09 +0000 (23:17 -0800)]
Merge pull request #19449 from mattwire/paymentgetspec

Payment API - Add description of `order_reference` parameter

3 years agoMerge pull request #19445 from demeritcowboy/why2
Tim Otten [Wed, 27 Jan 2021 05:46:20 +0000 (21:46 -0800)]
Merge pull request #19445 from demeritcowboy/why2

Remove unnecessary call to error_reporting in drupal 7 integration code

3 years agoAfform - Drop directive support for attribute, only support elements as afforms.
Coleman Watts [Mon, 25 Jan 2021 02:24:15 +0000 (21:24 -0500)]
Afform - Drop directive support for attribute, only support elements as afforms.

This changes every afform directive from AE to only E.
Passing options is now done through the 'options' attribute rather than the directive name.

3 years agoAdd order_reference to spec
Matthew Wire [Wed, 27 Jan 2021 00:19:49 +0000 (00:19 +0000)]
Add order_reference to spec

3 years agoMerge pull request #19441 from demeritcowboy/invalid-casetype-name
Eileen McNaughton [Tue, 26 Jan 2021 21:06:32 +0000 (10:06 +1300)]
Merge pull request #19441 from demeritcowboy/invalid-casetype-name

dev/core#2326 - Status check for invalid case type `name`s

3 years agoMerge pull request #19391 from seamuslee001/obsolete_replacement
Eileen McNaughton [Tue, 26 Jan 2021 20:57:34 +0000 (09:57 +1300)]
Merge pull request #19391 from seamuslee001/obsolete_replacement

REF Permit installing of replacement extensions during upgrade for ob…

3 years agoMerge pull request #19442 from demeritcowboy/case-type-name
Eileen McNaughton [Tue, 26 Jan 2021 20:52:50 +0000 (09:52 +1300)]
Merge pull request #19442 from demeritcowboy/case-type-name

dev/core#2327 - In the sample casetype xml files the <name> is the label not the name

3 years agoMerge pull request #19447 from mattwire/phpnotice
Eileen McNaughton [Tue, 26 Jan 2021 20:44:53 +0000 (09:44 +1300)]
Merge pull request #19447 from mattwire/phpnotice

Fix PHP notice if membershipBlock is not defined

3 years agoMerge pull request #19446 from sunilpawar/update_contributor_details
Eileen McNaughton [Tue, 26 Jan 2021 20:41:12 +0000 (09:41 +1300)]
Merge pull request #19446 from sunilpawar/update_contributor_details

update contributor-key.yml and CONTRIBUTORS.txt file

3 years agoremove unnecessary E_ blocker
demeritcowboy [Tue, 26 Jan 2021 00:52:56 +0000 (19:52 -0500)]
remove unnecessary E_ blocker

3 years agoFix PHP notice if membershipBlock is not defined
Matthew Wire [Tue, 26 Jan 2021 10:51:49 +0000 (10:51 +0000)]
Fix PHP notice if membershipBlock is not defined

3 years agoupdate contributor-key.yml and CONTRIBUTORS.txt file
Sunil Pawar [Tue, 26 Jan 2021 09:08:17 +0000 (14:38 +0530)]
update contributor-key.yml and CONTRIBUTORS.txt file

3 years agoMerge pull request #19444 from demeritcowboy/custom-br
colemanw [Tue, 26 Jan 2021 00:54:40 +0000 (19:54 -0500)]
Merge pull request #19444 from demeritcowboy/custom-br

dev/core#2328 - Make the description line breaks on the custom field edit form consistent

3 years agoconsistencize the description line breaks
demeritcowboy [Mon, 25 Jan 2021 23:23:01 +0000 (18:23 -0500)]
consistencize the description line breaks

3 years agoname not label
demeritcowboy [Mon, 25 Jan 2021 15:11:33 +0000 (10:11 -0500)]
name not label

3 years agoMerge pull request #19440 from eileenmcnaughton/ipn
Seamus Lee [Mon, 25 Jan 2021 07:16:13 +0000 (18:16 +1100)]
Merge pull request #19440 from eileenmcnaughton/ipn

[REF] Remove objects var from PaypalProIPN

3 years ago[REF] Remove objects var from PaypalProIPN
eileen [Mon, 25 Jan 2021 05:30:44 +0000 (18:30 +1300)]
[REF] Remove objects var from PaypalProIPN

We've managed to make it unnecessary & unused

3 years agoMerge pull request #19436 from eileenmcnaughton/pledgepayment
Seamus Lee [Mon, 25 Jan 2021 05:18:23 +0000 (16:18 +1100)]
Merge pull request #19436 from eileenmcnaughton/pledgepayment

Add pledge payment api

3 years agodev/core#2308 do not require fields if activity_id is present
eileen [Tue, 19 Jan 2021 01:12:46 +0000 (14:12 +1300)]
dev/core#2308 do not require fields if activity_id is present

Note this is only one place they are required & it will still fail later with this merged

3 years agoMerge pull request #19437 from eileenmcnaughton/clean
colemanw [Mon, 25 Jan 2021 02:34:43 +0000 (21:34 -0500)]
Merge pull request #19437 from eileenmcnaughton/clean

[REF] Remove seemingly unreachable attempt to format activity_date_time

3 years agocheck for invalid names
demeritcowboy [Sun, 24 Jan 2021 16:50:31 +0000 (11:50 -0500)]
check for invalid names

3 years ago[REF] Remove seemingly unreachable attempt to format activity_date_time field
eileen [Tue, 19 Jan 2021 00:56:58 +0000 (13:56 +1300)]
[REF] Remove seemingly unreachable attempt to format activity_date_time field

This is within the if custom field section - it would never be true but formatting exists further down

3 years agoAdd pledge payment api
eileen [Sat, 23 Jan 2021 07:21:46 +0000 (20:21 +1300)]
Add pledge payment api

3 years agoMerge pull request #19372 from seamuslee001/dev_wordpress_86
Eileen McNaughton [Sat, 23 Jan 2021 05:32:26 +0000 (18:32 +1300)]
Merge pull request #19372 from seamuslee001/dev_wordpress_86

dev/wordpress#86 Ensure that the list of groups in search or on the n…

3 years agoMerge pull request #19435 from civicrm/5.34
Seamus Lee [Sat, 23 Jan 2021 04:14:47 +0000 (15:14 +1100)]
Merge pull request #19435 from civicrm/5.34

5.34

3 years agoMerge pull request #19434 from alifrumin/rn-5.34
Seamus Lee [Sat, 23 Jan 2021 01:13:24 +0000 (12:13 +1100)]
Merge pull request #19434 from alifrumin/rn-5.34

[NFC] 5.34 Release Notes: first pass

3 years agoMerge pull request #19426 from colemanw/searchCount
Eileen McNaughton [Fri, 22 Jan 2021 22:08:44 +0000 (11:08 +1300)]
Merge pull request #19426 from colemanw/searchCount

dev/core#2312 SearchKit - Improve results loading time in admin UI

3 years ago5.34 - Release Notes
Alice Frumin [Fri, 15 Jan 2021 18:19:42 +0000 (13:19 -0500)]
5.34 - Release Notes

3 years agoSearchkit - Perform bulk updates in batches; improve user feedback.
Coleman Watts [Wed, 20 Jan 2021 16:46:38 +0000 (11:46 -0500)]
Searchkit - Perform bulk updates in batches; improve user feedback.

Simple batch system to avoid server timeouts, processes bulk updates/deletes 500 at a time,
with a progress bar, spinner & text to indicate which records are being processed.

3 years agoMerge pull request #19429 from colemanw/searchJoinDefaults
Eileen McNaughton [Fri, 22 Jan 2021 20:30:59 +0000 (09:30 +1300)]
Merge pull request #19429 from colemanw/searchJoinDefaults

dev/core#2313 SearchKit - Default join conditions

3 years agoMerge pull request #19422 from mattwire/deprecatedcaseactivity
colemanw [Fri, 22 Jan 2021 18:23:58 +0000 (13:23 -0500)]
Merge pull request #19422 from mattwire/deprecatedcaseactivity

Flag that Embedded Activity Revisions setting is unsupported and deprecated

3 years agoNFC Code style
John Kingsnorth [Fri, 22 Jan 2021 16:37:02 +0000 (16:37 +0000)]
NFC Code style

3 years agoMerge pull request #19433 from totten/master-monaco-min
colemanw [Fri, 22 Jan 2021 04:37:50 +0000 (23:37 -0500)]
Merge pull request #19433 from totten/master-monaco-min

composer.json - Ignore unused variants of Monaco ("dev"/"esm")

3 years agoMerge pull request #19430 from colemanw/select2Loading
Monish Deb [Fri, 22 Jan 2021 01:02:25 +0000 (06:32 +0530)]
Merge pull request #19430 from colemanw/select2Loading

Select2 - Improve styles for disabled, loading elements

3 years agoMerge pull request #19432 from colemanw/afformApiCleanup
Tim Otten [Fri, 22 Jan 2021 00:47:35 +0000 (16:47 -0800)]
Merge pull request #19432 from colemanw/afformApiCleanup

Afform - delete unused, nonfunctional apis

3 years agocomposer.json - Ignore unused from Monaco "dev"/"esm"
Tim Otten [Fri, 22 Jan 2021 00:21:05 +0000 (16:21 -0800)]
composer.json - Ignore unused from Monaco "dev"/"esm"

Saves ~50mb in the on-disk size of `bower_components`

Before
------

`bower_components` as a full developmental tree for monaco-editor

After
-----

`bower_components` only has the `min` variant of monaco-editor

3 years agoAfform - delete unused, nonfunctional apis
Coleman Watts [Thu, 21 Jan 2021 22:57:18 +0000 (17:57 -0500)]
Afform - delete unused, nonfunctional apis

3 years agoMerge pull request #18782 from demeritcowboy/logging-binary2
Tim Otten [Thu, 21 Jan 2021 21:27:28 +0000 (13:27 -0800)]
Merge pull request #18782 from demeritcowboy/logging-binary2

dev/core#2114 - Changes in upper/lower case or accents are not logged when using trigger-based logging

3 years agoSelect2 - Improve styles for disabled, loading elements
Coleman Watts [Thu, 21 Jan 2021 16:30:23 +0000 (11:30 -0500)]
Select2 - Improve styles for disabled, loading elements

3 years agoMerge pull request #19424 from demeritcowboy/random-relationship
colemanw [Thu, 21 Jan 2021 16:10:21 +0000 (11:10 -0500)]
Merge pull request #19424 from demeritcowboy/random-relationship

[Test framework] Prevent intermittently failing relationship test

3 years agoMerge pull request #19423 from colemanw/tabTweak
colemanw [Thu, 21 Jan 2021 15:49:01 +0000 (10:49 -0500)]
Merge pull request #19423 from colemanw/tabTweak

Greenwich - fix list margin added by some CMS themes

3 years agoSearchKit - Make UI less confusing by not allowing joins to be switched
Coleman Watts [Thu, 21 Jan 2021 15:38:34 +0000 (10:38 -0500)]
SearchKit - Make UI less confusing by not allowing joins to be switched

Switching a join was confusing and buggy. Best to disable that and only allow them to be deleted

3 years agoMerge pull request #19386 from totten/master-track-token
Matthew Wire [Thu, 21 Jan 2021 14:58:18 +0000 (14:58 +0000)]
Merge pull request #19386 from totten/master-track-token

(dev/mail#81) Flexmailer - Track click-throughs for URLs with tokens

3 years agoDAO - Update field labels for activity_contact & relationship_cache entities
Coleman Watts [Thu, 21 Jan 2021 14:53:24 +0000 (09:53 -0500)]
DAO - Update field labels for activity_contact & relationship_cache entities

https://lab.civicrm.org/dev/core/-/issues/2313

3 years agoSearchKit - Default join conditions
Coleman Watts [Thu, 21 Jan 2021 14:49:18 +0000 (09:49 -0500)]
SearchKit - Default join conditions

Adds @ui_join_filters annotations to APIv4 entities which automatically shows that field when adding a join

https://lab.civicrm.org/dev/core/-/issues/2313

3 years agoMerge pull request #19416 from eileenmcnaughton/dep
colemanw [Thu, 21 Jan 2021 02:32:10 +0000 (21:32 -0500)]
Merge pull request #19416 from eileenmcnaughton/dep

dev/financial#148 fully deprecate loadObjects function

3 years agoMerge pull request #19427 from civicrm/dependabot/npm_and_yarn/socket.io-2.4.1
Seamus Lee [Thu, 21 Jan 2021 01:38:23 +0000 (12:38 +1100)]
Merge pull request #19427 from civicrm/dependabot/npm_and_yarn/socket.io-2.4.1

Bump socket.io from 2.3.0 to 2.4.1

3 years agoBump socket.io from 2.3.0 to 2.4.1
dependabot[bot] [Thu, 21 Jan 2021 00:16:59 +0000 (00:16 +0000)]
Bump socket.io from 2.3.0 to 2.4.1

Bumps [socket.io](https://github.com/socketio/socket.io) from 2.3.0 to 2.4.1.
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/2.4.1/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io/compare/2.3.0...2.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoSearchKit - Separate api calls for results & pager count in admin screen
Coleman Watts [Wed, 20 Jan 2021 22:16:07 +0000 (17:16 -0500)]
SearchKit - Separate api calls for results & pager count in admin screen

https://lab.civicrm.org/dev/core/-/issues/2312

3 years agodon't be random
demeritcowboy [Wed, 20 Jan 2021 02:30:44 +0000 (21:30 -0500)]
don't be random

3 years agoMerge pull request #18779 from jaapjansma/dev_report_53
colemanw [Wed, 20 Jan 2021 18:33:37 +0000 (13:33 -0500)]
Merge pull request #18779 from jaapjansma/dev_report_53

dev/report#53: search on relationship and case

3 years agoMerge pull request #19395 from colemanw/afformTypes
colemanw [Wed, 20 Jan 2021 13:29:22 +0000 (08:29 -0500)]
Merge pull request #19395 from colemanw/afformTypes

Tabbed interface for organizing afforms by type

3 years agoBridge search displays and afforms
Coleman Watts [Tue, 19 Jan 2021 16:03:48 +0000 (11:03 -0500)]
Bridge search displays and afforms

This allows an afform af-fieldset to function without a containing af-form or reference to af-entity
Instead it can directly contain an api-entities tag to assist filling field metadata.
The search extension then adds that tag based on the search parameters.
This also eliminates the need to pass in filters to the search display directly (though it still supports that),
as it will infer them from the presence of an af-fieldset.

3 years agoAfform - convert afEntity and afField to components, standardize js filenames
Coleman Watts [Thu, 14 Jan 2021 18:39:22 +0000 (13:39 -0500)]
Afform - convert afEntity and afField to components, standardize js filenames

3 years agoAfform - Use new APIv4 format for option values
Coleman Watts [Wed, 13 Jan 2021 22:22:30 +0000 (17:22 -0500)]
Afform - Use new APIv4 format for option values

3 years agoAfform - refactor admin page to use routing, add tabbed UI
Coleman Watts [Wed, 13 Jan 2021 15:21:30 +0000 (10:21 -0500)]
Afform - refactor admin page to use routing, add tabbed UI

3 years agoAfform GUI - Rename service from afAdmin to afGiu
Coleman Watts [Mon, 11 Jan 2021 19:35:25 +0000 (14:35 -0500)]
Afform GUI - Rename service from afAdmin to afGiu

3 years agoAfform - add option group for afform types
Coleman Watts [Mon, 11 Jan 2021 18:27:07 +0000 (13:27 -0500)]
Afform - add option group for afform types

3 years agoGreenwich - fix list margin added by some cms themes
Coleman Watts [Tue, 19 Jan 2021 16:29:17 +0000 (11:29 -0500)]
Greenwich - fix list margin added by some cms themes

3 years agoMerge pull request #19419 from eileenmcnaughton/refs
colemanw [Tue, 19 Jan 2021 13:13:30 +0000 (08:13 -0500)]
Merge pull request #19419 from eileenmcnaughton/refs

[REF] Remove some of those old php4 &s

3 years agoMerge pull request #19297 from eileenmcnaughton/pledge
colemanw [Tue, 19 Jan 2021 13:10:22 +0000 (08:10 -0500)]
Merge pull request #19297 from eileenmcnaughton/pledge

Add v4 pledge api

3 years agoFlag that Embedded Activity Revisions setting is unsupported and deprecated
Matthew Wire [Tue, 19 Jan 2021 12:27:36 +0000 (12:27 +0000)]
Flag that Embedded Activity Revisions setting is unsupported and deprecated

3 years agoMerge pull request #19420 from eileenmcnaughton/activity
Seamus Lee [Tue, 19 Jan 2021 10:15:22 +0000 (21:15 +1100)]
Merge pull request #19420 from eileenmcnaughton/activity

Cleanup a couple of unnecessary references

3 years agoMerge pull request #19418 from eileenmcnaughton/template
Seamus Lee [Tue, 19 Jan 2021 10:06:48 +0000 (21:06 +1100)]
Merge pull request #19418 from eileenmcnaughton/template

[REF] Move related code to be together

3 years agoCleanup a couple of unnecessary references
eileen [Tue, 19 Jan 2021 00:44:42 +0000 (13:44 +1300)]
Cleanup a couple of unnecessary references

3 years ago[REF] Remove some of those old php4 &s
eileen [Tue, 19 Jan 2021 00:08:45 +0000 (13:08 +1300)]
[REF] Remove some of those old php4 &s

I can't see any call to this that could be affected & I believe they are all well tested
In addition we can see that domain is not altered so it does not
need to be a reference in the 3 functions it is passed through

3 years ago[REF] Move related code to be together
eileen [Tue, 19 Jan 2021 00:02:49 +0000 (13:02 +1300)]
[REF] Move related code to be together

Puts both if (contactID) sections into the same if

3 years agodev/financial#148 fully deprecate loadObjects function
eileen [Mon, 18 Jan 2021 21:04:39 +0000 (10:04 +1300)]
dev/financial#148 fully deprecate loadObjects function

3 years agodev/core#2305 Fix schema differences in MariaDB 10.2.x+
John Kingsnorth [Mon, 18 Jan 2021 11:16:27 +0000 (11:16 +0000)]
dev/core#2305 Fix schema differences in MariaDB 10.2.x+

3 years agoMerge pull request #19373 from eileenmcnaughton/valid
Seamus Lee [Mon, 18 Jan 2021 23:20:01 +0000 (10:20 +1100)]
Merge pull request #19373 from eileenmcnaughton/valid

[REF] Simplify activity import validation

3 years agoMerge pull request #19415 from seamuslee001/code_cleanup_dev_core_2307
Seamus Lee [Mon, 18 Jan 2021 22:59:06 +0000 (09:59 +1100)]
Merge pull request #19415 from seamuslee001/code_cleanup_dev_core_2307

[#REF] Cleanup recently added code fixing dev/core#2307 for the fact …

3 years agoMerge pull request #19409 from eileenmcnaughton/template
Eileen McNaughton [Mon, 18 Jan 2021 21:41:28 +0000 (10:41 +1300)]
Merge pull request #19409 from eileenmcnaughton/template

dev/core#2303 Extract function to load the messageContent for a template

3 years agoMerge pull request #19413 from christianwach/lab-core-2306
colemanw [Mon, 18 Jan 2021 21:14:45 +0000 (16:14 -0500)]
Merge pull request #19413 from christianwach/lab-core-2306

Fix rendering of Dashlet placeholder

3 years ago[#REF] Cleanup recently added code fixing dev/core#2307 for the fact that wasn't...
Seamus Lee [Mon, 18 Jan 2021 20:22:14 +0000 (07:22 +1100)]
[#REF] Cleanup recently added code fixing dev/core#2307 for the fact that  wasn't a variable before these lines