civicrm-core.git
3 years agodev/core#2153 #REF Remove outdated updateCustomValues function
Seamus Lee [Wed, 11 Nov 2020 23:20:54 +0000 (10:20 +1100)]
dev/core#2153 #REF Remove outdated updateCustomValues function

Move function call back to where it was under cividesk

Fix delete and ensure updateValue is only called on update

3 years agoMerge pull request #18991 from demeritcowboy/serialize-notice
Eileen McNaughton [Wed, 18 Nov 2020 23:36:40 +0000 (12:36 +1300)]
Merge pull request #18991 from demeritcowboy/serialize-notice

dev/core#2196 - serialize E_NOTICE when saving custom field

3 years agoMerge pull request #18989 from totten/master-afform-label
Eileen McNaughton [Wed, 18 Nov 2020 22:33:58 +0000 (11:33 +1300)]
Merge pull request #18989 from totten/master-afform-label

afform - Get default field `<label>` from `label` instead of `title`

3 years agoMerge pull request #18981 from mattwire/extensionsuitweak
Seamus Lee [Wed, 18 Nov 2020 21:02:59 +0000 (08:02 +1100)]
Merge pull request #18981 from mattwire/extensionsuitweak

Extensionsuitweak

3 years agoafform - Get default field `<label>` from `label` instead of `title`
Tim Otten [Wed, 18 Nov 2020 01:29:56 +0000 (17:29 -0800)]
afform - Get default field `<label>` from `label` instead of `title`

3 years agogitignore - Whitelist ext/afform
Tim Otten [Wed, 18 Nov 2020 01:29:36 +0000 (17:29 -0800)]
gitignore - Whitelist ext/afform

3 years agofix serialize E_NOTICE
demeritcowboy [Wed, 18 Nov 2020 00:50:23 +0000 (19:50 -0500)]
fix serialize E_NOTICE

3 years agoMerge pull request #18990 from totten/master-afform-gui-url
colemanw [Wed, 18 Nov 2020 13:25:51 +0000 (08:25 -0500)]
Merge pull request #18990 from totten/master-afform-gui-url

afform/gui - Fix rendering of the "Form Settings"

3 years agoafform/gui - Fix rendering of the "Form Settings"
Tim Otten [Wed, 18 Nov 2020 10:18:34 +0000 (02:18 -0800)]
afform/gui - Fix rendering of the "Form Settings"

The `<textarea/>` tag is misinterpreted, causing the subsequent fields to disappear.

3 years agoMerge pull request #18985 from demeritcowboy/create-table-logging
Eileen McNaughton [Tue, 17 Nov 2020 20:47:27 +0000 (09:47 +1300)]
Merge pull request #18985 from demeritcowboy/create-table-logging

dev/core#2190 - Remove unused lines, replace CRM_Utils_Array::value

3 years agodon't assume tablespec exists
demeritcowboy [Mon, 16 Nov 2020 22:36:15 +0000 (17:36 -0500)]
don't assume tablespec exists

3 years agoMerge pull request #18979 from eileenmcnaughton/trans
Seamus Lee [Tue, 17 Nov 2020 00:39:08 +0000 (11:39 +1100)]
Merge pull request #18979 from eileenmcnaughton/trans

Remove return value on transitionComponents

3 years agoTweak information displayed by extensions list so it's aimed more at the end-user...
Matthew Wire [Mon, 16 Nov 2020 21:11:41 +0000 (21:11 +0000)]
Tweak information displayed by extensions list so it's aimed more at the end-user rather than the developer

3 years agoMerge pull request #18971 from colemanw/angularDashboard
colemanw [Mon, 16 Nov 2020 20:27:26 +0000 (15:27 -0500)]
Merge pull request #18971 from colemanw/angularDashboard

Rewrite jquery.dashboard.js as Angular app

3 years agoRewrite jquery.dashboard.js as Angular app
Coleman Watts [Fri, 13 Nov 2020 18:23:41 +0000 (13:23 -0500)]
Rewrite jquery.dashboard.js as Angular app

New home dashboard written with Angular + APIv4.
Functionality is mostly unchanged.
The motivation for this is to support afforms embedded within dashboard dashlets.

3 years agoMerge pull request #18950 from MegaphoneJon/event-44
Eileen McNaughton [Mon, 16 Nov 2020 11:41:48 +0000 (00:41 +1300)]
Merge pull request #18950 from MegaphoneJon/event-44

event#44: Don't allow self-service cancelling after an event when 'hours to cancel' is zero

3 years agoRemove return value on transitionComponents
eileen [Mon, 16 Nov 2020 08:02:21 +0000 (21:02 +1300)]
Remove return value on transitionComponents

We no longer use the result from this function so this removes most of the code that calculates the updateResult value.

There are still instances coming back from the cancel & fail functions that I will remove as a follow up

3 years agoMerge pull request #18964 from eileenmcnaughton/trans
Seamus Lee [Mon, 16 Nov 2020 06:06:52 +0000 (17:06 +1100)]
Merge pull request #18964 from eileenmcnaughton/trans

dev/core#2155 Remove obscure broken handling for onlinePendingContribution

3 years agoMerge pull request #18960 from seamuslee001/utf8mb4_install
Eileen McNaughton [Mon, 16 Nov 2020 06:01:11 +0000 (19:01 +1300)]
Merge pull request #18960 from seamuslee001/utf8mb4_install

dev/core#339 Install CiviCRM tables using utf8mb4

3 years agoMerge pull request #18977 from civicrm/5.32
Eileen McNaughton [Mon, 16 Nov 2020 03:20:16 +0000 (16:20 +1300)]
Merge pull request #18977 from civicrm/5.32

5.32 to master

3 years agoMerge pull request #18976 from colemanw/searchParams
Eileen McNaughton [Mon, 16 Nov 2020 03:16:51 +0000 (16:16 +1300)]
Merge pull request #18976 from colemanw/searchParams

Search ext: use crmRouteBinder to expose params for new searches to url

3 years agoSearch ext: use crmRouteBinder to expose params for new searches as url arguments
Coleman Watts [Mon, 16 Nov 2020 00:00:58 +0000 (19:00 -0500)]
Search ext: use crmRouteBinder to expose params for new searches as url arguments

3 years agoMerge pull request #18975 from colemanw/fixAfformDep
Seamus Lee [Sun, 15 Nov 2020 23:28:01 +0000 (10:28 +1100)]
Merge pull request #18975 from colemanw/fixAfformDep

Fix undeclared afform requirement of ngRoute

3 years agoMerge pull request #18974 from civicrm/5.32
Seamus Lee [Sun, 15 Nov 2020 23:21:42 +0000 (10:21 +1100)]
Merge pull request #18974 from civicrm/5.32

5.32

3 years agoFix undeclared afform requirement of ngRoute
Coleman Watts [Sun, 15 Nov 2020 19:59:29 +0000 (14:59 -0500)]
Fix undeclared afform requirement of ngRoute

3 years agoMerge pull request #18967 from seamuslee001/dev_core_2178
Seamus Lee [Sun, 15 Nov 2020 19:25:59 +0000 (06:25 +1100)]
Merge pull request #18967 from seamuslee001/dev_core_2178

dev/core#2178 Fix regression on adding contacts to a newly created group

3 years agoMerge pull request #18970 from MegaphoneJon/core-2188
colemanw [Sun, 15 Nov 2020 17:59:22 +0000 (12:59 -0500)]
Merge pull request #18970 from MegaphoneJon/core-2188

fix default 'is searchable' to prevent breaking advanced search

3 years agodev/core#339 Install CiviCRM tables using utf8mb4
Seamus Lee [Thu, 12 Nov 2020 01:00:13 +0000 (12:00 +1100)]
dev/core#339 Install CiviCRM tables using utf8mb4

Update sample custom value tables as appropriate as well

Fix conflict between test setting ROW_FORMAT being compressed and the ROW_FORMAT of the original table being DYNAMIC

3 years agofix default 'is searchable' to prevent breaking advanced search
Jon Goldberg [Fri, 13 Nov 2020 22:19:08 +0000 (17:19 -0500)]
fix default 'is searchable' to prevent breaking advanced search

3 years agoMerge pull request #18748 from eileenmcnaughton/log
Seamus Lee [Fri, 13 Nov 2020 04:48:12 +0000 (15:48 +1100)]
Merge pull request #18748 from eileenmcnaughton/log

dev/core#2120 Do not attempt to obsolete primary key on log tables

3 years agodev/core#2178 Fix regression on adding contacts to a newly created group
Seamus Lee [Fri, 13 Nov 2020 04:03:12 +0000 (15:03 +1100)]
dev/core#2178 Fix regression on adding contacts to a newly created group

3 years agoMerge pull request #18965 from MegaphoneJon/mailing-80
Eileen McNaughton [Fri, 13 Nov 2020 03:18:41 +0000 (16:18 +1300)]
Merge pull request #18965 from MegaphoneJon/mailing-80

Don't break clickthrough URLs when there's leading whitespace

3 years agoMerge pull request #18966 from demeritcowboy/nl-nl-default
Seamus Lee [Fri, 13 Nov 2020 00:46:40 +0000 (11:46 +1100)]
Merge pull request #18966 from demeritcowboy/nl-nl-default

[NFC] Follow-on to 18963 to add example setting in civicrm.settings template for setting CMS inheritance for nl_BE

3 years agoMerge pull request #18962 from colemanw/dashboardPerms
Seamus Lee [Fri, 13 Nov 2020 00:26:01 +0000 (11:26 +1100)]
Merge pull request #18962 from colemanw/dashboardPerms

API - Finer-grained permisions for the dashboard & dashlet entities

3 years agoexample setting
demeritcowboy [Thu, 12 Nov 2020 23:22:20 +0000 (18:22 -0500)]
example setting

3 years agoMerge pull request #18963 from samuelsov/nli18n
Eileen McNaughton [Thu, 12 Nov 2020 22:31:47 +0000 (11:31 +1300)]
Merge pull request #18963 from samuelsov/nli18n

Add a way to choose between nl_NL and nl_BE

3 years agoAPI - Finer-grained permisions for the dashboard & dashlet entities
Coleman Watts [Thu, 12 Nov 2020 15:23:53 +0000 (10:23 -0500)]
API - Finer-grained permisions for the dashboard & dashlet entities

This allows contacts without "administer CiviCRM" permission to access these api entities.
Permissions are restricted to contacts they have access to, and write permissions are
limited to a contact only editing their own dashboard.

3 years agoDon't break clickthrough URLs when there's leading whitespace
Jon Goldberg [Thu, 12 Nov 2020 21:56:44 +0000 (16:56 -0500)]
Don't break clickthrough URLs when there's leading whitespace

3 years agodev/core#2155 Remove obscure broken handling for onlinePendingContribution
eileen [Thu, 12 Nov 2020 20:50:20 +0000 (09:50 +1300)]
dev/core#2155 Remove obscure broken handling for onlinePendingContribution

Per https://lab.civicrm.org/dev/core/-/issues/2155 there is some obscure functionality for
completing a pending contribution under some cases. My testing suggests it is long-term broken.

See GL for more

3 years agoAdd a way to choose between nl_NL and nl_BE
Samuel Vanhove [Thu, 12 Nov 2020 16:39:47 +0000 (11:39 -0500)]
Add a way to choose between nl_NL and nl_BE

3 years agoMerge pull request #18961 from eileenmcnaughton/msg
Matthew Wire [Thu, 12 Nov 2020 12:01:14 +0000 (12:01 +0000)]
Merge pull request #18961 from eileenmcnaughton/msg

dev/core#2158 Remove detail about updating related components when editing a contribution status

3 years agodev/core#2158 Remove detail about updating related components when editing a contribu...
eileen [Thu, 12 Nov 2020 02:49:31 +0000 (15:49 +1300)]
dev/core#2158 Remove detail about updating related components when editing a contribution status

Note that with this merged it's also possible to remove a lot of code from transitionComponents

3 years agoMerge pull request #18952 from eileenmcnaughton/aip
Eileen McNaughton [Thu, 12 Nov 2020 00:11:01 +0000 (13:11 +1300)]
Merge pull request #18952 from eileenmcnaughton/aip

Standardise more params in completeOrder

3 years agoMerge pull request #18912 from yashodha/dev_2153
Seamus Lee [Wed, 11 Nov 2020 23:15:01 +0000 (10:15 +1100)]
Merge pull request #18912 from yashodha/dev_2153

(dev/core#2153) BUG: when changing a custom group option value CiviCR…

3 years agoStandardise more params in completeOrder
eileen [Tue, 10 Nov 2020 03:06:04 +0000 (16:06 +1300)]
Standardise more params in completeOrder

This moves the loading of the following params from the first contribution from Authorize.net to
completeOrder
- amount_level
- address_id

In addition campaign_id is moved, however, this is only in it is not an
input param or derived from the recur record

3 years agoMerge pull request #18956 from civicrm/5.32
Eileen McNaughton [Wed, 11 Nov 2020 22:25:12 +0000 (11:25 +1300)]
Merge pull request #18956 from civicrm/5.32

5.32

3 years agoMerge pull request #18958 from alifrumin/5.32rn
Seamus Lee [Wed, 11 Nov 2020 20:02:48 +0000 (07:02 +1100)]
Merge pull request #18958 from alifrumin/5.32rn

[NFC ] 5.32 Release Notes - first pass

3 years ago5.32 release notes
Alice Frumin [Mon, 9 Nov 2020 20:34:58 +0000 (14:34 -0600)]
5.32 release notes

3 years agoMerge pull request #18955 from totten/5.32-oauth-return
Seamus Lee [Wed, 11 Nov 2020 03:57:09 +0000 (14:57 +1100)]
Merge pull request #18955 from totten/5.32-oauth-return

dev/core#2141 - Tighten up new page `civicrm/oauth-client/return`

3 years agodev/core#2141 - Tighten up new page `civicrm/oauth-client/return`
Tim Otten [Tue, 10 Nov 2020 22:25:21 +0000 (14:25 -0800)]
dev/core#2141 - Tighten up new page `civicrm/oauth-client/return`

Overview
--------

The route `civicrm/oauth-client/return` is added in 5.32 as the main "Redirect URL".

In normal usage, the page shouldn't be visible to a user (because the
developer should define some alternative UI) -- but one might see it (a)
during development, (b) if there's an error, or (c) if a clever user mucks
about.

Improvements:

* Error handling
    * Present error messages more nicely
    * Record errors in the log
    * Report more info via hook_oauthReturnError
* Other UI
    * Redact token details (dependent upon permission `manage OAuth client secrets`)
    * Set a more sensibile page title
    * Make output blobs conditional and collapsible

3 years agoMerge pull request #18948 from aydun/core#2172
Seamus Lee [Tue, 10 Nov 2020 20:46:48 +0000 (07:46 +1100)]
Merge pull request #18948 from aydun/core#2172

core#2172 - Fix 'Find Respondents' in CiviCampaigns

3 years agoMerge pull request #18953 from civicrm/5.32
Seamus Lee [Tue, 10 Nov 2020 10:13:35 +0000 (21:13 +1100)]
Merge pull request #18953 from civicrm/5.32

5.32

3 years agoMerge pull request #18951 from totten/5.32-ms-imap
Seamus Lee [Tue, 10 Nov 2020 06:53:25 +0000 (17:53 +1100)]
Merge pull request #18951 from totten/5.32-ms-imap

dev/mail#79 - Fix MS Exchange/IMAP. Use OpenID Connect.

3 years agodev/mail#79 - Use OpenID Connect with MS Exchange
Tim Otten [Tue, 10 Nov 2020 00:47:50 +0000 (16:47 -0800)]
dev/mail#79 - Use OpenID Connect with MS Exchange

At time of writing, there appears to be a problem in Microsoft's services:
if you request both `User.Read` and `IMAP.AccessAsUser.All`, then the token
does not actually work for IMAP access.

However, it is does work to combine `openid` and `IMAP.AccessAsUser.All`.

This patch revises the MS Exchange definition to get resource-owner details
via OpenID Connect's `id_token`.

3 years agodev/mail#79 - Add option to get resource-owner via OpenID Connect
Tim Otten [Tue, 10 Nov 2020 00:43:39 +0000 (16:43 -0800)]
dev/mail#79 - Add option to get resource-owner via OpenID Connect

At time of writing, there appears to be a problem in Microsoft's services:
if you request both `User.Read` and `IMAP.AccessAsUser.All`, then the token
does not actually work for IMAP access.

However, it is does work to combine `openid` and `IMAP.AccessAsUser.All`.

This patch to CiviGenericProvider makes it easier to get resource-owner
details via OpenID Connect's `id_token`.

3 years agoMerge pull request #18949 from colemanw/legacyAutocomplete
Seamus Lee [Tue, 10 Nov 2020 00:25:51 +0000 (11:25 +1100)]
Merge pull request #18949 from colemanw/legacyAutocomplete

APIv3 - Fix legacy handling for html_type Autocomplete-Select

3 years agoevent#44: Don't allow self-service cancelling after an event when 'hours to cancel...
Jon Goldberg [Mon, 9 Nov 2020 23:14:46 +0000 (18:14 -0500)]
event#44: Don't allow self-service cancelling after an event when 'hours to cancel' is zero

3 years agoFix legacy handling for html_type Autocomplete-Select
Coleman Watts [Mon, 9 Nov 2020 21:44:49 +0000 (16:44 -0500)]
Fix legacy handling for html_type Autocomplete-Select

Legacy handling was returning "Autocomplete-Multi-Select" which was never a real html_type.

3 years agoFix SQL
Aidan Saunders [Mon, 9 Nov 2020 21:35:08 +0000 (21:35 +0000)]
Fix SQL

3 years agoMerge pull request #18946 from eileenmcnaughton/if
Matthew Wire [Mon, 9 Nov 2020 14:38:46 +0000 (14:38 +0000)]
Merge pull request #18946 from eileenmcnaughton/if

Remove always true if

3 years agoMerge pull request #18947 from eileenmcnaughton/pps
Matthew Wire [Mon, 9 Nov 2020 14:31:14 +0000 (14:31 +0000)]
Merge pull request #18947 from eileenmcnaughton/pps

dev/financial#148 dev/financial#148 Copy contents of validateDate onto paypalIPN

3 years agoMerge pull request #18819 from eileenmcnaughton/import
Seamus Lee [Mon, 9 Nov 2020 09:29:37 +0000 (20:29 +1100)]
Merge pull request #18819 from eileenmcnaughton/import

Minor code cleanup - dedupe isNull checks

3 years agodev/financial#148 Copy contents of validateDate onnto paypalIPN
eileen [Sun, 8 Nov 2020 23:56:52 +0000 (12:56 +1300)]
dev/financial#148 Copy contents of validateDate onnto paypalIPN

This code isn't really that shared & it can be simplified by NOT sharing it

3 years agoRemove always true if
eileen [Sun, 8 Nov 2020 23:46:54 +0000 (12:46 +1300)]
Remove always true if

By the time the code reaches this point contributionParams['contribution_recur_id']
must be set. We can confirm this by the fact the call to getTemplateContribution
requires id to be passed in and uses it in a lookup. Also the
code just before repeatTransaction ensures it is called

3 years agoMerge pull request #18934 from eileenmcnaughton/aip
Matthew Wire [Sun, 8 Nov 2020 14:46:55 +0000 (14:46 +0000)]
Merge pull request #18934 from eileenmcnaughton/aip

Remove always-true if

3 years agoMerge pull request #18935 from eileenmcnaughton/pps
Matthew Wire [Sun, 8 Nov 2020 14:46:14 +0000 (14:46 +0000)]
Merge pull request #18935 from eileenmcnaughton/pps

[REF] Minor variable cleanup

3 years agoMerge pull request #18936 from eileenmcnaughton/ppp
Matthew Wire [Sun, 8 Nov 2020 14:45:48 +0000 (14:45 +0000)]
Merge pull request #18936 from eileenmcnaughton/ppp

[Ref] Use variables directly

3 years agoMerge pull request #18944 from civicrm/5.32
Seamus Lee [Sat, 7 Nov 2020 23:02:09 +0000 (10:02 +1100)]
Merge pull request #18944 from civicrm/5.32

5.32

3 years agoMerge pull request #18945 from agh1/5.32.0-releasenotes-fixedinitial
Seamus Lee [Sat, 7 Nov 2020 19:41:22 +0000 (06:41 +1100)]
Merge pull request #18945 from agh1/5.32.0-releasenotes-fixedinitial

5.32.0 release notes initial run

3 years ago5.32.0 release notes: added boilerplate
Andrew Hunt [Sat, 7 Nov 2020 15:38:35 +0000 (10:38 -0500)]
5.32.0 release notes: added boilerplate

3 years ago5.32.0 release notes: raw from script
Andrew Hunt [Sat, 7 Nov 2020 15:35:43 +0000 (10:35 -0500)]
5.32.0 release notes: raw from script

3 years agoMerge pull request #18943 from totten/5.32-token-inspect
Tim Otten [Sat, 7 Nov 2020 06:25:15 +0000 (22:25 -0800)]
Merge pull request #18943 from totten/5.32-token-inspect

dev/core#2141 - Multiple revisions to new screen for inspecting OAuth tokens

3 years agoMerge pull request #18942 from civicrm/5.32
Seamus Lee [Sat, 7 Nov 2020 02:00:12 +0000 (13:00 +1100)]
Merge pull request #18942 from civicrm/5.32

5.32

3 years agodev/core#2141 - Multiple revisions to new screen for inspecting OAuth tokens
Tim Otten [Thu, 5 Nov 2020 08:01:09 +0000 (00:01 -0800)]
dev/core#2141 - Multiple revisions to new screen for inspecting OAuth tokens

Overview
--------

5.32 adds `oauth-client`, which includes a screen for inspecting OAuth
tokens.  This is intended to facilitate debugging.

Before
------

* The screen works for inspecting one token. It offers a button to inspect other tokens, but it doesn't work.
* The screen only shows the `access_token` (and its JWT variant)

After
-----

* The malfunctioning button isn't needed. Remove it.
* The screen shows a full record of the token details. This should make it even more useful for debuggin.

3 years agoMerge pull request #18940 from seamuslee001/5.32
Seamus Lee [Fri, 6 Nov 2020 22:23:46 +0000 (09:23 +1100)]
Merge pull request #18940 from seamuslee001/5.32

[REF] Update composer patches to 1.7.0 to support composer 2.x

3 years ago[REF] Update composer patches to 1.7.0 to support composer 2.x
Seamus Lee [Fri, 6 Nov 2020 20:18:03 +0000 (07:18 +1100)]
[REF] Update composer patches to 1.7.0 to support composer 2.x

3 years agoSet version to 5.33.alpha1
CiviCRM [Fri, 6 Nov 2020 06:35:30 +0000 (06:35 +0000)]
Set version to 5.33.alpha1

3 years agoSet version to 5.32.beta1
CiviCRM [Fri, 6 Nov 2020 06:28:28 +0000 (06:28 +0000)]
Set version to 5.32.beta1

3 years agoMerge pull request #18868 from sunilpawar/logging_date
Eileen McNaughton [Fri, 6 Nov 2020 02:47:57 +0000 (15:47 +1300)]
Merge pull request #18868 from sunilpawar/logging_date

get log date from tables available in query with data instead of last table

3 years agoMerge pull request #18851 from ixiam/dev_issue#2142
Eileen McNaughton [Fri, 6 Nov 2020 02:35:01 +0000 (15:35 +1300)]
Merge pull request #18851 from ixiam/dev_issue#2142

Adds performance improvement when browsing the report logs

3 years agoMerge pull request #18913 from tvartom/master
Eileen McNaughton [Fri, 6 Nov 2020 02:10:27 +0000 (15:10 +1300)]
Merge pull request #18913 from tvartom/master

Make civicrm-setup work with a unix-socket for database connection

3 years agoMerge pull request #18932 from colemanw/schemaHandler
colemanw [Fri, 6 Nov 2020 00:50:49 +0000 (19:50 -0500)]
Merge pull request #18932 from colemanw/schemaHandler

Schema handler fixes

3 years ago[Ref] Use variables directly
eileen [Fri, 6 Nov 2020 00:06:44 +0000 (13:06 +1300)]
[Ref] Use variables directly

3 years ago[REF] Minor variable cleanup
eileen [Thu, 5 Nov 2020 23:58:07 +0000 (12:58 +1300)]
[REF] Minor variable cleanup

This continues the process of using the variables we have loaded within the IPN
rather than those that were loaded onto objects FROM the ones loaded in this IPN

3 years agoRemove always-true if
eileen [Thu, 5 Nov 2020 23:47:15 +0000 (12:47 +1300)]
Remove always-true if

AuthorizeNet ipn is only called from
CRM_Core_Payment_AuthorizeNet::handlePaymentNotification and the deprecated

AuthorizeNetIPN file in extern

(and tests)

No parameter is ever passed to the function so component is always
'contribute' & hence we can stop checking it & remove the IF that checks it

3 years agoMerge pull request #18931 from seamuslee001/master
Seamus Lee [Thu, 5 Nov 2020 22:46:44 +0000 (09:46 +1100)]
Merge pull request #18931 from seamuslee001/master

5.31

3 years agoMerge in 5.31
Seamus Lee [Thu, 5 Nov 2020 22:45:31 +0000 (09:45 +1100)]
Merge in 5.31

3 years agoMerge pull request #18925 from totten/5.31-revert-titlereq
Eileen McNaughton [Thu, 5 Nov 2020 22:40:19 +0000 (11:40 +1300)]
Merge pull request #18925 from totten/5.31-revert-titlereq

dev/translation#58 - Fix regression. Partially revert schema for civicrm_group.title

3 years agoCustomField - simplify tableName lookup during bulkSave and fix bug
Coleman Watts [Thu, 5 Nov 2020 22:36:52 +0000 (17:36 -0500)]
CustomField - simplify tableName lookup during bulkSave and fix bug

This cleans up the tableName lookup to use the method used throughout this class.
The extra optimization (local caching in the $tables variable) was actually less efficient
because CRM_Core_DAO::getFieldValue caches its results, and is used elsewhere so the value
is likely to already be cached.

The bug is that the same table name was repeatedly being passed into $logging->fixSchemaDifferencesFor().

3 years agoSchemaHandler - Remove unused/deprecated function
Coleman Watts [Thu, 5 Nov 2020 22:31:35 +0000 (17:31 -0500)]
SchemaHandler - Remove unused/deprecated function

3 years agoMerge pull request #18930 from MegaphoneJon/financial-156
Matthew Wire [Thu, 5 Nov 2020 21:53:29 +0000 (21:53 +0000)]
Merge pull request #18930 from MegaphoneJon/financial-156

closes financial/#156: Set contribution status to refunded even if cancelled_payment_id is set

3 years agocloses financial/#156: Set contribution status to refunded even if cancelled_payment_...
Jon Goldberg [Thu, 5 Nov 2020 19:24:38 +0000 (14:24 -0500)]
closes financial/#156: Set contribution status to refunded even if cancelled_payment_id is set

3 years agoMerge pull request #18928 from demeritcowboy/left-right-up-down
colemanw [Thu, 5 Nov 2020 18:07:29 +0000 (13:07 -0500)]
Merge pull request #18928 from demeritcowboy/left-right-up-down

dev/core#2167 - Fulltext search drupal block has button on wrong side

3 years agoMerge pull request #18927 from demeritcowboy/del-mail
colemanw [Thu, 5 Nov 2020 18:07:13 +0000 (13:07 -0500)]
Merge pull request #18927 from demeritcowboy/del-mail

dev/core#2166 - E_NOTICE when deleting mail account

3 years agobutton placement on fulltext search drupal block
demeritcowboy [Thu, 5 Nov 2020 15:12:36 +0000 (10:12 -0500)]
button placement on fulltext search drupal block

3 years agoavoid notice / skip validation when deleting
demeritcowboy [Thu, 5 Nov 2020 14:43:34 +0000 (09:43 -0500)]
avoid notice / skip validation when deleting

3 years agodev/translation#58 - 5.31.beta2 - Undo 'NOT NULL'
Tim Otten [Thu, 5 Nov 2020 11:59:23 +0000 (03:59 -0800)]
dev/translation#58 - 5.31.beta2 - Undo 'NOT NULL'

3 years agoSet version to 5.31.beta2
CiviCRM [Thu, 5 Nov 2020 11:58:32 +0000 (03:58 -0800)]
Set version to 5.31.beta2

3 years agodev/translation#58 - Partially revert schema for civicrm_group.title
Tim Otten [Thu, 5 Nov 2020 11:39:32 +0000 (03:39 -0800)]
dev/translation#58 - Partially revert schema for civicrm_group.title

3 years agoMerge pull request #18911 from totten/master-mail-test
Eileen McNaughton [Thu, 5 Nov 2020 07:20:02 +0000 (20:20 +1300)]
Merge pull request #18911 from totten/master-mail-test

dev/mail#2141 - MailSettings - Add button+API for testing a connection