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
eileen [Tue, 9 Feb 2021 10:17:29 +0000 (23:17 +1300)]
Remove always-true-if
['amount'] is set
in https://github.com/civicrm/civicrm-core/blob/
ef55369a767a5ac6184759f553aec4eeadae7a7e/CRM/Member/Form/Membership.php#L1256-L1266 & so is always set
This is not an empty check - so would not trigger on zero anyway -
so it is always true
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
Matthew Wire [Sun, 7 Feb 2021 15:39:59 +0000 (15:39 +0000)]
Merge pull request #19509 from jmcclelland/correctSmsNumbers
Correct sms numbers
demeritcowboy [Sat, 6 Feb 2021 19:33:43 +0000 (14:33 -0500)]
tests for activity import
Eileen McNaughton [Sun, 7 Feb 2021 04:25:38 +0000 (17:25 +1300)]
Merge pull request #19553 from demeritcowboy/activity-import-test
dev/core#2308 - Fix Activity Import Parser test and convert to civi statics
demeritcowboy [Sun, 7 Feb 2021 02:47:47 +0000 (21:47 -0500)]
fix test and convert to civi statics
eileen [Sat, 6 Feb 2021 03:19:30 +0000 (16:19 +1300)]
Add unit test cover for the MessageTemplate::renderMessageTemplate function
This provides cover for the 4 methods
- domain tokens
- contact tokens
- smarty assigns within the function
- smarty assigns before the function
Eileen McNaughton [Sat, 6 Feb 2021 21:40:57 +0000 (10:40 +1300)]
Merge pull request #19552 from demeritcowboy/php74-notice
php 7.4 E_NOTICE in Contact/BAO/Query
Coleman Watts [Sat, 6 Feb 2021 21:05:40 +0000 (16:05 -0500)]
SearchKit - Use label_field to determine column to output as link
Coleman Watts [Sat, 6 Feb 2021 21:00:18 +0000 (16:00 -0500)]
SearchKit - Use label_field to determine default columns
Coleman Watts [Sat, 6 Feb 2021 20:41:44 +0000 (15:41 -0500)]
SearchKit - Auto-add label_field when adding a join
Coleman Watts [Sat, 6 Feb 2021 20:27:12 +0000 (15:27 -0500)]
SearchKit - Add in FK fields for implicit joins
This adds pseudo-fields to each entity that actually belong to other entities,
the API is able to automatically fetch them using implicit joins.
demeritcowboy [Sat, 6 Feb 2021 19:33:43 +0000 (14:33 -0500)]
php 7.4 notice
colemanw [Sat, 6 Feb 2021 17:40:28 +0000 (12:40 -0500)]
Merge pull request #19531 from ahed-compucorp/master
Improve consistency of field titles, labels, types across the schema
Ahed [Sat, 6 Feb 2021 11:37:09 +0000 (13:37 +0200)]
Fix failing tests after regenerating DAO files
Ahed [Sat, 6 Feb 2021 11:36:32 +0000 (13:36 +0200)]
Regenerate DAO files
Eileen McNaughton [Sat, 6 Feb 2021 00:08:01 +0000 (13:08 +1300)]
Merge pull request #19524 from eileenmcnaughton/member
[REF] Simplify is_email_receipt handling
Eileen McNaughton [Fri, 5 Feb 2021 23:44:14 +0000 (12:44 +1300)]
Merge pull request #19545 from demeritcowboy/membership-notice-php74
php 7.4 - E_NOTICE on membership dashboard
Eileen McNaughton [Fri, 5 Feb 2021 23:43:20 +0000 (12:43 +1300)]
Merge pull request #19548 from civicrm/5.35
5.35 to master
Eileen McNaughton [Fri, 5 Feb 2021 23:42:45 +0000 (12:42 +1300)]
Merge pull request #19546 from colemanw/labelField
APIv4 - Fix label_field to use underscore instead of camelCase
Ahed [Fri, 5 Feb 2021 19:34:33 +0000 (21:34 +0200)]
Fix any title or label that contain name of own entity
Ahed [Fri, 5 Feb 2021 09:33:13 +0000 (11:33 +0200)]
Ensure field's title and html's lable attributes populated properly
Ahed [Thu, 4 Feb 2021 19:48:41 +0000 (21:48 +0200)]
Add html tag to all files in xml/schema
Eileen McNaughton [Fri, 5 Feb 2021 21:40:33 +0000 (10:40 +1300)]
Merge pull request #18830 from adixon/asset-building-error-2137
put asset rendering call into a try/catch - dev/core #2137
eileen [Thu, 4 Feb 2021 03:13:06 +0000 (16:13 +1300)]
[REF] Simplify is_email_receipt handling
This removes a chunk of confusing handling from the previously shared code.
Philosophically we have a lot of arrays of data being passed around. The difference
between these arrays is unclear & the array that appears to exist specifically to
how what was actually submitted (formValues) is edited rather than left intact.
Where we are not dealing with a calcuated value, but rather referring to
what was submitted the quickform function getSubmittedValue() seems
like a good pick. It's clear we are looking up the submitted value not
some calculated value & when code is moved around we know this
value is not dependent on where it is sitting in the code.
The function returns 1 or NULL - hence I cast to boolean where I'm not
sure NULL is good enough
Tim Otten [Fri, 5 Feb 2021 20:49:16 +0000 (12:49 -0800)]
Sort permission list by title. Make it easier to skim.
demeritcowboy [Fri, 5 Feb 2021 20:39:37 +0000 (15:39 -0500)]
php 7.4 is a bit stricter
Coleman Watts [Fri, 5 Feb 2021 20:36:26 +0000 (15:36 -0500)]
APIv4 - Fix label_field to use underscore instead of camelCase
demeritcowboy [Fri, 5 Feb 2021 20:20:13 +0000 (15:20 -0500)]
delay not necessary
Alan Dixon [Wed, 21 Oct 2020 20:24:41 +0000 (20:24 +0000)]
Log unexpected missing asset during AssetBuilder::build
Alan Dixon [Wed, 21 Oct 2020 20:24:41 +0000 (20:24 +0000)]
put asset rendering call into a try/catch
Matthew Wire [Fri, 5 Feb 2021 11:24:22 +0000 (11:24 +0000)]
Merge pull request #19538 from eileenmcnaughton/repeat
[REF] [Repeattransaction] Stop setting contribution->id
Matthew Wire [Fri, 5 Feb 2021 11:22:04 +0000 (11:22 +0000)]
Merge pull request #19539 from eileenmcnaughton/repeat_fin
[REF] [Repeattransaction] use financial_type_id from getTemplateContribution (which already has handling)
Matthew Wire [Fri, 5 Feb 2021 11:20:08 +0000 (11:20 +0000)]
Merge pull request #19540 from eileenmcnaughton/cont_page_input
[REF] [Repeattransaction] Remove loading contribution page id from passed in object
Seamus Lee [Fri, 5 Feb 2021 08:04:36 +0000 (19:04 +1100)]
Merge pull request #19530 from colemanw/searchDisplayBlocks
Afform Gui - Block editing enhancements
Eileen McNaughton [Fri, 5 Feb 2021 06:12:35 +0000 (19:12 +1300)]
Merge pull request #19542 from seamuslee001/afform_fix_array_access
[REF] Fix array access on NULL error when running afform unit tests o…
Eileen McNaughton [Fri, 5 Feb 2021 05:45:52 +0000 (18:45 +1300)]
Merge pull request #19541 from totten/master-aff-mock
afform_mock - Hide extension. Clearly indicate as development-only
Seamus Lee [Fri, 5 Feb 2021 04:34:32 +0000 (15:34 +1100)]
[REF] Fix array access on NULL error when running afform unit tests on PHP 7.4
Tim Otten [Fri, 5 Feb 2021 04:21:47 +0000 (20:21 -0800)]
(NFC) afform_mock - Hide extension. Clearly indicate as development-only.
Eileen McNaughton [Fri, 5 Feb 2021 03:52:15 +0000 (16:52 +1300)]
Merge pull request #19537 from colemanw/aliasLength
APIv4 - Increase alias max length to 256
eileen [Fri, 5 Feb 2021 03:15:25 +0000 (16:15 +1300)]
[REF] Remove loading contribution page id from passed in object
I believe this became obsolete with this PR
https://github.com/civicrm/civicrm-core/commit/
6c3e774c322267c8e4449006db9cc14202b7028f
The other 2 (paypal) IPN classes no longer set contribution_page_id deliberately so
would be relying on the same data used for getTemplateContribution
eileen [Fri, 5 Feb 2021 02:42:57 +0000 (15:42 +1300)]
[REF] use financial_type_id from getTemplateContribution (which already has handling)
The removed code is already incorporated into getTemplateContribution
and has test cover in testRepeatTransactionPassedInFinancialType
eileen [Fri, 5 Feb 2021 02:33:11 +0000 (15:33 +1300)]
[REF] Stop setting contribution->id
This is not needed as we can otherwise get it from the contributionResult directly
Coleman Watts [Fri, 5 Feb 2021 01:52:45 +0000 (20:52 -0500)]
APIv4 - Increase alias max length to 256
Tim Otten [Fri, 5 Feb 2021 00:49:33 +0000 (16:49 -0800)]
CRM_Core_Permission_List - Tweak labels for `*always allow*` and `*always deny*`
Tim Otten [Thu, 4 Feb 2021 22:14:35 +0000 (14:14 -0800)]
Nav Menu Editor - Use API for listing/searching available permissions