eileen [Mon, 19 Oct 2020 04:56:12 +0000 (17:56 +1300)]
[Test] - Fix some tests to call API not BAO
Eileen McNaughton [Sat, 17 Oct 2020 05:42:14 +0000 (18:42 +1300)]
Merge pull request #18788 from civicrm/5.31
5.31
Seamus Lee [Sat, 17 Oct 2020 01:44:35 +0000 (12:44 +1100)]
Merge pull request #18540 from eileenmcnaughton/paypal
dev/core#2034 Fix paypal standard cancel url
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
Monish Deb [Fri, 16 Oct 2020 12:14:07 +0000 (17:44 +0530)]
Merge pull request #18773 from eileenmcnaughton/url
dev/core#2066 Use shared function to set the next url
Monish Deb [Fri, 16 Oct 2020 12:12:00 +0000 (17:42 +0530)]
Merge pull request #18783 from eileenmcnaughton/distinct
dev/core#2066 Further cleanup on search actions
eileen [Fri, 16 Oct 2020 01:59:42 +0000 (14:59 +1300)]
dev/core#2066 Further cleanup on search actions
Most of the noise is in the shared pre-process code so my focus is on paring that down
Eileen McNaughton [Thu, 15 Oct 2020 23:52:29 +0000 (12:52 +1300)]
Merge pull request #17568 from agileware/CIVICRM-1496
Contribution confirmation page should not display the name of payment processor type
Eileen McNaughton [Thu, 15 Oct 2020 22:12:53 +0000 (11:12 +1300)]
Merge pull request #18778 from colemanw/plurals
Fix pluralize function for words like 'display'
Coleman Watts [Thu, 15 Oct 2020 13:26:06 +0000 (09:26 -0400)]
Fix pluralize function for words like 'display'
Eileen McNaughton [Thu, 15 Oct 2020 07:47:46 +0000 (20:47 +1300)]
Merge pull request #18777 from civicrm/5.31
5.31
Pengyi Zhang [Wed, 10 Jun 2020 05:52:21 +0000 (15:52 +1000)]
CIVICRM-1496 Reword text on the contribution confirmation page
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…
Eileen McNaughton [Thu, 15 Oct 2020 03:59:23 +0000 (16:59 +1300)]
Merge pull request #18775 from colemanw/searchRefactor
[REF] Search ext: Reorganize code into modules
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 23:44:39 +0000 (12:44 +1300)]
Merge pull request #18411 from MegaphoneJon/pcp-wysiwyg
CRM-9362: PCP 'Your Message' should use WYSIWYG
Seamus Lee [Wed, 14 Oct 2020 23:41:28 +0000 (10:41 +1100)]
Merge pull request #18400 from aydun/class_api_tweak_2
class.api.php: In remote api calls, allow referer and useragent to be set.
Eileen McNaughton [Wed, 14 Oct 2020 22:40:53 +0000 (11:40 +1300)]
Merge pull request #18774 from civicrm/5.31
5.31 to master
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 19:56:25 +0000 (06:56 +1100)]
Merge pull request #18761 from MegaphoneJon/event43-test
Test for event#43
eileen [Wed, 14 Oct 2020 19:55:57 +0000 (08:55 +1300)]
dev/core#2066 Use shared function to set the next url
Extends https://github.com/civicrm/civicrm-core/pull/18767 to more places
Coleman Watts [Wed, 14 Oct 2020 19:53:34 +0000 (15:53 -0400)]
Search ext: Support is_deleted field but not api_key or hash
Coleman Watts [Tue, 13 Oct 2020 21:47:38 +0000 (17:47 -0400)]
Search ext: Add settingsCallback to searchAdmin module
Coleman Watts [Tue, 13 Oct 2020 15:54:36 +0000 (11:54 -0400)]
Search ext: Reorganize into searchAdmin and searchActions modules
Eileen McNaughton [Wed, 14 Oct 2020 09:48:33 +0000 (22:48 +1300)]
Merge pull request #18770 from civicrm/5.31
5.31
Matthew Wire [Wed, 14 Oct 2020 09:38:41 +0000 (10:38 +0100)]
Merge pull request #18768 from eileenmcnaughton/ids
dev/core#2066 Extract getSelectedIDs
Matthew Wire [Wed, 14 Oct 2020 09:37:50 +0000 (10:37 +0100)]
Merge pull request #18767 from eileenmcnaughton/task
dev/core#2066 Use shared function to set the next url
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
Seamus Lee [Wed, 14 Oct 2020 09:06:05 +0000 (20:06 +1100)]
Merge pull request #18449 from colemanw/multiValueAutocomplete
Allow custom fields of type Autocomplete-Select to be multivalued
Seamus Lee [Wed, 14 Oct 2020 08:59:09 +0000 (19:59 +1100)]
Merge pull request #18764 from civicrm/5.31
5.31
Seamus Lee [Wed, 14 Oct 2020 08:58:27 +0000 (19:58 +1100)]
Merge pull request #18581 from demeritcowboy/requirements-check
dev/drupal#137 - Alternate PR - On drupal status report need different check when civi is already installed
eileen [Wed, 14 Oct 2020 04:19:22 +0000 (17:19 +1300)]
dev/core#2066 Extract getSelectedIDs
eileen [Wed, 14 Oct 2020 04:09:07 +0000 (17:09 +1300)]
dev/core#2066 Use shared function to set the next url
Reduces copy & paste - there are some more places like this to sort out after ....
eileen [Wed, 14 Oct 2020 03:41:19 +0000 (16:41 +1300)]
Fix unreleased regression on search tasks from basic search
Jon Goldberg [Tue, 13 Oct 2020 23:10:25 +0000 (19:10 -0400)]
Test for event#43
Seamus Lee [Wed, 14 Oct 2020 01:59:46 +0000 (12:59 +1100)]
Merge pull request #18762 from demeritcowboy/all-ALL
Typo in call to fixSchemaDifferencesForAll
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.
demeritcowboy [Tue, 13 Oct 2020 23:21:01 +0000 (19:21 -0400)]
make sure we're `all` on the same page
Eileen McNaughton [Tue, 13 Oct 2020 23:07:09 +0000 (12:07 +1300)]
Merge pull request #18757 from civicrm/5.31
5.31
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
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: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
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
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…