eileen [Wed, 21 Oct 2020 05:28:00 +0000 (18:28 +1300)]
More buttonrama fallout
Seamus Lee [Wed, 21 Oct 2020 04:59:55 +0000 (15:59 +1100)]
Merge pull request #18817 from seamuslee001/5-30-1-notes
release-notes/5.30.1.md
Tim Otten [Wed, 21 Oct 2020 04:04:24 +0000 (21:04 -0700)]
release-notes/5.30.1.md
Seamus Lee [Mon, 19 Oct 2020 21:06:57 +0000 (08:06 +1100)]
Merge pull request #18800 from agh1/5.31.0-releasenotes-initial
5.31.0 release notes initial run
Andrew Hunt [Mon, 19 Oct 2020 15:22:06 +0000 (11:22 -0400)]
5.31.0 release notes: added boilerplate
Andrew Hunt [Mon, 19 Oct 2020 15:18:21 +0000 (11:18 -0400)]
5.31.0 release notes: raw from script
Tim Otten [Sat, 17 Oct 2020 01:00:12 +0000 (18:00 -0700)]
Merge pull request #18766 from eileenmcnaughton/basic
Fix unreleased regression on search tasks from basic search
Eileen McNaughton [Thu, 15 Oct 2020 04:46:42 +0000 (17:46 +1300)]
Merge pull request #18776 from seamuslee001/dev_core_2125
dev/core#2125 Ensure that the id that is used in the field is the gro…
Seamus Lee [Thu, 15 Oct 2020 00:37:47 +0000 (11:37 +1100)]
dev/core#2125 Ensure that the id that is used in the field is the group id not the id of array key as that has changed from being a keyed array to a 2D array
Eileen McNaughton [Wed, 14 Oct 2020 22:40:28 +0000 (11:40 +1300)]
Merge pull request #18765 from totten/5.31-res-alias
dev/core#2117 - Add compatibility aliases for 'scriptFile' and 'styleFile' resources
Seamus Lee [Wed, 14 Oct 2020 09:06:50 +0000 (20:06 +1100)]
Merge pull request #18763 from eileenmcnaughton/531
dev/core#2119 Fix mailing code to exclude deleted recipients
eileen [Wed, 14 Oct 2020 03:41:19 +0000 (16:41 +1300)]
Fix unreleased regression on search tasks from basic search
Seamus Lee [Wed, 14 Oct 2020 01:58:44 +0000 (12:58 +1100)]
Merge pull request #18758 from mlutfy/event43rc
dev/event#43 Contact Dashboard: fix Event Participations
eileen [Wed, 14 Oct 2020 01:51:04 +0000 (14:51 +1300)]
dev/core#2119 Fix mailig code to exclude deleted recipients
Tim Otten [Wed, 14 Oct 2020 00:29:29 +0000 (17:29 -0700)]
dev/core#2117 - scriptFile, styleFile - Automatically register URL aliases
This allows backward compatibility for customizations which targetted these
resources by their URL.
Tim Otten [Wed, 14 Oct 2020 01:24:47 +0000 (18:24 -0700)]
dev/core#2117 - Resources - Allow each snippet to have `aliases`
__Before__: Every snippet/resource has a singular name. If the name ever changes,
it becomes a backward-compatibility break.
__After__: Every snippet/resource has a singular name, and it may optionally
have a list of aliases. If the name ever changes, you can leave an alias
for backward-compatibility.
Mathieu Lutfy [Tue, 13 Oct 2020 19:51:58 +0000 (15:51 -0400)]
dev/event#43 Contact Dashboard: fix Event Participations
Seamus Lee [Tue, 13 Oct 2020 20:08:28 +0000 (07:08 +1100)]
Merge pull request #18753 from agh1/placeholderfix-5.31
dev/core#2118 supply better automatic placeholders for select (5.31 intra-rc)
Eileen McNaughton [Tue, 13 Oct 2020 20:03:35 +0000 (09:03 +1300)]
Merge pull request #18751 from demeritcowboy/utf8convert-triggers
Rebuild triggers after utf8mb4 conversion
Andrew Hunt [Tue, 13 Oct 2020 16:15:38 +0000 (12:15 -0400)]
dev/core#2118 supply better automatic placeholders for select
demeritcowboy [Tue, 13 Oct 2020 15:14:39 +0000 (11:14 -0400)]
rebuild triggers after utf8mb4 conversion
colemanw [Tue, 13 Oct 2020 15:14:15 +0000 (11:14 -0400)]
Merge pull request #18721 from artfulrobot/artfulrobot-relcache-utf8
Remove explicit COLLATE utf8_bin from RelationshipCache trigger
Rich Lott / Artful Robot [Tue, 13 Oct 2020 09:39:35 +0000 (10:39 +0100)]
Replace hard-coded utf8_bin with binary in-use collation
colemanw [Sat, 10 Oct 2020 15:39:01 +0000 (11:39 -0400)]
Merge pull request #18717 from eileenmcnaughton/static2
dev/core#2108 fix deprecation notice take 2
colemanw [Sat, 10 Oct 2020 15:33:42 +0000 (11:33 -0400)]
Merge pull request #18713 from eileenmcnaughton/531
dev/core#2102 Fix hang on event edit
Seamus Lee [Fri, 9 Oct 2020 23:22:35 +0000 (10:22 +1100)]
Merge pull request #18723 from colemanw/crmSearchCleanup
Search ext: misc cleanup & fixes
Coleman Watts [Fri, 9 Oct 2020 21:12:57 +0000 (17:12 -0400)]
Search ext: Ensure all entities have titlePlural to fix sort/display
Eileen McNaughton [Fri, 9 Oct 2020 20:56:04 +0000 (09:56 +1300)]
Merge pull request #18719 from JMAConsulting/core_2105
core#2105: Groups children now get shown with SPAN CSS error
colemanw [Fri, 9 Oct 2020 20:55:54 +0000 (16:55 -0400)]
Merge pull request #18716 from eileenmcnaughton/static
dev/core#2108 fix deprecation notice
Coleman Watts [Fri, 9 Oct 2020 20:44:06 +0000 (16:44 -0400)]
Search ext: misc cleanup & fixes
- Fixes white on white button text by adding btn-default class
- Fixes missing field names in the bulk-update action
- Decouples searchActions from the main search controller
- Misc cleanup
Monish Deb [Fri, 9 Oct 2020 04:23:04 +0000 (09:53 +0530)]
core#2105: Groups children now get shown with SPAN CSS error
eileen [Fri, 9 Oct 2020 03:43:34 +0000 (16:43 +1300)]
dev/core#2108 fix deprecation notice take 2
Loosens the deprecation notice - alternative to https://github.com/civicrm/civicrm-core/pull/18716 but
we should merge both IMHO
eileen [Fri, 9 Oct 2020 03:36:39 +0000 (16:36 +1300)]
dev/core#2108 fix deprecation notice
This addresses the deprecation warning by moving the text to the tpl layer - we could ease up
on the deprecation for type = 'static' but the pattern didn't seem to make much sense or to be
consistent with how we normally do things
eileen [Thu, 8 Oct 2020 20:57:45 +0000 (09:57 +1300)]
dev/core#2102 Fix hang on event edit
Per https://lab.civicrm.org/dev/core/-/issues/2102
CiviCRM [Thu, 8 Oct 2020 09:44:07 +0000 (09:44 +0000)]
Set version to 5.31.beta1
Tim Otten [Thu, 8 Oct 2020 08:42:39 +0000 (01:42 -0700)]
Merge pull request #18710 from eileenmcnaughton/locev2
dev/core#2096 Fix in-master-only regression on creating new events
Seamus Lee [Thu, 8 Oct 2020 05:18:29 +0000 (16:18 +1100)]
Merge pull request #18708 from eileenmcnaughton/locev
Add unit test that ultimately failed to hit the desired code but does add cover
Seamus Lee [Thu, 8 Oct 2020 05:17:23 +0000 (16:17 +1100)]
Merge pull request #18711 from seamuslee001/move_to_alpha1_stage
Move to alpha1 stage
Seamus Lee [Thu, 8 Oct 2020 02:20:23 +0000 (13:20 +1100)]
[REF] Move recently added upgrade steps from 5.31.0 to 5.31.alpha1 step
eileen [Thu, 8 Oct 2020 02:19:08 +0000 (15:19 +1300)]
dev/core#2096 Fix in-master-only regression on creating new events
Seamus Lee [Thu, 8 Oct 2020 01:49:36 +0000 (12:49 +1100)]
[NFC] Regen after #18624
eileen [Thu, 8 Oct 2020 01:48:23 +0000 (14:48 +1300)]
Add unit test that ultimately failed to hit the desired code but does add cover
Seamus Lee [Thu, 8 Oct 2020 01:47:45 +0000 (12:47 +1100)]
Merge pull request #18624 from compucorp/CATL-1613-skip-non-case-email
Add options to Mail Account settings to improve inbound mail processing
Eileen McNaughton [Thu, 8 Oct 2020 01:33:38 +0000 (14:33 +1300)]
Merge pull request #18360 from colemanw/fixMultiInProfile
Fix way of identityfing custom serialized fields
Seamus Lee [Thu, 8 Oct 2020 01:02:44 +0000 (12:02 +1100)]
Merge pull request #18324 from mattwire/payproc_configoptional
Display url_site and url_recur based on if the form elements exist
Seamus Lee [Thu, 8 Oct 2020 01:00:41 +0000 (12:00 +1100)]
Merge pull request #18701 from eileenmcnaughton/leak7
dev/core#2073 Fix use of legacy leaky method in tested code
Eileen McNaughton [Thu, 8 Oct 2020 00:58:59 +0000 (13:58 +1300)]
Merge pull request #18707 from eileenmcnaughton/notice
Enotice fix
Seamus Lee [Thu, 8 Oct 2020 00:27:51 +0000 (11:27 +1100)]
Merge pull request #18702 from eileenmcnaughton/leak8
dev/core#2073 Fix use of legacy leaky method in tested code
Seamus Lee [Thu, 8 Oct 2020 00:23:25 +0000 (11:23 +1100)]
Merge pull request #18704 from mlutfy/partListingOutput
ParticipantListing Report: only display the View link for web, unhardcode others
Eileen McNaughton [Wed, 7 Oct 2020 23:46:52 +0000 (12:46 +1300)]
Merge pull request #18699 from eileenmcnaughton/leak5
dev/core#2073 Fix use of legacy leaky method in tested code
Eileen McNaughton [Wed, 7 Oct 2020 23:46:06 +0000 (12:46 +1300)]
Merge pull request #18493 from mlutfy/campaignReportDefaults
Fix default report permissions when creating reports from CiviCampaign
eileen [Wed, 7 Oct 2020 23:44:20 +0000 (12:44 +1300)]
Enotice fix
Eileen McNaughton [Wed, 7 Oct 2020 23:11:03 +0000 (12:11 +1300)]
Merge pull request #18706 from civicrm/5.30
5.30
Eileen McNaughton [Wed, 7 Oct 2020 23:10:47 +0000 (12:10 +1300)]
Merge pull request #18680 from eileenmcnaughton/x
dev/financial#151 Paypal express validation fix on event
Seamus Lee [Wed, 7 Oct 2020 23:06:32 +0000 (10:06 +1100)]
Merge pull request #18705 from agh1/5.30.0-releasenotes-final
5.30.0 release notes: updated with late changes
Seamus Lee [Wed, 7 Oct 2020 22:34:16 +0000 (09:34 +1100)]
Merge pull request #18700 from eileenmcnaughton/leak6
dev/core#2073 Fix use of legacy leaky method in tested code
Seamus Lee [Wed, 7 Oct 2020 22:21:32 +0000 (09:21 +1100)]
Merge pull request #18698 from seamuslee001/test_dev_core_2053
[NFC] dev/core#2053 Extend nextedGroup test to show that it will retu…
Andrew Hunt [Wed, 7 Oct 2020 22:10:04 +0000 (18:10 -0400)]
5.30.0 release notes: updated with late changes
eileen [Wed, 7 Oct 2020 20:14:44 +0000 (09:14 +1300)]
dev/core#2073 Fix use of legacy leaky method in tested code
This is too low volume to really leak but it uses the leaky legacy method and
has test cover in
CRM_Contact_Import_Form_MapFieldTest.testSubmit with data set basic_data
CRM_Contact_Import_Form_MapFieldTest.testSubmit with data set save_mapping
Mathieu Lutfy [Wed, 7 Oct 2020 21:33:09 +0000 (17:33 -0400)]
ParticipantListing Report: only display the View link for web, unhardcode others
colemanw [Wed, 7 Oct 2020 21:26:56 +0000 (17:26 -0400)]
Merge pull request #18654 from eileenmcnaughton/token1
dev/core#2079 [REF] Fix some more calls to getTokens to make it clear only the first return value is used
colemanw [Wed, 7 Oct 2020 21:26:04 +0000 (17:26 -0400)]
Merge pull request #18653 from eileenmcnaughton/token
dev/core#2079 [Ref] Clarify calls to CRM_Utils_Token::getTokenDetails
eileen [Tue, 6 Oct 2020 21:35:31 +0000 (10:35 +1300)]
dev/financial#151 Paypal express validation fix on event
extension of https://github.com/civicrm/civicrm-core/pull/18459
eileen [Wed, 7 Oct 2020 20:48:00 +0000 (09:48 +1300)]
dev/core#2073 Fix use of legacy leaky method in tested code
Overview
----------------------------------------
Fix use of legacy leaky method in tested code
Before
----------------------------------------
After
----------------------------------------
Technical Details
----------------------------------------
Has test cover in
CRM_Member_Form_MembershipTest.testSubmitUpdateMembershipFromPartiallyPaid
CRM_Member_Form_MembershipTest.testMembershipViewContributionOwnerDifferent
Comments
----------------------------------------
eileen [Wed, 7 Oct 2020 20:37:26 +0000 (09:37 +1300)]
dev/core#2073 Fix use of legacy leaky method in tested code
Overview
----------------------------------------
Fix use of legacy leaky method in tested code
Before
----------------------------------------
dao->query()
After
----------------------------------------
CRM_Core_DAO::executeQuery()
Technical Details
----------------------------------------
This is too low volume to really leak but it uses the leaky legacy method and
has test cover in
CRM_Import_DataSource_CsvTest.testToCsv with data set #0
CRM_Import_DataSource_CsvTest.testToCsv with data set #1
----------------------------------------
eileen [Wed, 7 Oct 2020 20:22:22 +0000 (09:22 +1300)]
dev/core#2073 Fix use of legacy leaky method in tested code
Overview
----------------------------------------
Fix use of legacy leaky method in tested code
Before
----------------------------------------
dao->query()
After
----------------------------------------
CRM_Core_DAO::executeQuery()
Technical Details
----------------------------------------
This is too low volume to really leak but it uses the leaky legacy method and
has test cover in
CRM_Contact_Page_View_UserDashboard_GroupContactTest.testBrowseDisplaysCorrectListOfAddedGroups
CRM_Contact_Page_View_UserDashboard_GroupContactTest.testBrowseDisplaysCorrectListOfAVailableGroups
CRM_Contact_Page_View_UserDashBoardTest.testDashboardContentEmptyContact
CRM_Contact_Page_View_UserDashBoardTest.testDashboardContentContributionsWithInvoicingEnabled
CRM_Contact_Page_View_UserDashBoardTest.testDashboardContentContributions
----------------------------------------
Seamus Lee [Wed, 7 Oct 2020 19:58:03 +0000 (06:58 +1100)]
[NFC] dev/core#2053 Extend nextedGroup test to show that it will return child groups that are Mailing groups even when the parent isn't a mailing group
colemanw [Wed, 7 Oct 2020 19:15:53 +0000 (15:15 -0400)]
Merge pull request #18667 from eileenmcnaughton/uf
dev/core#2087 Remove extraneous CRM_Core_BAO_UFMatch::updateUFName call
Eileen McNaughton [Wed, 7 Oct 2020 19:15:15 +0000 (08:15 +1300)]
Merge pull request #18696 from colemanw/btnNoConflict
Greenwich - fix conflict btw bootstrap & jQuery UI button
colemanw [Wed, 7 Oct 2020 19:09:21 +0000 (15:09 -0400)]
Merge pull request #18556 from eileenmcnaughton/pcp
dev/core#2056 Only retrieve pcp & soft_credit info when needed
Eileen McNaughton [Wed, 7 Oct 2020 18:59:18 +0000 (07:59 +1300)]
Merge pull request #18695 from colemanw/ids
Exclude api4 from IDS check
colemanw [Wed, 7 Oct 2020 16:23:42 +0000 (12:23 -0400)]
Merge pull request #18500 from eileenmcnaughton/loc
dev/core#2047 [Ref] Remove obsolete check
colemanw [Wed, 7 Oct 2020 16:19:42 +0000 (12:19 -0400)]
Merge pull request #18650 from eileenmcnaughton/perms
Fix complexity on cache key
colemanw [Wed, 7 Oct 2020 13:47:34 +0000 (09:47 -0400)]
Merge pull request #18663 from eileenmcnaughton/blockdel3
dev/core#2039 Remove extraneous location queries from contact.create->Location::block path
colemanw [Wed, 7 Oct 2020 13:45:14 +0000 (09:45 -0400)]
Merge pull request #18662 from eileenmcnaughton/blockdel2
dev/core#2017 Deprecate an unused function
colemanw [Wed, 7 Oct 2020 13:42:28 +0000 (09:42 -0400)]
Merge pull request #18693 from eileenmcnaughton/leak4
dev/core#2073 Fix memory leak in well tested code
colemanw [Wed, 7 Oct 2020 13:40:29 +0000 (09:40 -0400)]
Merge pull request #18683 from colemanw/searchClause
Search ext & APIv4 Explorer: Refactor clause from directive to component
Coleman Watts [Wed, 7 Oct 2020 13:33:18 +0000 (09:33 -0400)]
Greenwich - fix conflict btw bootstrap & jQuery UI button
This calls noConflict on the Bootstrap3 $.fn.button() method, essentially getting rid of it,
as it is not used by CiviCRM, whereas the jQuery UI $.fn.button() is used.
If we needed the boostrap button function, we could rename it with something like:
`$.fn.btn = $.fn.button.noConflict();`
Coleman Watts [Wed, 7 Oct 2020 12:54:00 +0000 (08:54 -0400)]
Exclude api4 from IDS check
Coleman Watts [Wed, 7 Oct 2020 00:56:49 +0000 (20:56 -0400)]
Search ext & APIv4 Explorer: Refactor clause from directive to component
Improves compatibility with Angular 1.8; uses the more modern component system
with less coupling and cleaner interfaces.
colemanw [Wed, 7 Oct 2020 11:26:37 +0000 (07:26 -0400)]
Merge pull request #18140 from mattwire/removetimeoutpermlocation
Remove ajax timeout from contribution page on behalf of
Matthew Wire [Wed, 7 Oct 2020 10:40:00 +0000 (11:40 +0100)]
Merge pull request #18682 from eileenmcnaughton/add4
dev/core#2046 Fix api to call Address.create now it is standardised
Matthew Wire [Wed, 7 Oct 2020 09:22:53 +0000 (10:22 +0100)]
Merge pull request #18690 from seamuslee001/dev_translation_54
dev/translation#54 Ensure that Component titles are translated in lin…
Seamus Lee [Wed, 7 Oct 2020 08:22:59 +0000 (19:22 +1100)]
Merge pull request #18692 from eileenmcnaughton/leak1
dev/core#2073 Remove memory leak in heavily tested (merge) code
Ivan [Thu, 13 Aug 2020 15:40:01 +0000 (16:40 +0100)]
CATL-1613: Add new field to the mail account form - Skip emails which do not have a Case ID or Case token
Ivan [Mon, 17 Aug 2020 12:13:33 +0000 (13:13 +0100)]
CATL-1614: Add new field to the mail account form - Do not create new contacts when filing emails
Seamus Lee [Wed, 7 Oct 2020 07:45:05 +0000 (18:45 +1100)]
Merge pull request #18694 from seamuslee001/master
5.30
Seamus Lee [Wed, 7 Oct 2020 07:42:43 +0000 (18:42 +1100)]
Merge in 5.30
Eileen McNaughton [Wed, 7 Oct 2020 07:40:11 +0000 (20:40 +1300)]
Merge pull request #18689 from seamuslee001/nfc_dao_update
[NFC] Update Checksum on CustomField DAO
eileen [Wed, 7 Oct 2020 06:44:18 +0000 (19:44 +1300)]
dev/core#2073 Fix memory leak in well tested code
Example test
api_v3_ContactTest::testSortLimitChainedRelationshipGetCRM15983
Seamus Lee [Wed, 7 Oct 2020 05:52:51 +0000 (16:52 +1100)]
Merge pull request #18685 from seamuslee001/ab_test_fix
[REF] Fix error when creating new AB test mailing because domain_id i…
Seamus Lee [Wed, 7 Oct 2020 05:47:03 +0000 (16:47 +1100)]
dev/translation#54 Ensure that Component titles are translated in link text
Seamus Lee [Wed, 7 Oct 2020 05:42:25 +0000 (16:42 +1100)]
[NFC] Update Checksum on CustomField DAO
eileen [Wed, 7 Oct 2020 05:35:49 +0000 (18:35 +1300)]
dev/core#2073 Remove memory leak in heavily tested (merge) code
There are dozens of tests that pass through these lines - I used api_v3_JobTest:testBatchMerge to step through it
- note the dao->affectedRows uses a query to determine that - so it is no more or less accurate than before
Seamus Lee [Wed, 7 Oct 2020 04:24:53 +0000 (15:24 +1100)]
Merge pull request #18623 from eileenmcnaughton/rene
dev/core#1790 - Contact Card - Email Links
Seamus Lee [Wed, 7 Oct 2020 04:17:51 +0000 (15:17 +1100)]
[REF] Fix error when creating new AB test mailing because domain_id is a required field
Seamus Lee [Wed, 7 Oct 2020 03:54:55 +0000 (14:54 +1100)]
Merge pull request #18684 from eileenmcnaughton/block
dev/core#2039 Call del directly - rather than now-deprecated blockDelete
Eileen McNaughton [Wed, 7 Oct 2020 02:49:42 +0000 (15:49 +1300)]
Merge pull request #18672 from colemanw/searchKit
Search ext: rename to Search Kit, mark as beta
eileen [Wed, 7 Oct 2020 00:45:23 +0000 (13:45 +1300)]
dev/core#2046 Fix api to call Address.create now it is standardised
Switches api from calling Address.add to Address.create as part of BAO standardisation on create.
This has no material impact - just standardisation
eileen [Wed, 7 Oct 2020 01:05:46 +0000 (14:05 +1300)]
dev/core#2039 Call del directly - rather than now-deprecated blockDelete
blockDelete is now just wrapper for del so this is really NFC