Tim Otten [Tue, 13 Oct 2020 22:01:52 +0000 (15:01 -0700)]
Merge pull request #18754 from colemanw/angularPerms
Angular Loader: Allow modules to specify permissions to add client-side
Eileen McNaughton [Tue, 13 Oct 2020 20:04:00 +0000 (09:04 +1300)]
Merge pull request #18756 from civicrm/5.31
5.31 to master
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
Eileen McNaughton [Tue, 13 Oct 2020 19:14:33 +0000 (08:14 +1300)]
Merge pull request #18750 from eileenmcnaughton/weird
Extract setNextUrl
Coleman Watts [Tue, 13 Oct 2020 12:52:34 +0000 (08:52 -0400)]
Angular Loader: Allow modules to specify permissions to add client-side
colemanw [Tue, 13 Oct 2020 16:37:40 +0000 (12:37 -0400)]
Merge pull request #18749 from totten/master-crmMailing-factory
crmMailing - Only load Angular settings if they're needed
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
Tim Otten [Tue, 13 Oct 2020 02:53:27 +0000 (19:53 -0700)]
CRM_Mailing_Info - Init Angular data via `settingsFactory` instead of `settings`
Tim Otten [Tue, 13 Oct 2020 02:52:09 +0000 (19:52 -0700)]
CRM_Mailing_Info - Extract method 'createAngularSettings()'
colemanw [Tue, 13 Oct 2020 12:04:56 +0000 (08:04 -0400)]
Merge pull request #18731 from colemanw/angularSettingsFactory
AngularLoader: Support 'settingsFactory' callbacks in angular modules.
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
eileen [Tue, 13 Oct 2020 07:05:59 +0000 (20:05 +1300)]
Extract setNextUrl
This code is repeated all over the task sub system. This is a first attempt to
extract it on the parent class in order to start consolidating it
Eileen McNaughton [Tue, 13 Oct 2020 02:07:05 +0000 (15:07 +1300)]
Merge pull request #18747 from eileenmcnaughton/aip2
[REF] Replace long if block with early return
eileen [Mon, 12 Oct 2020 23:41:28 +0000 (12:41 +1300)]
[REF] Replace long if block with early return
Seamus Lee [Mon, 12 Oct 2020 23:08:20 +0000 (10:08 +1100)]
Merge pull request #18744 from eileenmcnaughton/aip
dev/financial#152 simplify passed parameters
Eileen McNaughton [Mon, 12 Oct 2020 22:26:01 +0000 (11:26 +1300)]
Merge pull request #18743 from vingle/patch-9
More accurate language around social media sharing
eileen [Mon, 12 Oct 2020 20:33:08 +0000 (09:33 +1300)]
dev/financial#152 simplify passed parameters
Rather than passing objects this switches to specifically passing the 2 objects being used in
the recur function
Seamus Lee [Mon, 12 Oct 2020 20:27:41 +0000 (07:27 +1100)]
Merge pull request #18742 from jitendrapurohit/merge-uid
Fix main contact uf url on merge screen
Matthew Wire [Mon, 12 Oct 2020 20:12:45 +0000 (21:12 +0100)]
Merge pull request #18738 from eileenmcnaughton/lines
dev/core#2115 remove reference to financialACLs in bounce
Matthew Wire [Mon, 12 Oct 2020 20:11:44 +0000 (21:11 +0100)]
Merge pull request #18735 from eileenmcnaughton/aipn
dev/financial#152 simplify interaction with membership, deprecate function
Matthew Wire [Mon, 12 Oct 2020 20:07:37 +0000 (21:07 +0100)]
Merge pull request #18736 from eileenmcnaughton/pp
dev/financial#152 simplify passed parameters
Monish Deb [Mon, 12 Oct 2020 17:01:39 +0000 (22:31 +0530)]
Merge pull request #18668 from eileenmcnaughton/no_opt
dev/core#2079 Eliminate unused query on CRM_Core_BAO_CustomQuery::_construct
Monish Deb [Mon, 12 Oct 2020 16:04:30 +0000 (21:34 +0530)]
Merge pull request #18589 from eileenmcnaughton/ex_class
[REF] Separate export form classes out & simplify task handling
Nicol [Mon, 12 Oct 2020 14:42:23 +0000 (16:42 +0200)]
Change in language
Change in language to be more accurate, in relation to this issue: https://lab.civicrm.org/dev/user-interface/-/issues/21#note_48976.
Nicol [Mon, 12 Oct 2020 14:39:34 +0000 (16:39 +0200)]
Update Petition.php
Change in language to be more accurate, in relation to this issue: https://lab.civicrm.org/dev/user-interface/-/issues/21#note_48976.
Monish Deb [Mon, 12 Oct 2020 14:39:12 +0000 (20:09 +0530)]
Merge pull request #18555 from eileenmcnaughton/del_primary
dev/core#2047 Fix merge code so that deleted contacts are not left without a primary address
Nicol [Mon, 12 Oct 2020 14:34:38 +0000 (16:34 +0200)]
Update Settings.php
Change in language to be more accurate, in relation to this issue: https://lab.civicrm.org/dev/user-interface/-/issues/21#note_48976.
Jitendra Purohit [Mon, 12 Oct 2020 11:36:20 +0000 (17:06 +0530)]
Fix main contact uf url on merge screen
eileen [Tue, 22 Sep 2020 02:43:29 +0000 (14:43 +1200)]
dev/core#2039 Fix merge code so that deleted contacts are not left without a primary address
This was picked up in tests to ensure that removing a line of code creating excessing queries
would not cause regressions.
https://lab.civicrm.org/dev/core/-/issues/2039
I considered altering the test to exclude deleted contacts but we run the risk that if a contact
is undeleted they will have no primary address so I figured the integrity makes sense.
Note there are a couple of queries in this code that can go (retrieving stuff
we already have) - depending how I go on getting review on this & related tidy up I'll remove them
in a later PR
Coleman Watts [Sat, 10 Oct 2020 20:58:17 +0000 (16:58 -0400)]
AngularLoader: Support 'settingsFactory' callbacks in angular modules.
This allows Angular modules with complex/expensive data to provide it with a callback,
which will only be invoked if the module is actively loaded on the page.
Normally, module settings are calculated on every page request, even if they are not needed.
Eileen McNaughton [Sun, 11 Oct 2020 23:03:34 +0000 (12:03 +1300)]
Merge pull request #18737 from eileenmcnaughton/ppp
dev/financial#152 remove unused parameter
eileen [Sun, 11 Oct 2020 21:57:04 +0000 (10:57 +1300)]
dev/core#2115 remove reference to financialACLs in bounce
I believe that the other 2 criteria suffice. allMembershipDetails is built from
CRM_Member_BAO_Membership::buildMembershipTypeValues() which is altered by
financial acls but also potentially by other extensions so I don't think the bounce
should be restricted to when financial acls are in play
eileen [Sun, 11 Oct 2020 21:15:28 +0000 (10:15 +1300)]
dev/financial#152 remove unused parameter
eileen [Sun, 11 Oct 2020 21:07:40 +0000 (10:07 +1300)]
dev/financial#152 simplify passed parameters
the function now only requires so this simplifies so it only receives that
eileen [Sun, 11 Oct 2020 20:36:18 +0000 (09:36 +1300)]
dev/financial#152 simplify interaction with membership, deprecate function
ids['membership'] is only calculated in the Authorize.net IPN flow for the purpose of determining
the autoRenew membership parameter for recurringNotify. This is currently passed to sendRecurringStartOrEndNotification
but that does not add any simplification & cannot be used elsewhere - so deprecating.
This is tested in testIPNPaymentMembershipRecurSuccessNoLeakage
Matthew Wire [Sun, 11 Oct 2020 09:31:18 +0000 (10:31 +0100)]
Merge pull request #18651 from eileenmcnaughton/cf
[REF] Minor simplification - don't use a variable for table name
Matthew Wire [Sun, 11 Oct 2020 09:30:08 +0000 (10:30 +0100)]
Merge pull request #18728 from eileenmcnaughton/aip
dev/financial#152 Pass contribution directly to completeOrder
Matthew Wire [Sun, 11 Oct 2020 09:28:50 +0000 (10:28 +0100)]
Merge pull request #18733 from eileenmcnaughton/aipn
dev/financial#152 [REF] Extract getMembershipID
Matthew Wire [Sun, 11 Oct 2020 09:28:01 +0000 (10:28 +0100)]
Merge pull request #18734 from eileenmcnaughton/ppp
dev/financial#152 Remove unreachable code
Seamus Lee [Sun, 11 Oct 2020 02:37:10 +0000 (13:37 +1100)]
Merge pull request #18727 from colemanw/entityTest
[Test] Ensure all APIv4 entities have basic info
eileen [Sun, 11 Oct 2020 00:36:19 +0000 (13:36 +1300)]
dev/financial#152 Remove unreachable code
This code cann only be reached if txnType is recurring_payment. Given that we can look
at the earlier switch and see that in that case first must be TRUE or it would have
already returned. Ergo this code is unreachable - and would have been
since the earlier code switched to using the api to handle non-firsts
Seamus Lee [Sun, 11 Oct 2020 00:07:23 +0000 (11:07 +1100)]
Merge pull request #18732 from eileenmcnaughton/fail
dev/financial#152 Remove unused parameters from BaseIPN->failed signature
eileen [Sat, 10 Oct 2020 23:30:36 +0000 (12:30 +1300)]
dev/financial#152 [REF] Extract getMembershipID
Note that since NULL is valid we can just return the result of the query. Bypassing for
component=event doesn't provide enough value to justify relying on a url param
as opposed to just looking it up & feels very original-form-flow
Seamus Lee [Sat, 10 Oct 2020 23:20:49 +0000 (10:20 +1100)]
Merge pull request #18730 from eileenmcnaughton/pp
dev/financial#152 Remove unused parameters from BaseIPN->cancelled signature
Eileen McNaughton [Sat, 10 Oct 2020 22:37:07 +0000 (11:37 +1300)]
Merge pull request #18729 from eileenmcnaughton/aipn
dev/financial#152 Clean up & test contributionPageID handling
eileen [Sat, 10 Oct 2020 21:54:36 +0000 (10:54 +1300)]
dev/financial#152 Remove unused parameters from BaseIPN->failed signature
Same as https://github.com/civicrm/civicrm-core/pull/18730 but for failed
Coleman Watts [Sat, 10 Oct 2020 15:15:45 +0000 (11:15 -0400)]
Test: Ensure all APIv4 entities have basic info
eileen [Sat, 10 Oct 2020 21:20:33 +0000 (10:20 +1300)]
Remove unused parameters from BaseIPN->cancelled signature
eileen [Sat, 10 Oct 2020 20:32:12 +0000 (09:32 +1300)]
dev/financial#152 Clean up & test contributionPageID handling
Seamus Lee [Sat, 10 Oct 2020 20:30:54 +0000 (07:30 +1100)]
Merge pull request #18726 from demeritcowboy/static-pdfformat
dev/core#2110 - Warning "Non-static method CRM_Contact_Page_AJAX::pdfFormat() should not be called statically" when changing the page format on print/merge document
eileen [Sat, 10 Oct 2020 19:53:45 +0000 (08:53 +1300)]
dev/financial#152 Pass contribution directly to completeOrder
We have done quite a a bit of cleanup on this and the only value in objects now used is
contribution - this is really explict in the code as we actually unset objects after
extracting contribution.
This alters the function signature such that it receives contribution directly rather than
in an array
colemanw [Sat, 10 Oct 2020 19:39:33 +0000 (15:39 -0400)]
Merge pull request #18631 from eileenmcnaughton/ppp
dev/financial#152 [REF] Parse ids before sending to single function (minor simplification)
colemanw [Sat, 10 Oct 2020 19:38:26 +0000 (15:38 -0400)]
Merge pull request #18629 from eileenmcnaughton/aipn
dev/financial#152 [REF] Parse ids before sending to recur function (minor simplification)
Eileen McNaughton [Sat, 10 Oct 2020 19:14:35 +0000 (08:14 +1300)]
Merge pull request #17969 from seamuslee001/widget_normal_route
dev/cloud-native#16 Migrate Contribution Page widget extern url to us…
colemanw [Sat, 10 Oct 2020 18:11:24 +0000 (14:11 -0400)]
Merge pull request #18725 from civicrm/5.31
5.31
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
demeritcowboy [Sat, 10 Oct 2020 13:32:26 +0000 (09:32 -0400)]
make routing endpoint static
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
Seamus Lee [Mon, 27 Jul 2020 01:53:58 +0000 (11:53 +1000)]
dev/cloud-native#16 Migrate Contribution Page widget extern url to use the normal CMS routing mechanism
Update test to test both endpoints
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
colemanw [Fri, 9 Oct 2020 20:40:57 +0000 (16:40 -0400)]
Merge pull request #18720 from artfulrobot/artfulrobot-core-issue-1428
dev/core#1428 Add test for Activity::update()
Seamus Lee [Fri, 9 Oct 2020 09:03:23 +0000 (20:03 +1100)]
Merge pull request #18715 from seamuslee001/dev_financial_11
dev/financial#11 Expand unit test to ensure that the correct currency…
Rich Lott / Artful Robot [Fri, 9 Oct 2020 08:26:27 +0000 (09:26 +0100)]
Add test for Activity::update()
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
Seamus Lee [Fri, 9 Oct 2020 00:54:23 +0000 (11:54 +1100)]
Merge pull request #18714 from MegaphoneJon/financial-111
Financial#111: Contribution tokens always display amount with default…
Seamus Lee [Fri, 9 Oct 2020 00:51:06 +0000 (11:51 +1100)]
dev/financial#11 Expand unit test to ensure that the correct currency is outputted in the token
Eileen McNaughton [Fri, 9 Oct 2020 00:46:32 +0000 (13:46 +1300)]
Merge pull request #18688 from seamuslee001/dompdf_upgrade
[REF] Upgrade DomPDF to v0.8.6
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
Jon Goldberg [Thu, 8 Oct 2020 21:20:32 +0000 (17:20 -0400)]
Financial#111: Contribution tokens always display amount with default currency
CiviCRM [Thu, 8 Oct 2020 09:45:03 +0000 (09:45 +0000)]
Set version to 5.32.alpha1
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 [Wed, 7 Oct 2020 04:52:37 +0000 (15:52 +1100)]
[REF] Upgrade DomPDF to v0.8.6
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