civicrm-core.git
4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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.

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

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

4 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

4 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

4 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

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

4 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

4 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().

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

4 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

4 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

4 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

4 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

4 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

4 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

4 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'

4 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

4 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

4 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

4 years agoMerge pull request #18923 from civicrm/5.31
Eileen McNaughton [Wed, 4 Nov 2020 22:50:40 +0000 (11:50 +1300)]
Merge pull request #18923 from civicrm/5.31

5.31 to master

4 years agoMerge pull request #18921 from agh1/5.31.0-releasenotes-final
Eileen McNaughton [Wed, 4 Nov 2020 22:50:11 +0000 (11:50 +1300)]
Merge pull request #18921 from agh1/5.31.0-releasenotes-final

5.31.0 release notes final

4 years agoMerge pull request #18917 from mattwire/financialtrxn_payprocid
Eileen McNaughton [Wed, 4 Nov 2020 19:45:48 +0000 (08:45 +1300)]
Merge pull request #18917 from mattwire/financialtrxn_payprocid

Add UI metadata for payment_processor_id on financialTrxn

4 years ago5.31.0 release notes: added late changes
Andrew Hunt [Wed, 4 Nov 2020 19:36:05 +0000 (14:36 -0500)]
5.31.0 release notes: added late changes

4 years ago5.31.0 release notes: misc edits
Andrew Hunt [Wed, 4 Nov 2020 18:58:05 +0000 (13:58 -0500)]
5.31.0 release notes: misc edits

4 years agoMerge pull request #18907 from alifrumin/2139
colemanw [Wed, 4 Nov 2020 13:55:08 +0000 (08:55 -0500)]
Merge pull request #18907 from alifrumin/2139

dev/core#2139 fix defaulting for multi-select custom fields

4 years agoMerge pull request #18919 from colemanw/searchKitValidate
Eileen McNaughton [Wed, 4 Nov 2020 06:14:49 +0000 (19:14 +1300)]
Merge pull request #18919 from colemanw/searchKitValidate

Search ext: Fix validation and saving on search admin screen

4 years agoCivi\Setup\DbUtil Fix CodeStyle
lasse [Wed, 4 Nov 2020 05:18:22 +0000 (06:18 +0100)]
Civi\Setup\DbUtil Fix CodeStyle

4 years agoSearch ext: Fix validation and saving on search admin screen
Coleman Watts [Wed, 4 Nov 2020 03:25:58 +0000 (22:25 -0500)]
Search ext: Fix validation and saving on search admin screen

4 years agoAdd UI metadata for payment_processor_id on financialTrxn
Matthew Wire [Tue, 3 Nov 2020 22:02:28 +0000 (22:02 +0000)]
Add UI metadata for payment_processor_id on financialTrxn

4 years agoMerge pull request #18914 from totten/master-auth-client
Eileen McNaughton [Tue, 3 Nov 2020 19:39:49 +0000 (08:39 +1300)]
Merge pull request #18914 from totten/master-auth-client

dev/core#2141 - Add "oauth-client" extension (hidden)

4 years agoMerge pull request #18864 from demeritcowboy/logz
Eileen McNaughton [Tue, 3 Nov 2020 19:34:49 +0000 (08:34 +1300)]
Merge pull request #18864 from demeritcowboy/logz

dev/core#2148 - Incorrect use of ts, quotes, escape in log call

4 years agoAdds performance improvement when browsing the logs
Vangelis Pantazis [Tue, 3 Nov 2020 17:29:08 +0000 (17:29 +0000)]
Adds performance improvement when browsing the logs

4 years agoMerge pull request #18915 from colemanw/entityPaths2
colemanw [Tue, 3 Nov 2020 17:10:49 +0000 (12:10 -0500)]
Merge pull request #18915 from colemanw/entityPaths2

Use standard names for entity paths and add a few more paths

4 years agoMerge pull request #18910 from totten/master-error-log
colemanw [Tue, 3 Nov 2020 16:44:34 +0000 (11:44 -0500)]
Merge pull request #18910 from totten/master-error-log

CRM_Core_Error::formatFooException - Don't bomb on 'Error'

4 years agoUse standard names from CRM_Core_Action for entity paths and add a few more paths
Coleman Watts [Tue, 3 Nov 2020 14:32:38 +0000 (09:32 -0500)]
Use standard names from CRM_Core_Action for entity paths and add a few more paths

For the sake of consistency, this changes the newly-added entity paths to follow the naming convention in CRM_Core_Action:
add/update/view/delete
instead of create/edit/view/delete

4 years agoMerge pull request #18909 from colemanw/searchDisplay2
colemanw [Tue, 3 Nov 2020 14:07:00 +0000 (09:07 -0500)]
Merge pull request #18909 from colemanw/searchDisplay2

Search ext: Add links to search admin and improve links in displays

4 years agooauth-client - Add basic UI to inspect/debug JWT-based tokens
Tim Otten [Tue, 3 Nov 2020 12:25:43 +0000 (04:25 -0800)]
oauth-client - Add basic UI to inspect/debug JWT-based tokens

4 years agodev/core#2141 - AuthorizationCode - Validate that the final return URL is internal
Tim Otten [Tue, 3 Nov 2020 03:36:14 +0000 (19:36 -0800)]
dev/core#2141 - AuthorizationCode - Validate that the final return URL is internal

4 years agooauth-client - Add menu item ("Admin: System Settings: OAuth")
Tim Otten [Tue, 3 Nov 2020 01:08:20 +0000 (17:08 -0800)]
oauth-client - Add menu item ("Admin: System Settings: OAuth")

4 years agodev/core#2141 - Basic UI for CRUD'ing clients
Tim Otten [Mon, 2 Nov 2020 06:17:06 +0000 (22:17 -0800)]
dev/core#2141 - Basic UI for CRUD'ing clients

4 years agooauth-client - Mark extension as hidden
Tim Otten [Mon, 2 Nov 2020 22:44:49 +0000 (14:44 -0800)]
oauth-client - Mark extension as hidden

4 years agodev/core#2141 - Set prompt=select_account whenever using MailSetup
Tim Otten [Mon, 2 Nov 2020 09:41:13 +0000 (01:41 -0800)]
dev/core#2141 - Set prompt=select_account whenever using MailSetup

If you're an admin setting up an email return-channel, then you may not
intend to use your normal email account.  It makes sense to always prompt
for the preferred account.

4 years agodev/core#2141 - If a mail-store has an OAuth2 token, then use it
Tim Otten [Sat, 31 Oct 2020 01:39:21 +0000 (18:39 -0700)]
dev/core#2141 - If a mail-store has an OAuth2 token, then use it

4 years agodev/core#2141 - Allow OAuth2 services to define mail setup routine
Tim Otten [Fri, 30 Oct 2020 08:39:58 +0000 (01:39 -0700)]
dev/core#2141 - Allow OAuth2 services to define mail setup routine

Overview
--------

For certain types of mail accounts -- such as Google Mail and Microsoft
Exchange Online -- the setup process may require interaction with a remote
web-service.

If you have OAuth2 enabled for one of these services, then this will create
an option for "Add Mail Account".

Before
------

There is no setup procedure.

After
-----

* Navigate to "Administer => CiviMail => Mail Accounts".
* Below the table, there is a select2 box for "Add Mail Account".
* If "Microsoft Exchange Online" is configured, then it will appear in the dropdown. Choose it.
* It redirects to MS to get authorization from the user (OAuth2 Authorization Code).
* The user comes back.
* We initialize a new mail account (`MailSettings` / `civicrm_mail_settings`)
* We accept the code and save the token (`OAuthSysToken`) with the account.
* We redirect to the account configuration form.

Technical Details
-----------------

The new mail account will have some details, such as `server`, `protocol`,
and `username` pre-filled.  This uses a template -- see e.g.
`providers/ms-exchange.dist.json` (`mailSettingsTemplate`).

4 years agodev/core#2141 - AuthorizationGrant - Upon return, emit hook & possible redirect
Tim Otten [Fri, 30 Oct 2020 07:13:35 +0000 (00:13 -0700)]
dev/core#2141 - AuthorizationGrant - Upon return, emit hook & possible redirect

4 years agodev/core#2141 - Add support for token-tagging to all grant flows
Tim Otten [Fri, 30 Oct 2020 00:58:01 +0000 (17:58 -0700)]
dev/core#2141 - Add support for token-tagging to all grant flows

Suppose you have a downstream app/module -- such as the Civi-IMAP app/module.  It needs to store a notation which says
"this thing in our data" (e.g.  `civicrm_mail_settings`) "corresponds to that token in the OAuth data".

It can put a tag on the token (`tag=civicrm_mail_settings:123`) and use that for lookup

```
$tag = `OAuthSysToken.refresh +w tag=civicrm_mail_settings:123`
```

The advantage of this is that it's simple, flexible, and doesn't require new schema.

Of course, it's not end-all/be-all.  It's OK for 1:1 relationship.  But if
you want 1:M or M:M, then you'll have to model that as something else.  But
for basic usage, tags are simple and moderately flexible.

4 years agodev/core#2141 - Add "local-redir" stub for use as OAuth2 "Redirect URL"
Tim Otten [Thu, 29 Oct 2020 01:47:42 +0000 (18:47 -0700)]
dev/core#2141 - Add "local-redir" stub for use as OAuth2 "Redirect URL"

If you are developing on a local HTTP system with virtual hosts, then many
OAuth2 services won't recognize it as a local/dev URL.

The "local-redir.sh" script runs a stub service that will be accepted as
a local/dev "Redirect URL".

4 years agodev/core#2141 - APIv4 - Add `OAuthClient.clientCredential` authentication
Tim Otten [Wed, 28 Oct 2020 22:32:05 +0000 (15:32 -0700)]
dev/core#2141 - APIv4 - Add `OAuthClient.clientCredential` authentication

4 years agodev/core#2141 - APIv4 - Add `OAuthClient.userPassword` authentication
Tim Otten [Wed, 28 Oct 2020 21:05:03 +0000 (14:05 -0700)]
dev/core#2141 - APIv4 - Add `OAuthClient.userPassword` authentication

4 years agodev/core#2141 - APIv4 - Add OAuthSysToken.refresh action
Tim Otten [Wed, 28 Oct 2020 08:39:15 +0000 (01:39 -0700)]
dev/core#2141 - APIv4 - Add OAuthSysToken.refresh action

4 years agodev/core#2141 - APIv4 - Add `OAuthClient.authorizationCode` authentication
Tim Otten [Wed, 28 Oct 2020 09:28:24 +0000 (02:28 -0700)]
dev/core#2141 - APIv4 - Add `OAuthClient.authorizationCode` authentication

4 years agodev/core#2141 - Update 'oauth2.league' to respect setting 'oauthClientRedirectUrl'
Tim Otten [Thu, 29 Oct 2020 00:08:29 +0000 (17:08 -0700)]
dev/core#2141 - Update 'oauth2.league' to respect setting 'oauthClientRedirectUrl'

4 years agodev/core#2141 - Add services 'oauth2.league' and 'oauth2.token'
Tim Otten [Tue, 27 Oct 2020 13:15:43 +0000 (06:15 -0700)]
dev/core#2141 - Add services 'oauth2.league' and 'oauth2.token'

4 years agodev/core#2141 - APIv4 - Expands tests for OAuthSysToken
Tim Otten [Tue, 27 Oct 2020 12:20:38 +0000 (05:20 -0700)]
dev/core#2141 - APIv4 - Expands tests for OAuthSysToken

4 years agodev/core#2141 - APIv4 - Validate OAuthClient.provider property
Tim Otten [Tue, 27 Oct 2020 11:16:10 +0000 (04:16 -0700)]
dev/core#2141 - APIv4 - Validate OAuthClient.provider property

4 years agodev/core#2141 - APIv4 - Add OAuthClient & OAuthSysToken with unit-test
Tim Otten [Tue, 27 Oct 2020 00:34:12 +0000 (17:34 -0700)]
dev/core#2141 - APIv4 - Add OAuthClient & OAuthSysToken with unit-test

4 years agodev/core#2141 - Schema - Add OAuthClient and OAuthSysToken
Tim Otten [Fri, 23 Oct 2020 05:46:03 +0000 (22:46 -0700)]
dev/core#2141 - Schema - Add OAuthClient and OAuthSysToken

Depends on OAuthProvider and permissions ('manage OAuth client' and 'manage OAuth client secrets')

4 years agodev/core#2141 - Split OAuthProvider files into subdirs. Use long cache.
Tim Otten [Fri, 30 Oct 2020 09:04:37 +0000 (02:04 -0700)]
dev/core#2141 - Split OAuthProvider files into subdirs. Use long cache.

4 years agodev/core#2141 - APIv4 - Add OAuthProvider.get w/test. Split dist/local/test lists.
Tim Otten [Tue, 27 Oct 2020 10:02:28 +0000 (03:02 -0700)]
dev/core#2141 - APIv4 - Add OAuthProvider.get w/test. Split dist/local/test lists.

4 years agodev/core#2141 - Permissions - Define 'manage OAuth client' and 'manage OAuth client...
Tim Otten [Mon, 26 Oct 2020 23:28:36 +0000 (16:28 -0700)]
dev/core#2141 - Permissions - Define 'manage OAuth client' and 'manage OAuth client secrets'

4 years agodev/core#2141 - Add upgrader to skeletal ext/oauth-client
Tim Otten [Fri, 30 Oct 2020 00:41:48 +0000 (17:41 -0700)]
dev/core#2141 - Add upgrader to skeletal ext/oauth-client

4 years agodev/core#2141 - Generate skeletal ext/oauth-client
Tim Otten [Sat, 24 Oct 2020 00:15:25 +0000 (17:15 -0700)]
dev/core#2141 - Generate skeletal ext/oauth-client

4 years agoMake civicrm-setup work with unix-socket as database connection
lasse [Tue, 3 Nov 2020 09:42:35 +0000 (10:42 +0100)]
Make civicrm-setup work with unix-socket as database connection

4 years agoMailSettings - Add button+API for testing a connection
Tim Otten [Tue, 3 Nov 2020 06:02:02 +0000 (22:02 -0800)]
MailSettings - Add button+API for testing a connection

4 years ago(NFC) CRM_Mailing_MailStore - Clarify return type
Tim Otten [Tue, 3 Nov 2020 06:01:22 +0000 (22:01 -0800)]
(NFC) CRM_Mailing_MailStore - Clarify return type

4 years agoCRM_Core_Error::formatFooException - Don't bomb on 'Error'
Tim Otten [Tue, 3 Nov 2020 05:54:45 +0000 (21:54 -0800)]
CRM_Core_Error::formatFooException - Don't bomb on 'Error'

PHP 7 updated the class hierarchy for exceptions. The top-level types for exceptions are now:

* class Throwable
* class Error extends Throwable
* class Exception extends Throwable

This patch fixes a problem when logging `Error`s, as in

```php
Civi::log()->warning('There was a problem', [
  'exception' => $e
]);
```

Before
------

If `$e` is an `Error`, it fails to log.

After
-----

It works whether `$e` is an `Error` or `Exception`.

See also: https://www.php.net/manual/en/language.errors.php7.php

4 years agoSearch ext: Add links to search admin and improve links in displays
Coleman Watts [Tue, 3 Nov 2020 02:16:17 +0000 (21:16 -0500)]
Search ext: Add links to search admin and improve links in displays

4 years agoMerge pull request #18908 from totten/master-composer-oauth
Seamus Lee [Tue, 3 Nov 2020 01:09:06 +0000 (12:09 +1100)]
Merge pull request #18908 from totten/master-composer-oauth

dev/core#2141 - composer.json - Require league/oauth2-{client,google}

4 years agoa couple problems
demeritcowboy [Tue, 27 Oct 2020 19:11:02 +0000 (15:11 -0400)]
a couple problems

4 years agocomposer.lock - Require league/oauth2-{client,google}
Tim Otten [Wed, 21 Oct 2020 22:15:43 +0000 (15:15 -0700)]
composer.lock - Require league/oauth2-{client,google}

4 years agocomposer.json - Require league/oauth2-{client,google}
Tim Otten [Wed, 21 Oct 2020 22:13:31 +0000 (15:13 -0700)]
composer.json - Require league/oauth2-{client,google}

Note: This oauth2-client matches the constraint that's declared in civixero, which (in my
local copy of `universe`) is the only published extension that uses the same library.

The oauth2-google is included because has special requirements around
'prompt' which conflict with `GenericProvider`. We could potentially resolve that other
ways (eg rework `CiviGenericProvider`), but this seems easier right now.

4 years agoMerge pull request #18904 from civicrm/5.31
Seamus Lee [Mon, 2 Nov 2020 20:03:49 +0000 (07:03 +1100)]
Merge pull request #18904 from civicrm/5.31

5.31

4 years agodev/core#2139 fix defaulting for multi-select custom fields
Alice Frumin [Mon, 2 Nov 2020 18:56:51 +0000 (12:56 -0600)]
dev/core#2139 fix defaulting for multi-select custom fields

4 years agoMerge pull request #18802 from eileenmcnaughton/refs
Matthew Wire [Mon, 2 Nov 2020 11:02:46 +0000 (11:02 +0000)]
Merge pull request #18802 from eileenmcnaughton/refs

dev/core#2043 Remove instance of pass-by-ref

4 years agoMerge pull request #18894 from eileenmcnaughton/cancel
Matthew Wire [Mon, 2 Nov 2020 11:01:55 +0000 (11:01 +0000)]
Merge pull request #18894 from eileenmcnaughton/cancel

Move call to update related pledges on contribution cancel to extension

4 years agoMerge pull request #18895 from eileenmcnaughton/ipn
Matthew Wire [Mon, 2 Nov 2020 11:00:40 +0000 (11:00 +0000)]
Merge pull request #18895 from eileenmcnaughton/ipn

Remove IPN reference to _relatedObjects, deprecate property

4 years agoMerge pull request #18896 from eileenmcnaughton/ipn2
Matthew Wire [Mon, 2 Nov 2020 11:00:07 +0000 (11:00 +0000)]
Merge pull request #18896 from eileenmcnaughton/ipn2

[Ref] Simplify params

4 years agoMerge pull request #18900 from eileenmcnaughton/entry
Matthew Wire [Mon, 2 Nov 2020 10:59:39 +0000 (10:59 +0000)]
Merge pull request #18900 from eileenmcnaughton/entry

[REF] Simplify use of shared code.

4 years agoMerge pull request #18903 from eileenmcnaughton/aip2
Matthew Wire [Mon, 2 Nov 2020 10:58:10 +0000 (10:58 +0000)]
Merge pull request #18903 from eileenmcnaughton/aip2

Remove deprecated code

4 years agoMerge pull request #18807 from jvos/postProcess-MessageTemplates
Matthew Wire [Mon, 2 Nov 2020 10:55:38 +0000 (10:55 +0000)]
Merge pull request #18807 from jvos/postProcess-MessageTemplates

Add postProcess hook to MessageTemplates

4 years agoMerge pull request #18899 from seamuslee001/composer_2x
Seamus Lee [Mon, 2 Nov 2020 08:41:37 +0000 (19:41 +1100)]
Merge pull request #18899 from seamuslee001/composer_2x

Update composer-download-plugin to v3.0.0 to support usage of composeā€¦

4 years agoMerge pull request #18901 from alifrumin/5.31rn
Seamus Lee [Mon, 2 Nov 2020 07:20:35 +0000 (18:20 +1100)]
Merge pull request #18901 from alifrumin/5.31rn

[NFC] 5.31 Release Notes - First Pass

4 years agoMerge pull request #18897 from eileenmcnaughton/ip3
Seamus Lee [Mon, 2 Nov 2020 06:50:56 +0000 (17:50 +1100)]
Merge pull request #18897 from eileenmcnaughton/ip3

[REF] Remove silly if