civicrm-core.git
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 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 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 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

3 years agoMerge pull request #19414 from spalmstr/Issue2307
Seamus Lee [Mon, 18 Jan 2021 20:20:12 +0000 (07:20 +1100)]
Merge pull request #19414 from spalmstr/Issue2307

Fix Issue 2307

3 years agoAdd in-code notes about the workflow_name
eileen [Mon, 18 Jan 2021 20:18:37 +0000 (09:18 +1300)]
Add in-code notes about the workflow_name

3 years agodev/core#2303 Extract function to load the messageContent for a template
eileen [Mon, 18 Jan 2021 01:37:13 +0000 (14:37 +1300)]
dev/core#2303 Extract function to load the messageContent for a template

This is a fairly straightforward extraction, seeking to break down the very-busy sendtemplate function
into the sub-functions within it. Essentially we load the template content, we swap out the tokens
and we send it.

Note that I have added a parameter to the output sent to alterMailContent
of 'workflow_name' which is more accurate - I will update the docs

3 years ago[REF] Simplify activity import validation
eileen [Tue, 12 Jan 2021 07:55:15 +0000 (20:55 +1300)]
[REF] Simplify activity import validation

There are 2 types of validation on importing
1) the correct fields have been mapped
2) the specific row has all the required fields

These generally live in different places
- field mapping is validated on the MapField::formRule validation function
- the specific row is validated in the (badly named) 'summary' function.

However, the second function is also doing some validation of the
mapping, checking that either activity_type_id or label is mapped
& ditto activity_date_time. This duplicates the MapField rule
and is hard to read, while making a larger cleanup difficult

3 years agoFix pledge to support v4 api
eileen [Mon, 18 Jan 2021 06:12:49 +0000 (19:12 +1300)]
Fix pledge to support v4 api

3 years agoAdd v4 pledge api
eileen [Thu, 31 Dec 2020 20:04:35 +0000 (09:04 +1300)]
Add v4 pledge api

3 years agoFix Issue 2307
Stephen Palmstrom [Mon, 18 Jan 2021 18:28:09 +0000 (18:28 +0000)]
Fix Issue 2307

3 years agoFix rendering of Dashlet placeholder
Christian Wach [Mon, 18 Jan 2021 11:39:49 +0000 (11:39 +0000)]
Fix rendering of Dashlet placeholder

3 years agoMerge pull request #19402 from eileenmcnaughton/mem_form
Matthew Wire [Mon, 18 Jan 2021 10:15:32 +0000 (10:15 +0000)]
Merge pull request #19402 from eileenmcnaughton/mem_form

[REF] Move instantiation of Order class to earlier in function

3 years agoMerge pull request #19411 from eileenmcnaughton/deprecate_add
Matthew Wire [Mon, 18 Jan 2021 10:05:39 +0000 (10:05 +0000)]
Merge pull request #19411 from eileenmcnaughton/deprecate_add

Deprecate Pledge::add() function

3 years agoDeprecate Pledge::add() function
eileen [Mon, 18 Jan 2021 06:20:26 +0000 (19:20 +1300)]
Deprecate Pledge::add() function

This function is no longer called from anywhere and we have settled on preferring 1 create function and
standardising on that. I have left the inner code there but added the deprecation notice

3 years ago[REF] Move instantiation of Order class to earlier in function
eileen [Sun, 17 Jan 2021 20:51:58 +0000 (09:51 +1300)]
[REF] Move instantiation of Order class to earlier in function

This is part of making the Order object and it's methods available to the non-renewal
form which has the same amount calculation bug the class is used to fix.

Note the Order class is an internal class not the order api which we do wish to switch this
form to using

3 years agoMerge pull request #19390 from civicrm/php_version_bump
Eileen McNaughton [Mon, 18 Jan 2021 06:04:25 +0000 (19:04 +1300)]
Merge pull request #19390 from civicrm/php_version_bump

dev/core#2204 Bump Minimum install PHP 7.2

3 years agoMerge pull request #19400 from eileenmcnaughton/pledge_ref
Seamus Lee [Mon, 18 Jan 2021 06:01:16 +0000 (17:01 +1100)]
Merge pull request #19400 from eileenmcnaughton/pledge_ref

Fix pledge to not use pass-by-reference

3 years agoMerge pull request #19403 from eileenmcnaughton/mem_order
Seamus Lee [Mon, 18 Jan 2021 04:04:22 +0000 (15:04 +1100)]
Merge pull request #19403 from eileenmcnaughton/mem_order

[REF] Fix Order class to not reload if already loaded

3 years agoMerge pull request #19407 from eileenmcnaughton/anet
Seamus Lee [Mon, 18 Jan 2021 03:30:22 +0000 (14:30 +1100)]
Merge pull request #19407 from eileenmcnaughton/anet

Remove call to loadRelatedObjects

3 years agoMerge pull request #19410 from eileenmcnaughton/load
Seamus Lee [Mon, 18 Jan 2021 03:29:21 +0000 (14:29 +1100)]
Merge pull request #19410 from eileenmcnaughton/load

[REF] Move code closer to where it is used

3 years agoMerge pull request #19408 from eileenmcnaughton/old_params
Seamus Lee [Mon, 18 Jan 2021 03:27:58 +0000 (14:27 +1100)]
Merge pull request #19408 from eileenmcnaughton/old_params

[NFC] Whitespace fix up

3 years ago[REF] Move code closer to where it is used
eileen [Mon, 18 Jan 2021 01:57:12 +0000 (14:57 +1300)]
[REF] Move code closer to where it is used

Simply moves a few lines of code so the actual usage is apparent

3 years agoMerge pull request #19404 from eileenmcnaughton/mem_deb
Eileen McNaughton [Mon, 18 Jan 2021 00:43:33 +0000 (13:43 +1300)]
Merge pull request #19404 from eileenmcnaughton/mem_deb

[Test] Extend new membership form to cover multi-line renew + minor cleanup

3 years agoMerge pull request #19406 from eileenmcnaughton/param
Eileen McNaughton [Mon, 18 Jan 2021 00:42:31 +0000 (13:42 +1300)]
Merge pull request #19406 from eileenmcnaughton/param

[REF] Param simplification

3 years agoFix pledge to not use pass-by-reference
eileen [Sun, 17 Jan 2021 19:50:56 +0000 (08:50 +1300)]
Fix pledge to not use pass-by-reference

We have deprecated this out of BAO classes

3 years ago[NFC] Whitespace fix up
eileen [Sun, 17 Jan 2021 23:43:51 +0000 (12:43 +1300)]
[NFC] Whitespace fix up

3 years agoMerge pull request #19401 from eileenmcnaughton/mem_test
Seamus Lee [Sun, 17 Jan 2021 23:15:25 +0000 (10:15 +1100)]
Merge pull request #19401 from eileenmcnaughton/mem_test

[NFC] Preliminary cleanup

3 years agoMerge pull request #19405 from eileenmcnaughton/inv
Seamus Lee [Sun, 17 Jan 2021 23:14:13 +0000 (10:14 +1100)]
Merge pull request #19405 from eileenmcnaughton/inv

[REF] Minor cleanup on emailReceipt

3 years agoRemove call to loadRelatedObjects
eileen [Sun, 17 Jan 2021 22:19:54 +0000 (11:19 +1300)]
Remove call to loadRelatedObjects

None of the ids loaded in this function are used anymore so we can remove the call to it
The only reference to ids after this line is to contribution page id, which is loaded earlier

3 years ago[REF] Param simplification
eileen [Sun, 17 Jan 2021 22:15:34 +0000 (11:15 +1300)]
[REF] Param simplification

3 years ago[REF] Param simplification
eileen [Sun, 17 Jan 2021 22:08:24 +0000 (11:08 +1300)]
[REF] Param simplification

On looking at this param it can only be reached if recur->id is set and the other criteria can be
squashed to an empty check

3 years ago[REF] Minor cleanup on emailReceipt
eileen [Sun, 17 Jan 2021 21:43:35 +0000 (10:43 +1300)]
[REF] Minor cleanup on emailReceipt

Fixes 2 things
1) empty check on line items when it is never set
2) starts to move code out of the shared-function to the form function
when it is only possible when called via the form function. The sharing here
is one of those cases where only a small part of the shared code is actually shared

3 years ago[REF] Minor cleanup
eileen [Sun, 17 Jan 2021 21:30:35 +0000 (10:30 +1300)]
[REF] Minor cleanup

3 years ago[Test] Extend new membership form to cover multi-line renew
eileen [Sun, 17 Jan 2021 21:15:00 +0000 (10:15 +1300)]
[Test] Extend new membership form to cover multi-line renew

3 years ago[REF] Fix Order class to not reload if already loaded
eileen [Sun, 17 Jan 2021 20:56:47 +0000 (09:56 +1300)]
[REF] Fix Order class to not reload if already loaded

3 years ago[NFC] Preliminary cleanup
eileen [Sat, 2 Jan 2021 03:19:07 +0000 (16:19 +1300)]
[NFC] Preliminary cleanup

3 years agoMerge pull request #19399 from seamuslee001/mysql8_rlike
Eileen McNaughton [Sun, 17 Jan 2021 20:28:03 +0000 (09:28 +1300)]
Merge pull request #19399 from seamuslee001/mysql8_rlike

REF Ensure that when doing RLIKE BINARY the field is cast as BINARY t…

3 years agoREF Ensure that when doing RLIKE BINARY the field is cast as BINARY to prevent issue...
Seamus Lee [Sun, 17 Jan 2021 03:09:29 +0000 (14:09 +1100)]
REF Ensure that when doing RLIKE BINARY the field is cast as BINARY to prevent issue on MySQL 8

3 years agoMerge pull request #19393 from civicrm/5.34
Seamus Lee [Sat, 16 Jan 2021 07:19:20 +0000 (18:19 +1100)]
Merge pull request #19393 from civicrm/5.34

5.34

3 years agoMerge pull request #19398 from seamuslee001/5.34
Seamus Lee [Sat, 16 Jan 2021 05:38:15 +0000 (16:38 +1100)]
Merge pull request #19398 from seamuslee001/5.34

Add release-notes/5.33.2

3 years agoAdd release-notes/5.33.2
Tim Otten [Sat, 16 Jan 2021 04:57:40 +0000 (20:57 -0800)]
Add release-notes/5.33.2

3 years agoMerge pull request #19384 from totten/5.34-distmaker-wpver
Tim Otten [Fri, 15 Jan 2021 07:21:52 +0000 (23:21 -0800)]
Merge pull request #19384 from totten/5.34-distmaker-wpver

(dev/wordpress#85) Fix version number reported within WordPress admin UI

3 years ago(dev/wordpress#85) Fix version number reported within WordPress admin UI
Tim Otten [Thu, 14 Jan 2021 04:09:38 +0000 (20:09 -0800)]
(dev/wordpress#85) Fix version number reported within WordPress admin UI

3 years agoMerge pull request #19388 from demeritcowboy/nulls-all-around
Eileen McNaughton [Fri, 15 Jan 2021 05:21:18 +0000 (18:21 +1300)]
Merge pull request #19388 from demeritcowboy/nulls-all-around

dev/core#2297 - E_NOTICE on contribution thankyou_date_time since time component no longer a separate field

3 years agoMerge pull request #19383 from eileenmcnaughton/civi_sett
Tim Otten [Fri, 15 Jan 2021 05:16:47 +0000 (21:16 -0800)]
Merge pull request #19383 from eileenmcnaughton/civi_sett

Add setting default to speed up cache flush

3 years agoAdd setting default to speed up cache flush
eileen [Thu, 14 Jan 2021 03:58:13 +0000 (16:58 +1300)]
Add setting default to speed up cache flush

Detailed discussion in https://lab.civicrm.org/dev/core/-/issues/2031 but note
this does not add vendor in to make it easier to get it merged (as
there is more complexity there

3 years agoMerge pull request #19339 from kainuk/dev_core_2288_sensible
Eileen McNaughton [Fri, 15 Jan 2021 02:13:56 +0000 (15:13 +1300)]
Merge pull request #19339 from kainuk/dev_core_2288_sensible

dev/core#2288 - Alternative fix search range for select/radio custom fields - now disabling the combination

3 years agoMerge pull request #19382 from totten/master-maxfile
Eileen McNaughton [Fri, 15 Jan 2021 02:12:05 +0000 (15:12 +1300)]
Merge pull request #19382 from totten/master-maxfile

"Admin => Misc" - Fix validation of "Maximum File Size"

3 years agoUpdate Miscellaneous.php
Tim Otten [Thu, 14 Jan 2021 23:09:00 +0000 (15:09 -0800)]
Update Miscellaneous.php

3 years agoMerge pull request #19352 from colemanw/afformRef
Eileen McNaughton [Thu, 14 Jan 2021 22:37:03 +0000 (11:37 +1300)]
Merge pull request #19352 from colemanw/afformRef

Afform - code refactoring for angular best practices

3 years agoBump Minimum install PHP 7.2
Seamus Lee [Thu, 14 Jan 2021 22:36:17 +0000 (09:36 +1100)]
Bump Minimum install PHP 7.2

3 years agoMerge pull request #19385 from civicrm/5.34
Eileen McNaughton [Thu, 14 Jan 2021 20:16:12 +0000 (09:16 +1300)]
Merge pull request #19385 from civicrm/5.34

5.34

3 years agotime component no longer a field
demeritcowboy [Thu, 14 Jan 2021 17:41:52 +0000 (12:41 -0500)]
time component no longer a field

3 years agoSimplify tracking of URLs
Tim Otten [Thu, 14 Jan 2021 10:29:49 +0000 (02:29 -0800)]
Simplify tracking of URLs

In the prior commit, it needed to conceptually change the behavior of
`getTrackerURL($oldURL): $trackedURL`, but it danced around it (adding
more classes and similar-sounding-methods, but distributed elsewhere).

This re-consolidates to keep a cleaner separation of responsibilities
between `{Html,Text}ClickTracker.php` (*parsing an HTML or text message for URLS*)
and `TrackableURL.php` (*translating the URL*).

3 years agoEnable tracking of urls with tokens in Flexmailer
Rich Lott / Artful Robot [Wed, 9 Dec 2020 10:12:36 +0000 (10:12 +0000)]
Enable tracking of urls with tokens in Flexmailer

3 years ago(NFC) BaseMailingSystemTest - Tweak debug message for assertion
Tim Otten [Thu, 14 Jan 2021 10:28:21 +0000 (02:28 -0800)]
(NFC) BaseMailingSystemTest - Tweak debug message for assertion