Tim Otten [Wed, 21 Oct 2020 00:45:34 +0000 (17:45 -0700)]
Merge pull request #18811 from colemanw/savedSearchIndex
SavedSearch: add UI_name index to upgrade script
Seamus Lee [Tue, 20 Oct 2020 22:27:57 +0000 (09:27 +1100)]
Merge pull request #18786 from eileenmcnaughton/cancelextwtest
dev/core#927 add first test on cancel
Coleman Watts [Tue, 20 Oct 2020 21:19:57 +0000 (17:19 -0400)]
SavedSearch: add UI_name index to upgrade script
Seamus Lee [Tue, 20 Oct 2020 20:21:38 +0000 (07:21 +1100)]
Merge pull request #18806 from eileenmcnaughton/constant
Update CRM_Utils_Constant::value to support env variables
Seamus Lee [Tue, 20 Oct 2020 19:51:32 +0000 (06:51 +1100)]
Merge pull request #18804 from eileenmcnaughton/manual
Declare support for cancelRecurring in manual processor
eileen [Fri, 16 Oct 2020 06:11:41 +0000 (19:11 +1300)]
Add initial test to the new extension
I made a small change to support the test - causing Membership.create not to set the
stattus_id if it is specified.
Seamus Lee [Tue, 20 Oct 2020 19:50:50 +0000 (06:50 +1100)]
Merge pull request #18803 from eileenmcnaughton/canceltest
Remove always-true IF
Eileen McNaughton [Tue, 20 Oct 2020 19:48:59 +0000 (08:48 +1300)]
Merge pull request #18784 from eileenmcnaughton/cancelext
dev/core#927 Add shell extension to move contribution cancel actions into
Eileen McNaughton [Tue, 20 Oct 2020 19:39:01 +0000 (08:39 +1300)]
Merge pull request #18809 from colemanw/savedSearchName
SavedSearch - Add name and label columns
Coleman Watts [Tue, 20 Oct 2020 13:39:02 +0000 (09:39 -0400)]
SavedSearch - Add name and label columns
eileen [Tue, 20 Oct 2020 02:27:00 +0000 (15:27 +1300)]
Update CRM_Utils_Constant::value to support env variables
This is something I discussed with @totten earlier but as the rc was being cut at the time
we went for the more conservative approach of only adding env support to thhe debug_query
function. This extends to all defines - meaning they can be defined at the script level e.
env CIVICRM_DEBUG_LOG_QUERY=backtrace drush cvapi
(that already works)
Eileen McNaughton [Tue, 20 Oct 2020 02:55:34 +0000 (15:55 +1300)]
Merge pull request #18645 from seamuslee001/frontend_group
Display public title and description on profiles and unsubscribe/subs…
eileen [Tue, 20 Oct 2020 00:52:48 +0000 (13:52 +1300)]
Declare support for cancelRecurring in manual processor
Reviewer's partial from https://github.com/civicrm/civicrm-core/pull/18196
eileen [Tue, 20 Oct 2020 00:47:18 +0000 (13:47 +1300)]
Remove always-true IF
As can be seen by searching for calls to recurLinks recurID is not
an optional parameter for the call - so the IF is extraneous.
I've updated almost all the places that call it to
pass strict-type-casted int (or in one place ensured it already is)
as a bit of 'tightening'
Seamus Lee [Tue, 20 Oct 2020 00:35:36 +0000 (11:35 +1100)]
Merge pull request #18801 from eileenmcnaughton/canceltest
Remove always true if
eileen [Mon, 19 Oct 2020 19:24:56 +0000 (08:24 +1300)]
Remove always true if
Since paymentProcessorObj is loaded as the manual processor where another does not exist
the processor condition is always true - so this if is obsolete
Eileen McNaughton [Mon, 19 Oct 2020 19:21:45 +0000 (08:21 +1300)]
Merge pull request #18790 from eileenmcnaughton/canceltest
Add test for recurring links and clean up method of retrieving recurring
Eileen McNaughton [Mon, 19 Oct 2020 19:21:15 +0000 (08:21 +1300)]
Merge pull request #18798 from eileenmcnaughton/memtest
Replace BAO calls with api calls in test class
Eileen McNaughton [Mon, 19 Oct 2020 19:20:55 +0000 (08:20 +1300)]
Merge pull request #18797 from eileenmcnaughton/apim
Switch to calling api
colemanw [Mon, 19 Oct 2020 11:55:58 +0000 (07:55 -0400)]
Merge pull request #18796 from eileenmcnaughton/api3
Switch to calling the api
Matthew Wire [Mon, 19 Oct 2020 09:40:22 +0000 (10:40 +0100)]
Merge pull request #18785 from eileenmcnaughton/status
unit test for #18306 - order create api test for contribution
Matthew Wire [Mon, 19 Oct 2020 09:36:54 +0000 (10:36 +0100)]
Merge pull request #18789 from jitendrapurohit/emailcc
Fix sendconfirmation api to override receipt params
eileen [Mon, 19 Oct 2020 08:10:24 +0000 (21:10 +1300)]
Replace BAO calls with api calls in test class
Seamus Lee [Mon, 19 Oct 2020 07:21:17 +0000 (18:21 +1100)]
Merge pull request #18795 from eileenmcnaughton/api
[Test] - Fix some tests to call API not BAO
eileen [Mon, 19 Oct 2020 07:18:12 +0000 (20:18 +1300)]
Switch to calling api
Test cover in
CRM_Member_BAO_MembershipTest::testMembershipUpdateDoesNotDeleteRelatedMembershipsByMistake
Eileen McNaughton [Mon, 19 Oct 2020 07:04:24 +0000 (20:04 +1300)]
Merge pull request #18791 from eileenmcnaughton/statusm
Remove instances of variable variables
eileen [Mon, 19 Oct 2020 06:48:45 +0000 (19:48 +1300)]
Switch to calling the api
Test cover in
api_v3_ContactTest.testMergeOrganizations
Eileen McNaughton [Mon, 19 Oct 2020 06:08:35 +0000 (19:08 +1300)]
Merge pull request #18739 from eileenmcnaughton/ef
[Ref] Minor code extraction
eileen [Sun, 18 Oct 2020 23:14:53 +0000 (12:14 +1300)]
Add test for recurring links and clean up method of retrieving recurring
eileen [Mon, 19 Oct 2020 04:56:12 +0000 (17:56 +1300)]
[Test] - Fix some tests to call API not BAO
eileen [Mon, 19 Oct 2020 01:42:09 +0000 (14:42 +1300)]
Remove instances of variable variables
Minor code readability tidy up covered by EntryTest:testProcessMembership
Jitendra Purohit [Sun, 11 Oct 2020 13:40:04 +0000 (19:10 +0530)]
Fix sendconfirmation api to respect cc and bcc set in params
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 03:35:33 +0000 (16:35 +1300)]
dev/core#927 Add shell extension to move contribution cancel actions into
Jitendra Purohit [Wed, 7 Oct 2020 11:49:37 +0000 (17:19 +0530)]
unit test for #18306 - order create api test for contribution
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