eileen [Tue, 19 Jan 2021 00:44:42 +0000 (13:44 +1300)]
Cleanup a couple of unnecessary references
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
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 …
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
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
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
Seamus Lee [Mon, 18 Jan 2021 20:20:12 +0000 (07:20 +1100)]
Merge pull request #19414 from spalmstr/Issue2307
Fix Issue 2307
eileen [Mon, 18 Jan 2021 20:18:37 +0000 (09:18 +1300)]
Add in-code notes about the workflow_name
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
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
Stephen Palmstrom [Mon, 18 Jan 2021 18:28:09 +0000 (18:28 +0000)]
Fix Issue 2307
Christian Wach [Mon, 18 Jan 2021 11:39:49 +0000 (11:39 +0000)]
Fix rendering of Dashlet placeholder
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
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
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
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
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
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
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
Seamus Lee [Mon, 18 Jan 2021 03:30:22 +0000 (14:30 +1100)]
Merge pull request #19407 from eileenmcnaughton/anet
Remove call to loadRelatedObjects
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
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
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
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
Eileen McNaughton [Mon, 18 Jan 2021 00:42:31 +0000 (13:42 +1300)]
Merge pull request #19406 from eileenmcnaughton/param
[REF] Param simplification
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
eileen [Sun, 17 Jan 2021 23:43:51 +0000 (12:43 +1300)]
[NFC] Whitespace fix up
Seamus Lee [Sun, 17 Jan 2021 23:15:25 +0000 (10:15 +1100)]
Merge pull request #19401 from eileenmcnaughton/mem_test
[NFC] Preliminary cleanup
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
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
eileen [Sun, 17 Jan 2021 22:15:34 +0000 (11:15 +1300)]
[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
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
eileen [Sun, 17 Jan 2021 21:30:35 +0000 (10:30 +1300)]
[REF] Minor cleanup
eileen [Sun, 17 Jan 2021 21:15:00 +0000 (10:15 +1300)]
[Test] Extend new membership form to cover multi-line renew
eileen [Sun, 17 Jan 2021 20:56:47 +0000 (09:56 +1300)]
[REF] Fix Order class to not reload if already loaded
eileen [Sat, 2 Jan 2021 03:19:07 +0000 (16:19 +1300)]
[NFC] Preliminary cleanup
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…
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
Seamus Lee [Sat, 16 Jan 2021 07:19:20 +0000 (18:19 +1100)]
Merge pull request #19393 from civicrm/5.34
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
Tim Otten [Sat, 16 Jan 2021 04:57:40 +0000 (20:57 -0800)]
Add release-notes/5.33.2
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
Tim Otten [Thu, 14 Jan 2021 04:09:38 +0000 (20:09 -0800)]
(dev/wordpress#85) Fix version number reported within WordPress admin UI
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
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
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
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
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"
Tim Otten [Thu, 14 Jan 2021 23:09:00 +0000 (15:09 -0800)]
Update Miscellaneous.php
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
Seamus Lee [Thu, 14 Jan 2021 22:36:17 +0000 (09:36 +1100)]
Bump Minimum install PHP 7.2
Eileen McNaughton [Thu, 14 Jan 2021 20:16:12 +0000 (09:16 +1300)]
Merge pull request #19385 from civicrm/5.34
5.34
demeritcowboy [Thu, 14 Jan 2021 17:41:52 +0000 (12:41 -0500)]
time component no longer a field
Seamus Lee [Thu, 14 Jan 2021 08:38:08 +0000 (19:38 +1100)]
Merge pull request #19381 from eileenmcnaughton/regress
Fix naming regression dev/core#2298
eileen [Thu, 14 Jan 2021 03:43:29 +0000 (16:43 +1300)]
Fix naming regression dev/core#2298
Tim Otten [Thu, 14 Jan 2021 03:15:11 +0000 (19:15 -0800)]
"Admin => Misc" - Fix validation of "Maximum File Size"
The form "Administer => System Settings => Miscellaneous" has a field for "Maximum File Size".
I was on a workstation where the PHP-default and the Civi-default were disagreeable, so
(by default) I couldn't submit the form. So I noticed some quirks -- fixed below.
Before
------
* The error message tells you that the "Maximum File Size" disagrees with a setting in `php.ini`.
Hopefully, you know what+where of "php.ini", otherwise you'll be at a loss for what value is acceptable.
* The validation assumes that `upload_max_filesize` is expressed in unit-megabytes. But `php.ini` actually
allows different units (`2m`, `2048k`, `1g`, `
2097152`). The comparison is incorrect
if any other unit is used. (ex: If `php.ini has `upload_max_filesize=1g`, and if the requested
limit is `2` megabytes, then it should accept - but it rejects due to mismatched units.)
After
-----
* Error message tells you what you need to know.
* Validator correctly interprets the units used in `php.ini`'s `upload_max_filesize`.
Eileen McNaughton [Wed, 13 Jan 2021 23:36:31 +0000 (12:36 +1300)]
Merge pull request #19278 from colemanw/relationshipTypePseudoconstants
Add pseudoconstant for Relationship.relationship_type_id
Seamus Lee [Wed, 13 Jan 2021 23:05:01 +0000 (10:05 +1100)]
Merge pull request #19365 from eileenmcnaughton/dep
Move another deprecated utils function
Seamus Lee [Wed, 13 Jan 2021 23:03:49 +0000 (10:03 +1100)]
Merge pull request #19325 from colemanw/cssFix
Add explicit box-sizing to crm-flex-box style
Seamus Lee [Wed, 13 Jan 2021 23:00:04 +0000 (10:00 +1100)]
Merge pull request #19366 from eileenmcnaughton/import
[NFC] minor code cleanups
Eileen McNaughton [Wed, 13 Jan 2021 22:58:13 +0000 (11:58 +1300)]
Merge pull request #19380 from civicrm/5.34
5.34
Tim Otten [Wed, 13 Jan 2021 21:19:23 +0000 (13:19 -0800)]
Merge pull request #19377 from civicrm/bump_composer_compile_version
REF Bump the composer-compile-plugin version
Eileen McNaughton [Wed, 13 Jan 2021 19:32:19 +0000 (08:32 +1300)]
Merge pull request #19378 from ahed-compucorp/Add-Ahed-to-contributors-file
[NFC] Update contributor-key.yml with Ahed
Ahed [Wed, 13 Jan 2021 10:19:58 +0000 (12:19 +0200)]
Add Ahed to contributor-key.yml file
Seamus Lee [Wed, 13 Jan 2021 05:38:18 +0000 (16:38 +1100)]
REF Bump the composer-compile-plugin version
Eileen McNaughton [Tue, 12 Jan 2021 20:14:06 +0000 (09:14 +1300)]
Merge pull request #19375 from civicrm/5.34
5.34 to master
Eileen McNaughton [Tue, 12 Jan 2021 20:13:30 +0000 (09:13 +1300)]
Merge pull request #19374 from agh1/5.34.0-releasenotes-initial
5.34.0 release notes initial run
colemanw [Tue, 12 Jan 2021 18:55:33 +0000 (13:55 -0500)]
Merge pull request #19370 from eileenmcnaughton/cleanup2
Use php to require an array
colemanw [Tue, 12 Jan 2021 18:20:09 +0000 (13:20 -0500)]
Merge pull request #19367 from eileenmcnaughton/import2
[NFC] Minor code cleanup
Andrew Hunt [Tue, 12 Jan 2021 15:39:35 +0000 (10:39 -0500)]
5.34.0 release notes: added boilerplate
Andrew Hunt [Tue, 12 Jan 2021 15:32:18 +0000 (10:32 -0500)]
5.34.0 release notes: raw from script
colemanw [Tue, 12 Jan 2021 13:52:22 +0000 (08:52 -0500)]
Merge pull request #19369 from eileenmcnaughton/cleanup
[REF] Remove function that is the same as parent
eileen [Tue, 12 Jan 2021 05:45:23 +0000 (18:45 +1300)]
Use php to require an array
Removes is_array check in favour of php strict typing
eileen [Tue, 12 Jan 2021 05:20:47 +0000 (18:20 +1300)]
[REF] Remove function that is the same as parent
Eileen McNaughton [Tue, 12 Jan 2021 02:52:51 +0000 (15:52 +1300)]
Merge pull request #19364 from civicrm/move_upgrade
[NFC] Move Upgrade for navgation from 5.34.alpha1 to 5.35.alpha1 as t…
eileen [Tue, 12 Jan 2021 02:51:22 +0000 (15:51 +1300)]
[NFC] Minor code cleanup
eileen [Tue, 12 Jan 2021 02:42:13 +0000 (15:42 +1300)]
[NFC] minor code cleanups
eileen [Tue, 12 Jan 2021 02:20:39 +0000 (15:20 +1300)]
Move another deprecated utils function
Function is only called from one class, relocate there
Seamus Lee [Tue, 12 Jan 2021 01:25:51 +0000 (12:25 +1100)]
[NFC] Move Upgrade for navgation from 5.34.alpha1 to 5.35.alpha1 as the 5.34 RC has been branched
Eileen McNaughton [Tue, 12 Jan 2021 00:01:27 +0000 (13:01 +1300)]
Merge pull request #19363 from seamuslee001/regen_generated
(NFC) Regenerate civicrm_generated.mysql
Seamus Lee [Mon, 11 Jan 2021 22:08:12 +0000 (09:08 +1100)]
(NFC) Regenerate civicrm_generated.mysql
Eileen McNaughton [Mon, 11 Jan 2021 21:56:40 +0000 (10:56 +1300)]
Merge pull request #19342 from alifrumin/mailmenu2
Update permissions for "CiviCRM Admin Menu -> Mailings -> Message Templates" nav item
Eileen McNaughton [Mon, 11 Jan 2021 21:47:46 +0000 (10:47 +1300)]
Merge pull request #19362 from eileenmcnaughton/anet2
Set contribution_page_id from template contribution
Eileen McNaughton [Mon, 11 Jan 2021 21:40:37 +0000 (10:40 +1300)]
Merge pull request #19323 from seamuslee001/default_handler_exception
REF Update CiviCRM default PEAR Error handling to be exception rather…
Seamus Lee [Mon, 11 Jan 2021 21:24:13 +0000 (08:24 +1100)]
Merge pull request #19361 from demeritcowboy/arrested-development
dev/core#2241 - Deprecate direct calls to isDevelopment()
Seamus Lee [Mon, 11 Jan 2021 20:41:45 +0000 (07:41 +1100)]
Merge pull request #19360 from agileware/CIVICRM-1638
When two contacts, Contact A and Contact B have the same email address, if Contact A is deleted then Contact B is incorrectly excluded from mailings, does not receive emails
eileen [Mon, 11 Jan 2021 20:19:56 +0000 (09:19 +1300)]
Set contribution_page_id from template contribution
This is tested in AuthorizeNetIPNTest::testIPNPaymentRecurNoReceipt
demeritcowboy [Mon, 11 Jan 2021 16:35:03 +0000 (11:35 -0500)]
deprecate direct calls to isDevelopment
Coleman Watts [Mon, 11 Jan 2021 15:15:11 +0000 (10:15 -0500)]
Afform - use core flex styles
Coleman Watts [Mon, 11 Jan 2021 14:24:46 +0000 (09:24 -0500)]
Afform - refactor afForm directive to component
Coleman Watts [Fri, 8 Jan 2021 23:31:51 +0000 (18:31 -0500)]
Afform - Ref directives to components in their own files
Coleman Watts [Fri, 8 Jan 2021 20:20:59 +0000 (15:20 -0500)]
Afform - Fix scanning for input types
Coleman Watts [Fri, 8 Jan 2021 19:24:54 +0000 (14:24 -0500)]
Afform - Refactor elements as components & move to their own files
Coleman Watts [Fri, 8 Jan 2021 00:20:20 +0000 (19:20 -0500)]
Afform - Move components to their own files
Coleman Watts [Thu, 7 Jan 2021 22:14:40 +0000 (17:14 -0500)]
Afform - Refactor icon picker to service
Coleman Watts [Thu, 7 Jan 2021 21:00:46 +0000 (16:00 -0500)]
Afform - Refactor functions to services, move a couple directives to files
Coleman Watts [Thu, 7 Jan 2021 14:52:57 +0000 (09:52 -0500)]
Afform - Refactor afGuiEntity to a component
Coleman Watts [Thu, 7 Jan 2021 02:36:04 +0000 (21:36 -0500)]
Afform - Refactor afGuiEditor to a component and rename af files
Coleman Watts [Wed, 6 Jan 2021 18:35:24 +0000 (13:35 -0500)]
Afform - fix link in breadcrumb