Seamus Lee [Wed, 17 Feb 2021 06:06:36 +0000 (17:06 +1100)]
Merge pull request #19613 from eileenmcnaughton/catch
Fix on recently merged asset builder catch patch
eileen [Wed, 17 Feb 2021 04:17:09 +0000 (17:17 +1300)]
Fix on recently merged asset builder catch patch
This log line got added in review & I think not tested. Only in master
https://github.com/civicrm/civicrm-core/pull/18830
Seamus Lee [Wed, 17 Feb 2021 03:19:43 +0000 (14:19 +1100)]
Merge pull request #19611 from eileenmcnaughton/ignore
Add contactlayouteditor to gitignore
Eileen McNaughton [Wed, 17 Feb 2021 02:24:55 +0000 (15:24 +1300)]
Merge pull request #19585 from colemanw/searchKitApi
Search Kit - Use wrapper api to run searches
eileen [Wed, 17 Feb 2021 01:44:27 +0000 (14:44 +1300)]
Add contactlayouteditor to gitignore
This is put in the tools directory during a buildkit install but we don't want to
accidentally commit it
Seamus Lee [Tue, 16 Feb 2021 20:51:41 +0000 (07:51 +1100)]
Merge pull request #19599 from totten/master-jwt
Crypto - Add support for signing and verifying JSON Web Tokens
Coleman Watts [Tue, 16 Feb 2021 13:56:01 +0000 (08:56 -0500)]
SearchKit - normalize search display column keys
Matthew Wire [Tue, 16 Feb 2021 09:42:07 +0000 (09:42 +0000)]
Merge pull request #19571 from eileenmcnaughton/ipn
[REF] Stop passing contribution into completeOrder, id is enough
Eileen McNaughton [Tue, 16 Feb 2021 05:02:21 +0000 (18:02 +1300)]
Merge pull request #19604 from JMAConsulting/issue-2309
core#2309: Validate weight and weight threshold
Monish Deb [Mon, 15 Feb 2021 16:06:11 +0000 (21:36 +0530)]
core#2309: Validate weight and weight threshold
Eileen McNaughton [Tue, 16 Feb 2021 01:42:25 +0000 (14:42 +1300)]
Merge pull request #19607 from demeritcowboy/unit-assert-cases
[NFC/Unit Test] Fix passing test that should pass but also should fail
demeritcowboy [Mon, 15 Feb 2021 22:45:21 +0000 (17:45 -0500)]
compare nonexistent array keys to 0 better
Eileen McNaughton [Mon, 15 Feb 2021 21:52:39 +0000 (10:52 +1300)]
Merge pull request #19606 from civicrm/5.35
5.35
Eileen McNaughton [Mon, 15 Feb 2021 20:20:15 +0000 (09:20 +1300)]
Merge pull request #19588 from MegaphoneJon/core-2379
core#2379 - avoid validation error on saving geocodes
Seamus Lee [Mon, 15 Feb 2021 20:18:08 +0000 (07:18 +1100)]
Merge pull request #19593 from eileenmcnaughton/535
Fix Redis deprecated warning
Seamus Lee [Mon, 15 Feb 2021 20:06:14 +0000 (07:06 +1100)]
Merge pull request #19595 from eileenmcnaughton/tokens
[NFC] Code cleanup - use use statements, hints
Eileen McNaughton [Mon, 15 Feb 2021 20:02:44 +0000 (09:02 +1300)]
Merge pull request #19602 from JMAConsulting/money_defaults
Use specific function when formatting money for a default
Eileen McNaughton [Mon, 15 Feb 2021 19:48:07 +0000 (08:48 +1300)]
Merge pull request #19601 from civicrm/5.35
5.35
agbud8@zabuntu [Thu, 11 Feb 2021 16:52:39 +0000 (11:52 -0500)]
core#2379 - avoid validation error on saving geocodes
Monish Deb [Mon, 15 Feb 2021 14:02:53 +0000 (19:32 +0530)]
Use specific function when formatting money for a default
Seamus Lee [Mon, 15 Feb 2021 08:06:36 +0000 (19:06 +1100)]
Merge pull request #19594 from eileenmcnaughton/535m
dev/mail#89 Fix unreleased regression where civimember is not permitted/enabled
Seamus Lee [Mon, 15 Feb 2021 07:47:36 +0000 (18:47 +1100)]
Merge pull request #19600 from totten/master-http-test
HttpTestTrait - Define helper methods for E2E tests of Civi's HTTP routes
Eileen McNaughton [Mon, 15 Feb 2021 06:08:02 +0000 (19:08 +1300)]
Merge pull request #19572 from MegaphoneJon/event-48
event#48: Fix partially paid events in a modal dialog
Eileen McNaughton [Mon, 15 Feb 2021 05:44:48 +0000 (18:44 +1300)]
Merge pull request #19596 from colemanw/getFieldsOptions
APIv4 - Add option lists to getFields html_type and data_type
Tim Otten [Mon, 15 Feb 2021 05:12:48 +0000 (21:12 -0800)]
(NFC) HttpTestTrait - Fix typo
Tim Otten [Sat, 13 Feb 2021 04:29:07 +0000 (20:29 -0800)]
HttpTestTrait - assertContentType() should a little sensitive to CMS variations
This is based on the observation the WP reported `text/plain` while D7
reported `text/plain;charset=UTF-8` -- even though the Civi output logic was
the same (specifying `text/plain`).
Tim Otten [Mon, 15 Feb 2021 04:04:57 +0000 (20:04 -0800)]
Crypto - Define CIVICRM_SIGN_KEYS as way to register signing keys
Tim Otten [Mon, 15 Feb 2021 00:34:49 +0000 (16:34 -0800)]
Crypto - Define a service for creating and verifying JSON Web tokens ('crypto.jwt')
Tim Otten [Sun, 14 Feb 2021 22:03:44 +0000 (14:03 -0800)]
composer.lock - Require firebase/php-jwt
Tim Otten [Sun, 14 Feb 2021 21:53:52 +0000 (13:53 -0800)]
composer.json - Require firebase/php-jwt (v3 - v5)
When this version range?
* It's a fairly popular package, so may be prone to conflicts. A wide range is desireable.
* The low end (v3) is 5+ years old. The high end (v5) is current latest.
* If you 'git diff' between v3=>v4=>v5, the changes are fairly incrementaly. They
add more crypto algorithms, twiddle docblocks and PHP environment compatibility,
and introduce a service we don't need (JWK). The main interfaces all look the same.
* The only notable bit was that some exceptions were recategorized, but the broad taxonomy
of exceptions still seems similar.
Coleman Watts [Fri, 12 Feb 2021 17:33:56 +0000 (12:33 -0500)]
SearchKit - Support filters in new Run action
This uses the global 'includeWildCardInName' setting to determine whether to do a full wildcard search.
Coleman Watts [Fri, 12 Feb 2021 16:55:45 +0000 (11:55 -0500)]
SearchKit - Ensure aggregated fields are aliased
Coleman Watts [Fri, 12 Feb 2021 16:06:28 +0000 (11:06 -0500)]
APIv4 - Allow field aliases in ORDER BY clause
Coleman Watts [Fri, 12 Feb 2021 15:40:24 +0000 (10:40 -0500)]
SearchKit - Refactor searchDisplay admin components: move common functions to parent
Coleman Watts [Fri, 12 Feb 2021 14:27:55 +0000 (09:27 -0500)]
SearchKit - Add orderBy selector when configuring displays
Coleman Watts [Thu, 11 Feb 2021 20:11:10 +0000 (15:11 -0500)]
SearchKit - Refactor search displays to go through centralized api wrapper
eileen [Mon, 15 Feb 2021 00:50:44 +0000 (13:50 +1300)]
[NFC] Code cleanup - use use statements, hints
Minor cleanup on token classes from https://github.com/civicrm/civicrm-core/pull/19584
Coleman Watts [Mon, 15 Feb 2021 00:50:24 +0000 (19:50 -0500)]
APIv4 - Add option lists to getFields html_type and data_type
eileen [Sun, 14 Feb 2021 23:23:58 +0000 (12:23 +1300)]
dev/mail#89 Fix unreleased regression where civimember is not permitted/enabled
Fixes a bug where a person with no access to CiviMember will get an exception thrown (and
not caught) rather than receive a result of 0 when checking the memberships
that a contact has access to
eileen [Fri, 12 Feb 2021 22:05:44 +0000 (11:05 +1300)]
Fix Redis deprecated warning
It's not obvious why we would pass trapException here. I believe the issue is that
some custom searches result in 'acceptable' bad sql here but
https://github.com/civicrm/civicrm-core/commit/
6dc40f3250ede0f38ce2aed7c3fabd3f1f667c1b
already fixed to catch any exception so we don't
need to convert. There is one other place that calls fillWithSql but there
is no evidence it is subject to the random issue on custom searches / needs
any attention at the moment
Eileen McNaughton [Sun, 14 Feb 2021 23:08:37 +0000 (12:08 +1300)]
Merge pull request #19570 from colemanw/deleteOldXml
Cleanup - Remove old unused schema/xml files.
Eileen McNaughton [Sun, 14 Feb 2021 22:49:29 +0000 (11:49 +1300)]
Merge pull request #19544 from demeritcowboy/tardy-chart
dev/core#2365 - Delayed drawing of contribution charts seems unnecessary
Eileen McNaughton [Sat, 13 Feb 2021 22:40:37 +0000 (11:40 +1300)]
Merge pull request #19578 from MegaphoneJon/buildoptions
[REF] replace deprecated calls with buildOptions
Eileen McNaughton [Sat, 13 Feb 2021 22:39:29 +0000 (11:39 +1300)]
Merge pull request #19592 from civicrm/5.35
5.35 to master
Eileen McNaughton [Sat, 13 Feb 2021 22:38:21 +0000 (11:38 +1300)]
Merge pull request #19586 from alifrumin/5.35-releasenotes
[NFC] First Pass at 5.35 release notes
Eileen McNaughton [Sat, 13 Feb 2021 22:37:00 +0000 (11:37 +1300)]
Merge pull request #19582 from mattwire/extensiondownloader
Remove check for safe_mode/open_basedir on extension downloader because it triggers false positives
Tim Otten [Thu, 11 Feb 2021 01:10:39 +0000 (17:10 -0800)]
GuzzleMiddleware, HttpTestTrait - Add 'DEBUG' option
If you run the test with DEBUG=1 or DEBUG=2, it will show a list of the HTTP requests.
Tim Otten [Wed, 10 Feb 2021 22:10:39 +0000 (14:10 -0800)]
Add HttpTestTrait. Distinguish it from GuzzleTestTrait.
Tim Otten [Tue, 9 Feb 2021 05:03:55 +0000 (21:03 -0800)]
GuzzleMiddleware::url() - Add helper to quickly compose Civi-related URLs
Alice Frumin [Wed, 10 Feb 2021 18:20:18 +0000 (13:20 -0500)]
5.35 Release Notes - First Pass
Coleman Watts [Wed, 10 Feb 2021 16:20:15 +0000 (11:20 -0500)]
AfformMetadataInjector - Cleanup variable names & comments
Seamus Lee [Fri, 12 Feb 2021 08:31:41 +0000 (19:31 +1100)]
Merge pull request #19562 from colemanw/relationshipCacheCustom
APIv4 - Improve handling of joins & custom fields
Seamus Lee [Thu, 11 Feb 2021 20:53:36 +0000 (07:53 +1100)]
Merge pull request #19583 from demeritcowboy/system-get-info
dev/drupal#156 - system_get_info() is gone in drupal 9
Eileen McNaughton [Thu, 11 Feb 2021 20:42:36 +0000 (09:42 +1300)]
Merge pull request #19581 from seamuslee001/dao_regen
REF Regenerate DAOs and I18n Schema Structure following merge of #19565
demeritcowboy [Thu, 11 Feb 2021 18:35:15 +0000 (13:35 -0500)]
system_get_info is deprecated
Matthew Wire [Thu, 11 Feb 2021 15:27:40 +0000 (15:27 +0000)]
Remove check for safe_mode/open_basedir on extension downloader because it triggers false positives
Seamus Lee [Thu, 11 Feb 2021 08:48:46 +0000 (19:48 +1100)]
Merge pull request #19577 from colemanw/bootstrapDashlets
Apply bootstrap theme to searchKit dashlets
Seamus Lee [Thu, 11 Feb 2021 06:08:23 +0000 (17:08 +1100)]
Regenerate DAOs and I18n Schema Structure following merge of #19565
Seamus Lee [Thu, 11 Feb 2021 06:05:28 +0000 (17:05 +1100)]
Merge pull request #19565 from ahed-compucorp/add-missing-labels
Delete repeated title and fix some labels
agbud8@zabuntu [Wed, 10 Feb 2021 21:55:46 +0000 (16:55 -0500)]
replace deprecated calls with buildOptions
Eileen McNaughton [Wed, 10 Feb 2021 20:29:52 +0000 (09:29 +1300)]
Merge pull request #19576 from ixiam/dev-core#2371
serialize as boolean setting value for checkbox in CRM_Admin_Form_Gen…
Coleman Watts [Wed, 10 Feb 2021 15:09:31 +0000 (10:09 -0500)]
Apply bootstrap theme to searchKit dashlets
Coleman Watts [Wed, 10 Feb 2021 14:53:43 +0000 (09:53 -0500)]
APIv4 - Fix wildcard expansion in joins
Passing a fake field (e.g. related_entity.*) to autoJoinFk was triggering it to always re-attempt a join,
because it could never find a filed named "*".
Instead pass it a real field (every entity has an "id").
colemanw [Wed, 10 Feb 2021 13:04:33 +0000 (08:04 -0500)]
Merge pull request #19575 from colemanw/angularDashletFix
Fix angular error when user is not logged in.
Luciano Spiegel [Wed, 10 Feb 2021 08:47:20 +0000 (09:47 +0100)]
serialize as boolean setting value for checkbox in CRM_Admin_Form_Generic
Coleman Watts [Wed, 10 Feb 2021 01:21:57 +0000 (20:21 -0500)]
Fix angular error when user is not logged in.
Seamus Lee [Wed, 10 Feb 2021 01:08:34 +0000 (12:08 +1100)]
Merge pull request #19574 from civicrm/5.35
5.35 to master
Eileen McNaughton [Wed, 10 Feb 2021 01:07:55 +0000 (14:07 +1300)]
Merge pull request #19573 from totten/5.35-rand37
dev/core#2370 - Installer - Bump up entropy for autogenerated cred keys
Seamus Lee [Tue, 9 Feb 2021 23:37:59 +0000 (10:37 +1100)]
Merge pull request #19568 from totten/5.35-rand37
dev/core#2370 - Installer - Bump up entropy for autogenerated cred keys
Coleman Watts [Tue, 9 Feb 2021 23:18:23 +0000 (18:18 -0500)]
SearchKit - When removing a join, cleanup related params
After removing an explicit join, ensure that all SELECT, WHERE, ORDER BY and HAVING clauses containing it are also removed,
plus any additional joins that relied on the join being removed.
agbud8@zabuntu [Tue, 9 Feb 2021 21:27:57 +0000 (16:27 -0500)]
event#48: Fix partially paid events in a modal dialog
Coleman Watts [Tue, 9 Feb 2021 20:43:53 +0000 (15:43 -0500)]
SearchKit - Remove old unused params
eileen [Tue, 9 Feb 2021 20:07:10 +0000 (09:07 +1300)]
[REF] Stop passing contribution into completeOrder, id is enough
Ahed [Tue, 9 Feb 2021 17:56:19 +0000 (19:56 +0200)]
Add label for fields without title and html tag
Ahed [Tue, 9 Feb 2021 17:55:18 +0000 (19:55 +0200)]
Add label for fields without title
Only for fields with html tag
Coleman Watts [Tue, 9 Feb 2021 17:08:39 +0000 (12:08 -0500)]
Cleanup - Remove old unused schema/xml files.
These are old files from schema tables that no longer exist.
colemanw [Tue, 9 Feb 2021 13:07:13 +0000 (08:07 -0500)]
Merge pull request #19567 from eileenmcnaughton/ipn
Remove unused code
Tim Otten [Tue, 9 Feb 2021 10:51:05 +0000 (02:51 -0800)]
dev/core#2370 - Installer - Bump up entropy for autogenerated cred keys
This slightly expands the amount of entropy for certain auto-generated values.
Before
-----
~99% of generated values have >=232 bits
After
-----
~99% of generated values have >=260 bits
Technical details
--------
https://lab.civicrm.org/dev/core/-/issues/2370#note_53832
eileen [Tue, 9 Feb 2021 10:27:52 +0000 (23:27 +1300)]
Remove unused code
This value is added to input but does not make it from there to
contributionParams as it is not in the white list. It is also not used in
repeatransaction - which is the other place input is passed to
but which only uses it in a highly filtered form
Ahed [Mon, 8 Feb 2021 21:59:41 +0000 (23:59 +0200)]
Fix titles that contain entity name
Only for fields with title tag and html->label
Ahed [Mon, 8 Feb 2021 21:07:02 +0000 (23:07 +0200)]
Delete repeated title and fix some labels
Seamus Lee [Tue, 9 Feb 2021 09:07:19 +0000 (20:07 +1100)]
Merge pull request #19564 from civicrm/5.35
5.35
Seamus Lee [Tue, 9 Feb 2021 08:55:41 +0000 (19:55 +1100)]
Merge pull request #19563 from eileenmcnaughton/5.35
Fix unreleased regression from mistake extracting function
eileen [Tue, 9 Feb 2021 04:00:11 +0000 (17:00 +1300)]
Fix unreleased regression from mistake extracting function
Ports this line (merged to master) to 5.35 as the mistake turns out to affect 5.35
https://github.com/civicrm/civicrm-core/pull/19551/files#diff-447cfa0a0ec021e7cf54c6f207d94c3e3343eec930130a995355fec37a590a22R597
Coleman Watts [Tue, 9 Feb 2021 02:55:09 +0000 (21:55 -0500)]
APIv4 - Support implicit joins to explicitly joined tables
In APIv4 you can imply a join through dot notation e.g. contact.display_name.
You can also explicity add a join with the addJoin() method.
This allows the two techniques to be combined so that e.g. an explicitly added Address join
can implicity select fields joined from Address to Country.
Coleman Watts [Mon, 8 Feb 2021 15:11:10 +0000 (10:11 -0500)]
APIv4 - Add Relationship custom fields to RelationshipCache entity
Because the RelationshipCache entity is meant to be used without requiring a join to the Relationship table,
this permits direct access to Relationship custom fields as if they belong to the RelationshipCache table.
Matthew Wire [Mon, 8 Feb 2021 21:13:47 +0000 (21:13 +0000)]
Merge pull request #19560 from colemanw/fixEntityFormTrait
Fix 'Unsupported html-element' error on forms using EntityFormTrait
Eileen McNaughton [Mon, 8 Feb 2021 20:33:00 +0000 (09:33 +1300)]
Merge pull request #19559 from demeritcowboy/asset-more-info
dev/core#2137 - Enhance log message to include the actual error
Coleman Watts [Mon, 8 Feb 2021 18:14:35 +0000 (13:14 -0500)]
Fix 'Unsupported html-element' error on forms using EntityFormTrait
demeritcowboy [Mon, 8 Feb 2021 14:31:13 +0000 (09:31 -0500)]
include the actual error in log message
colemanw [Mon, 8 Feb 2021 14:14:36 +0000 (09:14 -0500)]
Merge pull request #19421 from eileenmcnaughton/act2
Cleanup towards dev/core#2308
Matthew Wire [Mon, 8 Feb 2021 13:50:47 +0000 (13:50 +0000)]
Merge pull request #19547 from eileenmcnaughton/cont_obj
[REF] Fully remove contribution object from repeattransaction function
Yashodha Chaku [Mon, 8 Feb 2021 11:13:58 +0000 (16:43 +0530)]
Merge pull request #19525 from eileenmcnaughton/member_soft
[REF] Remove unused pcp & soft credit handling from previously shared code
Seamus Lee [Mon, 8 Feb 2021 09:13:52 +0000 (20:13 +1100)]
Merge pull request #19536 from totten/master-use-permlist
Afform (et al) - Fetch more complete list of permissions via APIv4
eileen [Fri, 5 Feb 2021 23:06:53 +0000 (12:06 +1300)]
[REF] Fully remove contribution object from repeattransaction function
We can now see it is no longer used & remove it
Eileen McNaughton [Mon, 8 Feb 2021 00:31:09 +0000 (13:31 +1300)]
Merge pull request #19554 from colemanw/searchFields
SearchKit - Add implicit joins for displaying labels of related entities
Eileen McNaughton [Mon, 8 Feb 2021 00:30:23 +0000 (13:30 +1300)]
Merge pull request #19555 from demeritcowboy/activity-import-validate
[NFC/Unit Test] dev/core#2308 - Tests for activity import
Seamus Lee [Sun, 7 Feb 2021 21:38:01 +0000 (08:38 +1100)]
Merge pull request #19556 from mattwire/renamevar
[REF] Rename variable to clarify it's usage
Matthew Wire [Tue, 2 Feb 2021 13:44:20 +0000 (13:44 +0000)]
Rename variable to clarify it's usage
Matthew Wire [Sun, 7 Feb 2021 15:41:27 +0000 (15:41 +0000)]
Merge pull request #19551 from eileenmcnaughton/msg_tpl_convert_test
Add unit test cover for the MessageTemplate::renderMessageTemplate function