Matthew Wire [Sat, 5 Dec 2020 15:26:17 +0000 (15:26 +0000)]
Fix extensions tabs following deprecation of old tab code
Eileen McNaughton [Fri, 4 Dec 2020 20:40:44 +0000 (09:40 +1300)]
Merge pull request #19061 from christianwach/lab-core-2217
Prevent "add_action" from being called multiple times
colemanw [Fri, 4 Dec 2020 19:54:19 +0000 (14:54 -0500)]
Merge pull request #19083 from eileenmcnaughton/contsoft
Add ContributionSoft v4 api
Seamus Lee [Fri, 4 Dec 2020 19:40:52 +0000 (06:40 +1100)]
Merge pull request #19103 from eileenmcnaughton/import_extract
[REF] Extract duplicate handling code
Matthew Wire [Fri, 4 Dec 2020 10:11:23 +0000 (10:11 +0000)]
Merge pull request #19066 from colemanw/tabCleanup
Fix dev/core#2215 & remove the tab selection inline script from TabHeader.tpl
Seamus Lee [Fri, 4 Dec 2020 08:43:46 +0000 (19:43 +1100)]
Merge pull request #19072 from eileenmcnaughton/url
dev/financial#157 [REF] Extract functions
eileen [Thu, 3 Dec 2020 21:59:47 +0000 (10:59 +1300)]
[REF] Extract duplicate handling code
This winds up being a very strange process - however the goal seems to be
to unravel error handling to appropriate exception throwing & catching
& a bit of back & forth helps us isolate the code places
Eileen McNaughton [Fri, 4 Dec 2020 05:33:51 +0000 (18:33 +1300)]
Merge pull request #19108 from eileenmcnaughton/import
Remove obsolete IF
eileen [Fri, 4 Dec 2020 01:54:42 +0000 (14:54 +1300)]
Remove obsolete IF
Per previous PR there is an early return making this if meaningless but
due to the whitespace change it was not in that PR
Seamus Lee [Fri, 4 Dec 2020 01:28:32 +0000 (12:28 +1100)]
Merge pull request #19098 from eileenmcnaughton/import
[REF] Duplicate possibly-used parts of createProfileContact onto Parser_Contact
eileen [Fri, 4 Dec 2020 00:41:10 +0000 (13:41 +1300)]
Minor cleanup in test class
eileen [Tue, 1 Dec 2020 02:33:56 +0000 (15:33 +1300)]
Add ContributionSoft v4 api
Eileen McNaughton [Thu, 3 Dec 2020 23:33:45 +0000 (12:33 +1300)]
Merge pull request #19102 from eileenmcnaughton/err
[REF] use early return for errors rather than confusing assignment
eileen [Thu, 3 Dec 2020 20:42:51 +0000 (09:42 +1300)]
[REF] Duplicate possibly-used parts of createProfileContact onto Parser_Contact
The parser_Contact class should call the api. Getting to that point is
complicated because
1) it's such a mess and
2) it does a lot of work to prepare to call createProfileContact
and it's hard to unravel that.
By copying most of createProfileContact onto the class we can start to
unravel it & pare down to calling the api (note we went through
this process in the dedupe class, at least in part).
I'm pretty sure the hooks reflect 'the way the code grew up' rather than
any logical use/ requirement for the profile hook
eileen [Thu, 3 Dec 2020 21:33:18 +0000 (10:33 +1300)]
[REF] use early return for errors rather than confusing assignment
This just makes the code slightly clearer. The next if can go, but
needs to wait on another PR to be merged to avoid conflict
Eileen McNaughton [Thu, 3 Dec 2020 20:11:06 +0000 (09:11 +1300)]
Merge pull request #19095 from nishant-bhorodia/Issue#537-owner-notification-email-sending-with-every-save
Issue#537: Fix syntax to check pcp_id is NULL in api params
colemanw [Thu, 3 Dec 2020 13:28:21 +0000 (08:28 -0500)]
Merge pull request #18939 from colemanw/serializeFix
Fix updating custom field schema when toggling search or multiple
colemanw [Thu, 3 Dec 2020 12:53:35 +0000 (07:53 -0500)]
Merge pull request #19067 from eileenmcnaughton/weight
Quick fix on summary actions conflict
Nishant Bhorodia [Thu, 3 Dec 2020 11:10:04 +0000 (16:40 +0530)]
Issue#537: Fix syntax to check pcp_id is NULL in api params
CiviCRM [Thu, 3 Dec 2020 07:03:00 +0000 (07:03 +0000)]
Set version to 5.34.alpha1
CiviCRM [Thu, 3 Dec 2020 06:54:04 +0000 (06:54 +0000)]
Set version to 5.33.beta1
Seamus Lee [Thu, 3 Dec 2020 06:24:51 +0000 (17:24 +1100)]
Merge pull request #19093 from civicrm/5.32
5.32
Tim Otten [Thu, 3 Dec 2020 06:23:36 +0000 (22:23 -0800)]
Merge pull request #19094 from totten/5.32-bump0
(NFC) release-notes/5.32.0 - Add RC-stage updates
Tim Otten [Thu, 3 Dec 2020 06:18:38 +0000 (22:18 -0800)]
release-notes/5.32.0 - Add RC-stage updates
Tim Otten [Thu, 3 Dec 2020 05:25:48 +0000 (21:25 -0800)]
Merge pull request #19092 from seamuslee001/dev_core_2228
dev/core#2228 Fix issue where by changing location type tries to pass…
Tim Otten [Thu, 3 Dec 2020 04:54:14 +0000 (20:54 -0800)]
Merge pull request #19091 from eileenmcnaughton/form
Fix fatal error on payment edit form
Seamus Lee [Thu, 3 Dec 2020 01:56:05 +0000 (12:56 +1100)]
dev/core#2228 Fix issue where by changing location type tries to pass in number:... in the API
eileen [Thu, 3 Dec 2020 01:29:19 +0000 (14:29 +1300)]
Fix fatal error on payment edit form
Seamus Lee [Thu, 3 Dec 2020 01:25:50 +0000 (12:25 +1100)]
Merge pull request #19090 from civicrm/5.32
5.32
Seamus Lee [Wed, 2 Dec 2020 23:12:45 +0000 (10:12 +1100)]
Merge pull request #19014 from eileenmcnaughton/cancel
dev/core#927 Add test demonstrating that an extraneous activity is being created & fix
Seamus Lee [Wed, 2 Dec 2020 22:42:06 +0000 (09:42 +1100)]
Merge pull request #19088 from seamuslee001/dev_core_2227
Ensure that the is_deleted filter is added correctly if we are not se…
Seamus Lee [Wed, 2 Dec 2020 02:25:12 +0000 (13:25 +1100)]
Ensure that the is_deleted filter is added correctly if we are not searching for deleted contacts but have access to view deleted contacts
Simplify IF down as per feed back from ACD and also comment from Eileen in chat and extend unit test as well
colemanw [Wed, 2 Dec 2020 13:10:46 +0000 (08:10 -0500)]
Merge pull request #19053 from totten/master-afform-tweak
Afform - Update fields and HTML mode in web-based editors
Tim Otten [Wed, 25 Nov 2020 19:13:02 +0000 (11:13 -0800)]
afGuiEditor - Add optional preview of HTML output
Tim Otten [Wed, 25 Nov 2020 19:11:11 +0000 (11:11 -0800)]
afGuiEditor - Switch canvas panel to use tabs
(1) This makes the canvas and palette line-up more nicely.
(2) This will allow more tabs.
Tim Otten [Wed, 25 Nov 2020 10:07:34 +0000 (02:07 -0800)]
Afform.convert - Add stateless helper API to convert between layouts
Tim Otten [Wed, 25 Nov 2020 09:02:05 +0000 (01:02 -0800)]
crmMonaco - Accept pass-thru arguments to Monaco
Tim Otten [Wed, 25 Nov 2020 08:02:56 +0000 (00:02 -0800)]
Convert af-monaco to crm-monaco
Tim Otten [Wed, 25 Nov 2020 07:14:31 +0000 (23:14 -0800)]
_af_fill_field_metadata() - Provide metadata about selected fields (regardless of DB permissions)
Tim Otten [Tue, 1 Dec 2020 00:24:39 +0000 (16:24 -0800)]
afHtmlEditor - Add descriptions. Add more missing fields.
Tim Otten [Wed, 25 Nov 2020 07:13:55 +0000 (23:13 -0800)]
afHtmlEditor - Use more BS3
Tim Otten [Wed, 25 Nov 2020 05:03:14 +0000 (21:03 -0800)]
afGuiEditor - Allow editing `is_public`
Tim Otten [Wed, 25 Nov 2020 05:02:42 +0000 (21:02 -0800)]
afGuiEditor - Add help blocks. Reorder in anticipation of more fields.
Eileen McNaughton [Tue, 1 Dec 2020 18:57:35 +0000 (07:57 +1300)]
Merge pull request #19087 from civicrm/5.32
5.32
colemanw [Tue, 1 Dec 2020 14:58:46 +0000 (09:58 -0500)]
Merge pull request #19082 from compucorp/dev-core-1790-contact-card-delay
dev/core#1790: Add short delay before closing tooltip elements
Seamus Lee [Tue, 1 Dec 2020 09:44:51 +0000 (20:44 +1100)]
Merge pull request #19084 from eileenmcnaughton/prod
dev/drupal#148 Fix product form such that it is possible to unseletc …
eileen [Tue, 1 Dec 2020 03:42:42 +0000 (16:42 +1300)]
dev/drupal#148 Fix product form such that it is possible to unseletc duration unit, frequency unit
Eileen McNaughton [Tue, 1 Dec 2020 02:49:47 +0000 (15:49 +1300)]
Merge pull request #19078 from seamuslee001/emoiji_test_api3
[NFC] Add in an Emoji test for APIv3 as per Eileen's PR
Seamus Lee [Tue, 1 Dec 2020 01:13:52 +0000 (12:13 +1100)]
Merge pull request #19075 from colemanw/searchable
Improve schema metadata for Search Kit
René Olivo [Tue, 1 Dec 2020 00:20:37 +0000 (00:20 +0000)]
dev/core#1790: Add short delay before closing tooltip elements
Seamus Lee [Mon, 30 Nov 2020 23:44:53 +0000 (10:44 +1100)]
Merge pull request #19081 from civicrm/5.32
5.32
Seamus Lee [Mon, 30 Nov 2020 23:44:24 +0000 (10:44 +1100)]
Merge pull request #19077 from seamuslee001/dev_core_2213
dev/core#2213 Protect against 404s when wpBasePage is mixed case
Seamus Lee [Mon, 30 Nov 2020 23:35:52 +0000 (10:35 +1100)]
Merge pull request #19080 from seamuslee001/master
5.32
Seamus Lee [Mon, 30 Nov 2020 23:34:33 +0000 (10:34 +1100)]
Merge in 5.32
Seamus Lee [Mon, 30 Nov 2020 23:32:45 +0000 (10:32 +1100)]
Merge pull request #19076 from seamuslee001/update_cache_integration_tests
[NFC] Update Cache/integration-tests version as new version recently …
Seamus Lee [Mon, 30 Nov 2020 23:23:26 +0000 (10:23 +1100)]
[NFC] Add in an Emoji test for APIv3 as per Eileen's PR
Seamus Lee [Mon, 30 Nov 2020 23:22:39 +0000 (10:22 +1100)]
Merge pull request #18918 from eileenmcnaughton/emoji
dev/core#2165 Test for Handle emojis less fatally where not supported
Coleman Watts [Mon, 30 Nov 2020 20:10:46 +0000 (15:10 -0500)]
Annotate DAO files with COMPONENT, exclude disabled components' entities from APIv4 Entity::get
Seamus Lee [Mon, 30 Nov 2020 23:03:48 +0000 (10:03 +1100)]
Merge pull request #19044 from seamuslee001/dev_drupal_149
dev/drupal#149 Override sessionStart function for Drupal8 using appro…
Christian Wach [Fri, 27 Nov 2020 16:13:53 +0000 (16:13 +0000)]
dev/core#2213 Protect against 404s when wpBasePage is mixed case
Seamus Lee [Mon, 30 Nov 2020 21:34:05 +0000 (08:34 +1100)]
[NFC] Update Cache/integration-tests version as new version recently released that contains the patches already applied
eileen [Tue, 3 Nov 2020 22:07:37 +0000 (11:07 +1300)]
dev/core#2165 Test & fix for Handle emojis less fatally where not supported
Fix emoji handling by returning always-false when unwelcomely present
Coleman Watts [Mon, 30 Nov 2020 19:23:53 +0000 (14:23 -0500)]
Add @searchable annotation to denote which API entities should be visible in Search Kit UI
Eileen McNaughton [Mon, 30 Nov 2020 18:21:07 +0000 (07:21 +1300)]
Merge pull request #19063 from christianwach/lab-core-2213
Protect against 404s when wpBasePage is mixed case
Coleman Watts [Sat, 28 Nov 2020 19:07:13 +0000 (14:07 -0500)]
Remove the tab selection inline script from TabHeader.tpl
This is part of ongoing cleanup to get the logic for selecting default tab
out of the tpl, which was redundant with the logic already in tabHeader.js.
eileen [Mon, 30 Nov 2020 02:36:02 +0000 (15:36 +1300)]
dev/financial#157 [REF] Extract functions
This is just preliminary cleanup
Eileen McNaughton [Mon, 30 Nov 2020 00:20:36 +0000 (13:20 +1300)]
Merge pull request #19070 from mattwire/extensionupgrademsg
Extract function that generates upgrade link for extensions
Matthew Wire [Sun, 29 Nov 2020 20:04:03 +0000 (20:04 +0000)]
Extract function that generates upgrade link for extensions
Matthew Wire [Sun, 29 Nov 2020 15:30:37 +0000 (15:30 +0000)]
Merge pull request #18612 from mattwire/tokenprocessorsimplify
REF Simplify tokenProcessor code
eileen [Sat, 28 Nov 2020 22:10:35 +0000 (11:10 +1300)]
Quick fix on summary actions conflict
Per https://github.com/eileenmcnaughton/org.wikimedia.contacteditor/issues/8 &
https://github.com/mattwire/uk.co.mjwconsult.checksum/issues/1
menu items are indexed by weight, resulting in a conflict between 2 items with the same weight -
this is just a quick & dirty fix to ensure we don't overwrite one menu item with another
Eileen McNaughton [Sat, 28 Nov 2020 22:46:48 +0000 (11:46 +1300)]
Merge pull request #19025 from sunilpawar/favourite_country
Feature to provide mostly used countries in top section of Country select list
Matthew Wire [Sat, 26 Sep 2020 17:55:38 +0000 (18:55 +0100)]
Simplify tokenProcessor code for activities
Matthew Wire [Sat, 28 Nov 2020 18:31:14 +0000 (18:31 +0000)]
Merge pull request #19065 from colemanw/campaignTabs
Minor tabs cleanup toward fixing dev/core#2215
Coleman Watts [Sat, 28 Nov 2020 00:30:32 +0000 (19:30 -0500)]
Minor tabs cleanup
1. Avoid overwriting CRM.tabSettings.active by cloning the variable rather than copying by reference
2. Initialize tabs only once on the Campaign dashboard
colemanw [Fri, 27 Nov 2020 16:30:10 +0000 (11:30 -0500)]
Merge pull request #19059 from eileenmcnaughton/2199_ufgroup_pre_post_hook
Remove use of nullArray in delete hooks
Christian Wach [Fri, 27 Nov 2020 16:13:53 +0000 (16:13 +0000)]
Protect against 404s when wpBasePage is mixed case
colemanw [Fri, 27 Nov 2020 15:45:38 +0000 (10:45 -0500)]
Merge pull request #19060 from eileenmcnaughton/ufadd
Deprecate UFGroup::add parameter ids
Christian Wach [Fri, 27 Nov 2020 15:03:06 +0000 (15:03 +0000)]
Prevent "add_action" from being called multiple times
Sunil Pawar [Fri, 27 Nov 2020 08:08:39 +0000 (13:38 +0530)]
added test case, ts for help text in setting file, changed static variable logic
eileen [Fri, 27 Nov 2020 07:16:32 +0000 (20:16 +1300)]
Deprecate UFGroup::add parameter ids
This is only passed in from one place. This PR removes it & adds noisy deprecation
eileen [Fri, 27 Nov 2020 07:05:06 +0000 (20:05 +1300)]
Remove use of nullArray in delete hooks
Looking at #18995 I was struck by the delete hook being non-standard. In general we don't load from the DB just to pass
to the hook as the hook can do that itself. However, when I looked at other hooks
I found that they were passing out nullArray - this is a legacy method that precedes
being on a php version that supported default params when passing by reference.
It's further known to introduce intermittent hard to debug issues. This adds the new hook
and also adds standardisation to the other hooks for pre+delete.
I've left the create one for now but GroupContact is a good example of something
close to what we want to standardise on there
Seamus Lee [Wed, 25 Nov 2020 09:53:06 +0000 (20:53 +1100)]
dev/drupal#149 Override sessionStart function for Drupal8 using appropriate session functions
Use Drupal Session service and don't worry about calling migrate
Seamus Lee [Fri, 27 Nov 2020 01:37:05 +0000 (12:37 +1100)]
Merge pull request #19050 from eileenmcnaughton/pp
[REF] Remove excess handling around contact_id
Seamus Lee [Fri, 27 Nov 2020 01:32:53 +0000 (12:32 +1100)]
Merge pull request #19051 from eileenmcnaughton/pps
Remove extra handling around contact id
Eileen McNaughton [Fri, 27 Nov 2020 00:50:40 +0000 (13:50 +1300)]
Merge pull request #18916 from colemanw/crudLink
Remove unused hook_civicrm_crudLink and switch to using metadata for crudLinks
Eileen McNaughton [Thu, 26 Nov 2020 21:53:44 +0000 (10:53 +1300)]
Merge pull request #19052 from colemanw/angModuleCleanup
[REF] Cleanup Ang modules in core to follow conventions
Seamus Lee [Thu, 26 Nov 2020 21:29:23 +0000 (08:29 +1100)]
Merge pull request #19058 from mattwire/pcpshortcodeaction
wordpress#63 Add action parameter to PCP shortcode
colemanw [Thu, 26 Nov 2020 16:42:25 +0000 (11:42 -0500)]
Merge pull request #19046 from dwoods-encircle/Resource-URL-helptext-update
Update Resource URL Helptext
Sunil Pawar [Thu, 26 Nov 2020 13:22:57 +0000 (18:52 +0530)]
small change
Sunil Pawar [Thu, 26 Nov 2020 13:20:43 +0000 (18:50 +0530)]
changed lable and field name from favourite to Pinned
Matthew Wire [Thu, 26 Nov 2020 11:18:21 +0000 (11:18 +0000)]
wordpress#63 Add action parameter to PCP shortcode
Seamus Lee [Thu, 26 Nov 2020 08:36:51 +0000 (19:36 +1100)]
Merge pull request #19056 from civicrm/5.32
5.32
Seamus Lee [Thu, 26 Nov 2020 05:14:25 +0000 (16:14 +1100)]
Merge pull request #19055 from colemanw/fixSearchActionButton
Search ext: Fix search action button
Coleman Watts [Thu, 26 Nov 2020 02:47:30 +0000 (21:47 -0500)]
Search ext: Fix search action button
eileen [Wed, 25 Nov 2020 19:04:34 +0000 (08:04 +1300)]
Remove extra handling around contact id
It's retrieved a few rows earlier from the contribution - this is from formerly
shared code that does not apply here
eileen [Wed, 25 Nov 2020 19:00:01 +0000 (08:00 +1300)]
[REF] Remove excess handling around contact_id
The removed code was formerly in a shared function. On looking the
getIDS actually just gets the contact id from the contributionRecur
object & every thing else is extraneous
Eileen McNaughton [Thu, 26 Nov 2020 02:08:08 +0000 (15:08 +1300)]
Merge pull request #19049 from colemanw/crmExampleGone
Delete outdated/unused crmExample Angular module
Seamus Lee [Thu, 26 Nov 2020 00:30:32 +0000 (11:30 +1100)]
Merge pull request #19047 from colemanw/crmD3
[REF] Decouple crmD3 angular module from CiviMail
Seamus Lee [Thu, 26 Nov 2020 00:25:35 +0000 (11:25 +1100)]
Merge pull request #19045 from seamuslee001/remove_xss_function
[REF] Remove xssString as it is providing a false sense of security
Coleman Watts [Wed, 25 Nov 2020 19:07:24 +0000 (14:07 -0500)]
Fix crmStatusPage file name to match module name per convention