civicrm-core.git
3 years agoRemove unused variables/assigns from buildMembershipBlock function
Matthew Wire [Wed, 10 Mar 2021 12:28:12 +0000 (12:28 +0000)]
Remove unused variables/assigns from buildMembershipBlock function

3 years agoMerge pull request #19745 from eileenmcnaughton/member
Monish Deb [Wed, 10 Mar 2021 10:19:40 +0000 (15:49 +0530)]
Merge pull request #19745 from eileenmcnaughton/member

[REF] Remove now redundant code to set line item financial type

3 years agoMerge pull request #19774 from civicrm/5.36
Seamus Lee [Wed, 10 Mar 2021 07:23:14 +0000 (18:23 +1100)]
Merge pull request #19774 from civicrm/5.36

5.36

3 years agoMerge pull request #19773 from demeritcowboy/safe-foreignkey
Eileen McNaughton [Wed, 10 Mar 2021 04:29:31 +0000 (17:29 +1300)]
Merge pull request #19773 from demeritcowboy/safe-foreignkey

dev/core#2452 - Make upgrade to 5.36 more robust when creating foreign key

3 years agomake safer
demeritcowboy [Wed, 10 Mar 2021 02:44:57 +0000 (21:44 -0500)]
make safer

3 years agoMerge pull request #19771 from francescbassas/patch-17
Seamus Lee [Wed, 10 Mar 2021 01:52:00 +0000 (12:52 +1100)]
Merge pull request #19771 from francescbassas/patch-17

Enable translation for Contribution Ordinality options on Contribution Detail Report

3 years agoMerge pull request #19755 from eileenmcnaughton/sum_api
Eileen McNaughton [Wed, 10 Mar 2021 01:12:20 +0000 (14:12 +1300)]
Merge pull request #19755 from eileenmcnaughton/sum_api

dev/core#2415 Add api support for aggregate without group by

3 years agoMerge pull request #19772 from francescbassas/patch-18
Eileen McNaughton [Wed, 10 Mar 2021 01:11:41 +0000 (14:11 +1300)]
Merge pull request #19772 from francescbassas/patch-18

Enable translation for Contribution Ordinality options on Member Contribution Detail Report

3 years agoMerge pull request #19768 from demeritcowboy/grant-placeholder
Eileen McNaughton [Wed, 10 Mar 2021 00:57:49 +0000 (13:57 +1300)]
Merge pull request #19768 from demeritcowboy/grant-placeholder

dev/core#2411 - Fix placeholder text for grants.

3 years agoMerge pull request #19767 from colemanw/campaignPlaceholders
Eileen McNaughton [Wed, 10 Mar 2021 00:56:46 +0000 (13:56 +1300)]
Merge pull request #19767 from colemanw/campaignPlaceholders

Fix incorrect placeholder text on 'Create Campaign' form

3 years agoMerge pull request #19769 from MegaphoneJon/remove-unused
Eileen McNaughton [Wed, 10 Mar 2021 00:54:12 +0000 (13:54 +1300)]
Merge pull request #19769 from MegaphoneJon/remove-unused

[REF] remove unused code in recordFinancialAccounts

3 years agoEnable translation for Contribution Ordinality options on Member Contribution Detail...
francescbassas [Tue, 9 Mar 2021 23:53:30 +0000 (00:53 +0100)]
Enable translation for Contribution Ordinality options on Member Contribution Detail Report

3 years agoEnable translation for Contribution Ordinality options on Contribution Detail Report
francescbassas [Tue, 9 Mar 2021 23:51:14 +0000 (00:51 +0100)]
Enable translation for Contribution Ordinality options on Contribution Detail Report

3 years agoMerge pull request #19770 from agileware/CIVICRM-1679
Seamus Lee [Tue, 9 Mar 2021 23:40:24 +0000 (10:40 +1100)]
Merge pull request #19770 from agileware/CIVICRM-1679

Include the timezone for date values in the Activity iCal

3 years agoMerge pull request #19762 from agileware/CIVICRM-1676
Seamus Lee [Tue, 9 Mar 2021 23:40:07 +0000 (10:40 +1100)]
Merge pull request #19762 from agileware/CIVICRM-1676

Include the timezone for date values in the Event iCal

3 years agoFix test to teardown it's own mess
eileen [Tue, 9 Mar 2021 22:54:17 +0000 (11:54 +1300)]
Fix test to teardown it's own mess

This business of doing cleanup in the setup is an anti-pattern and
it actually adds some internal dependency - if you
run JUST the one test (conditions probably apply) it
falls over with a 'cannot find DSN'. Rather than track that
down that weirdness we should fix the tests to
tearDown in the teardown

3 years agoCIVICRM-1679 Include the timezone for date values in the Activity iCal
Justin Freeman [Tue, 9 Mar 2021 21:42:26 +0000 (08:42 +1100)]
CIVICRM-1679 Include the timezone for date values in the Activity iCal

3 years ago[REF] remove unused code in recordFinancialAccounts
Jon Goldberg [Tue, 9 Mar 2021 20:06:39 +0000 (15:06 -0500)]
[REF] remove unused code in recordFinancialAccounts

3 years agofix placeholder
demeritcowboy [Tue, 9 Mar 2021 19:58:18 +0000 (14:58 -0500)]
fix placeholder

3 years agoFix incorrect placeholder text on 'Create Campaign' form
Coleman Watts [Tue, 9 Mar 2021 19:04:23 +0000 (14:04 -0500)]
Fix incorrect placeholder text on 'Create Campaign' form

3 years agoMerge pull request #19732 from mlutfy/fixWpAnon
Mathieu Lu [Tue, 9 Mar 2021 18:19:07 +0000 (13:19 -0500)]
Merge pull request #19732 from mlutfy/fixWpAnon

WordPress: avoid PHP notice if the anonymous user does not have any capabilities

3 years agoMerge pull request #19733 from colemanw/exportUiCheckPerm
colemanw [Tue, 9 Mar 2021 16:33:53 +0000 (11:33 -0500)]
Merge pull request #19733 from colemanw/exportUiCheckPerm

Export UI - Only present "save mapping" button to permissioned users

3 years agoAdd api support for aggregate without group by
eileen [Mon, 8 Mar 2021 04:37:54 +0000 (17:37 +1300)]
Add api support for aggregate without group by

For example

SELECT SUM(amount) FROM civicrm_pledge

Should be doable with no group by if none is desired

3 years agoMerge pull request #19763 from civicrm/5.36
Eileen McNaughton [Tue, 9 Mar 2021 01:11:53 +0000 (14:11 +1300)]
Merge pull request #19763 from civicrm/5.36

5.36 to master

3 years agoMerge pull request #19736 from colemanw/empty
Eileen McNaughton [Tue, 9 Mar 2021 01:03:18 +0000 (14:03 +1300)]
Merge pull request #19736 from colemanw/empty

Add is empty filter to search / api

3 years agoCIVICRM-1676 Include the timezone for date values in the Event iCal
Justin Freeman [Tue, 9 Mar 2021 00:00:58 +0000 (11:00 +1100)]
CIVICRM-1676 Include the timezone for date values in the Event iCal

3 years agoAdd is empty filter to search / api
eileen [Tue, 2 Mar 2021 12:31:55 +0000 (01:31 +1300)]
Add is empty filter to search / api

This is already offered in Query
https://github.com/civicrm/civicrm-core/blob/5db2212e2d408f4611439734db1a31ab32dced2f/CRM/Contact/BAO/Query.php#L3420-L3428

And in Report
https://github.com/civicrm/civicrm-core/blob/c3fffe27cb8203634c7a2c047686ba3d12cc38bd/CRM/Report/Form.php#L2105-L2124

(the latter munges it in with NULL but as we often save empty strings NULL
does not alwasy work for strings)

3 years agoMerge pull request #19760 from civicrm/5.36
Seamus Lee [Mon, 8 Mar 2021 21:10:52 +0000 (08:10 +1100)]
Merge pull request #19760 from civicrm/5.36

5.36

3 years agoMerge pull request #19758 from colemanw/searchKitFix
Eileen McNaughton [Mon, 8 Mar 2021 20:11:42 +0000 (09:11 +1300)]
Merge pull request #19758 from colemanw/searchKitFix

SearchKit - Fix broken update dialog and add input type float

3 years agoMerge pull request #19729 from colemanw/coreExtCleanup
Mathieu Lu [Mon, 8 Mar 2021 20:01:34 +0000 (15:01 -0500)]
Merge pull request #19729 from colemanw/coreExtCleanup

Fix ts() namespace in searchKit & afform extensions

3 years agoSearchKit - Fix broken update dialog and add input type float
Coleman Watts [Mon, 8 Mar 2021 13:03:22 +0000 (08:03 -0500)]
SearchKit - Fix broken update dialog and add input type float

3 years agoFix ts() namespace in searchKit & afform extensions
Coleman Watts [Thu, 4 Mar 2021 15:37:04 +0000 (10:37 -0500)]
Fix ts() namespace in searchKit & afform extensions

3 years agoMerge pull request #19746 from eileenmcnaughton/mem_2
Seamus Lee [Mon, 8 Mar 2021 05:23:13 +0000 (16:23 +1100)]
Merge pull request #19746 from eileenmcnaughton/mem_2

[REF] Clean up code around is_email_receipt

3 years agoMerge pull request #19486 from eileenmcnaughton/pddemail
Seamus Lee [Mon, 8 Mar 2021 05:15:52 +0000 (16:15 +1100)]
Merge pull request #19486 from eileenmcnaughton/pddemail

dev/financial#162 Simplify isPdf code

3 years agoMerge pull request #19754 from eileenmcnaughton/api
Eileen McNaughton [Mon, 8 Mar 2021 04:42:08 +0000 (17:42 +1300)]
Merge pull request #19754 from eileenmcnaughton/api

Fix apiv4 test sloppiness

3 years agoMerge pull request #19751 from colemanw/readonly2
Eileen McNaughton [Mon, 8 Mar 2021 04:13:25 +0000 (17:13 +1300)]
Merge pull request #19751 from colemanw/readonly2

Add more 'readonly' tags to the schema for fields not intended to be editable by users

3 years agoFix apiv4 test sloppiness
eileen [Mon, 8 Mar 2021 03:07:51 +0000 (16:07 +1300)]
Fix apiv4 test sloppiness

Why would we exclude e-notices from causing test fails - I suspect this
canary-killer got added a long time back & no-one noticed

3 years agoMerge pull request #19752 from colemanw/searchKitSmartGroupCodeByeBye
Eileen McNaughton [Mon, 8 Mar 2021 02:35:35 +0000 (15:35 +1300)]
Merge pull request #19752 from colemanw/searchKitSmartGroupCodeByeBye

SearchKit - remove unused smartGroup code

3 years agoSearchKit - remove unused smartGroup code
Coleman Watts [Mon, 8 Mar 2021 00:32:37 +0000 (19:32 -0500)]
SearchKit - remove unused smartGroup code

3 years agoMerge pull request #19739 from colemanw/afformBreadcrumb
Eileen McNaughton [Sun, 7 Mar 2021 22:46:00 +0000 (11:46 +1300)]
Merge pull request #19739 from colemanw/afformBreadcrumb

Afform - Show breadcrumbs appropriate to whether a form can be edited

3 years agoMerge pull request #19750 from civicrm/5.36
Eileen McNaughton [Sun, 7 Mar 2021 21:12:01 +0000 (10:12 +1300)]
Merge pull request #19750 from civicrm/5.36

5.36 to master

3 years agoMerge pull request #19747 from colemanw/searchKitRemoveSelectWhenRemovingJoin
Eileen McNaughton [Sun, 7 Mar 2021 21:11:19 +0000 (10:11 +1300)]
Merge pull request #19747 from colemanw/searchKitRemoveSelectWhenRemovingJoin

SearchKit - Fix removing all related fields from SELECT when removing a JOIN

3 years agoAdd more 'readonly' tags to the schema for fields not intended to be editable by...
Coleman Watts [Sun, 7 Mar 2021 21:09:10 +0000 (16:09 -0500)]
Add more 'readonly' tags to the schema for fields not intended to be editable by users

3 years agoMerge pull request #19749 from civicrm/5.36
Eileen McNaughton [Sun, 7 Mar 2021 21:08:16 +0000 (10:08 +1300)]
Merge pull request #19749 from civicrm/5.36

5.36 to master

3 years agoMerge pull request #19740 from agh1/notnotnull
Eileen McNaughton [Sun, 7 Mar 2021 21:06:20 +0000 (10:06 +1300)]
Merge pull request #19740 from agh1/notnotnull

dev/translation#58 further regression fix: don't make group title NOT NULL even for a moment

3 years agoSearchKit - Fix removing all related fields from SELECT when removing a JOIN
Coleman Watts [Sun, 7 Mar 2021 02:42:35 +0000 (21:42 -0500)]
SearchKit - Fix removing all related fields from SELECT when removing a JOIN

3 years agoMerge pull request #19742 from totten/master-unused
colemanw [Sun, 7 Mar 2021 00:04:30 +0000 (19:04 -0500)]
Merge pull request #19742 from totten/master-unused

(REF) CRM_Upgrade_Form - Remove unused method getRevisionPart()

3 years agodev/translation#58 don\'t make group title NOT NULL even for a moment
Andrew Hunt [Fri, 5 Mar 2021 22:52:15 +0000 (17:52 -0500)]
dev/translation#58 don\'t make group title NOT NULL even for a moment

3 years ago[REF] Clean up code around is_email_receipt
eileen [Sat, 6 Mar 2021 19:56:55 +0000 (08:56 +1300)]
[REF] Clean up code around is_email_receipt

The is_email_receipt param is passed into legacyProcessRecurringContribution
but not used. It is also used to set now to receipt date which is then
only used in a loop that uses a more direct method to check
if an email receipt is used.

3 years ago[REF] Remove now redundant code to set line item financial type
eileen [Sat, 6 Mar 2021 19:34:28 +0000 (08:34 +1300)]
[REF] Remove now redundant code to set line item financial type

This is now done higher up. Test adds cover for this

3 years agoMerge pull request #19642 from demeritcowboy/case-views2
Eileen McNaughton [Sat, 6 Mar 2021 19:18:35 +0000 (08:18 +1300)]
Merge pull request #19642 from demeritcowboy/case-views2

dev/core#2385 and dev/core#2262 - Case db views are no longer needed

3 years agocase db views no longer needed
demeritcowboy [Sun, 21 Feb 2021 16:46:51 +0000 (11:46 -0500)]
case db views no longer needed

3 years agoSearchKit - Add breadcrumb to saved searches from search display view
Coleman Watts [Sat, 6 Mar 2021 16:36:38 +0000 (11:36 -0500)]
SearchKit - Add breadcrumb to saved searches from search display view

3 years agoAfform - simplify code to check if ext enabled
Coleman Watts [Thu, 4 Mar 2021 13:30:43 +0000 (08:30 -0500)]
Afform - simplify code to check if ext enabled

3 years agoAfform - Show breadcrumbs appropriate to whether a form can be edited
Coleman Watts [Fri, 5 Mar 2021 15:32:42 +0000 (10:32 -0500)]
Afform - Show breadcrumbs appropriate to whether a form can be edited

3 years ago(REF) CRM_Upgrade_Form - Remove unused method getRevisionPart()
Tim Otten [Sat, 6 Mar 2021 07:39:12 +0000 (23:39 -0800)]
(REF) CRM_Upgrade_Form - Remove unused method getRevisionPart()

3 years agoMerge pull request #19724 from alexymik/patch-2
Tim Otten [Fri, 5 Mar 2021 04:58:47 +0000 (20:58 -0800)]
Merge pull request #19724 from alexymik/patch-2

Update SocialNetwork.tpl Twitter Intent URL

3 years agoMerge pull request #19734 from colemanw/api4ExplorerLayout
Eileen McNaughton [Fri, 5 Mar 2021 04:22:57 +0000 (17:22 +1300)]
Merge pull request #19734 from colemanw/api4ExplorerLayout

APIv4 Explorer - Fix layout in code tab

3 years agoMerge pull request #19735 from demeritcowboy/case-custom-origblank
Eileen McNaughton [Fri, 5 Mar 2021 04:22:19 +0000 (17:22 +1300)]
Merge pull request #19735 from demeritcowboy/case-custom-origblank

dev/core#2019 - Changing a case custom field from blank to something doesn't show properly what changed

3 years agoMerge pull request #19731 from civicrm/5.36
Eileen McNaughton [Fri, 5 Mar 2021 04:17:01 +0000 (17:17 +1300)]
Merge pull request #19731 from civicrm/5.36

5.36

3 years agoMerge pull request #19713 from colemanw/searchDisplayParams
colemanw [Fri, 5 Mar 2021 02:45:54 +0000 (21:45 -0500)]
Merge pull request #19713 from colemanw/searchDisplayParams

SearchKit - Take search filters from the url when viewing a standalone display

3 years agoAPIv4 Explorer - Fix layout in code tab
Coleman Watts [Thu, 4 Mar 2021 22:25:37 +0000 (17:25 -0500)]
APIv4 Explorer - Fix layout in code tab

3 years agoExport UI - Only present "save mapping" button to permissioned users
Coleman Watts [Thu, 4 Mar 2021 21:53:21 +0000 (16:53 -0500)]
Export UI - Only present "save mapping" button to permissioned users

The button was showing for all users which would result in confusion when it didn't work because they lacked permission.
Currently the APIv3 Mapping.create api requires "administer CiviCRM." I don't know if that's right or if there's another
permission it ought to be checking, but at least this brings the UI in alignment with what's currently allowed.

3 years agoWordPress: avoid PHP notice if the anonymous user does not have any capabilities
Mathieu Lutfy [Thu, 4 Mar 2021 21:34:33 +0000 (16:34 -0500)]
WordPress: avoid PHP notice if the anonymous user does not have any capabilities

3 years agoMerge pull request #19580 from MegaphoneJon/core-1132
colemanw [Thu, 4 Mar 2021 20:52:24 +0000 (15:52 -0500)]
Merge pull request #19580 from MegaphoneJon/core-1132

core#1132 - don't fire hook_civicrm_fieldOptions before hook_civicrm_…

3 years agoSearchKit - Allow variations of field suffix in display filters
Coleman Watts [Thu, 4 Mar 2021 17:58:15 +0000 (12:58 -0500)]
SearchKit - Allow variations of field suffix in display filters

3 years agoSearchKit - Take search filters from the url when viewing a standalone searchDisplay
Coleman Watts [Tue, 2 Mar 2021 20:37:16 +0000 (15:37 -0500)]
SearchKit - Take search filters from the url when viewing a standalone searchDisplay

This passes through all query params from the url fragment as search filters to the display.

3 years agoSet version to 5.37.alpha1
CiviCRM [Thu, 4 Mar 2021 06:59:12 +0000 (06:59 +0000)]
Set version to 5.37.alpha1

3 years agoSet version to 5.36.beta1
CiviCRM [Thu, 4 Mar 2021 06:55:34 +0000 (06:55 +0000)]
Set version to 5.36.beta1

3 years agoMerge pull request #19691 from colemanw/afformEditLink
Eileen McNaughton [Thu, 4 Mar 2021 06:52:46 +0000 (19:52 +1300)]
Merge pull request #19691 from colemanw/afformEditLink

Afform - Add link to edit form in breadcrumbs

3 years agoMerge pull request #19726 from seamuslee001/5.35
Seamus Lee [Thu, 4 Mar 2021 04:54:49 +0000 (15:54 +1100)]
Merge pull request #19726 from seamuslee001/5.35

5.35

3 years agoMerge pull request #19725 from totten/5.35-avail-perm
Tim Otten [Thu, 4 Mar 2021 04:40:16 +0000 (20:40 -0800)]
Merge pull request #19725 from totten/5.35-avail-perm

dev/drupal#156 - system_get_info() is gone in Drupal 9

3 years ago(NFC) release-notes/5.35.0 - Last minute update
Tim Otten [Thu, 4 Mar 2021 04:28:34 +0000 (20:28 -0800)]
(NFC) release-notes/5.35.0 - Last minute update

3 years agosystem_get_info is deprecated
demeritcowboy [Thu, 11 Feb 2021 18:35:15 +0000 (13:35 -0500)]
system_get_info is deprecated

3 years agoMerge pull request #19720 from colemanw/afformSearchFilters
Eileen McNaughton [Thu, 4 Mar 2021 03:37:53 +0000 (16:37 +1300)]
Merge pull request #19720 from colemanw/afformSearchFilters

Improve search display filter validation

3 years agoSearchKit - Validate all filters as belonging to select clause or afform
Coleman Watts [Wed, 3 Mar 2021 20:04:38 +0000 (15:04 -0500)]
SearchKit - Validate all filters as belonging to select clause or afform

When viewing a SearchDisplay, this will verify all filters are permitted by first checking the SELECT clause,
and secondly checking for a containing Afform with exposed filters.

All other filter params will be silently ignored.

3 years agoAfform - use form-level permissions in APIv4 Afform::get
Coleman Watts [Wed, 3 Mar 2021 16:48:27 +0000 (11:48 -0500)]
Afform - use form-level permissions in APIv4 Afform::get

3 years agoMerge pull request #19723 from eileenmcnaughton/price
Seamus Lee [Thu, 4 Mar 2021 01:46:54 +0000 (12:46 +1100)]
Merge pull request #19723 from eileenmcnaughton/price

dev/core#2434 Fix price set id widget

3 years agoUpdate SocialNetwork.tpl Twitter Intent URL
Alexy Mikhailichenko [Thu, 4 Mar 2021 01:43:56 +0000 (17:43 -0800)]
Update SocialNetwork.tpl Twitter Intent URL

3 years agoMerge pull request #19709 from eileenmcnaughton/ss
colemanw [Thu, 4 Mar 2021 01:28:29 +0000 (20:28 -0500)]
Merge pull request #19709 from eileenmcnaughton/ss

dev/core#2422 Add created_id, modified_id, expires_date to saved search table

3 years agodev/core#2434 Fix price set id widget
eileen [Wed, 3 Mar 2021 20:19:28 +0000 (09:19 +1300)]
dev/core#2434 Fix price set id widget

3 years agoMerge pull request #19722 from civicrm/5.35
Eileen McNaughton [Wed, 3 Mar 2021 23:41:58 +0000 (12:41 +1300)]
Merge pull request #19722 from civicrm/5.35

5.35

3 years agoMerge pull request #19721 from agh1/5.35.0-releasenotes-final
Seamus Lee [Wed, 3 Mar 2021 23:27:55 +0000 (10:27 +1100)]
Merge pull request #19721 from agh1/5.35.0-releasenotes-final

5.35.0 release notes: added late changes

3 years ago5.35.0 release notes: added late changes
Andrew Hunt [Wed, 3 Mar 2021 23:25:48 +0000 (18:25 -0500)]
5.35.0 release notes: added late changes

3 years agoMerge pull request #19476 from eileenmcnaughton/mem_tax
colemanw [Wed, 3 Mar 2021 22:11:11 +0000 (17:11 -0500)]
Merge pull request #19476 from eileenmcnaughton/mem_tax

Fix membership form to correctly calculate tax when a discount is applied

3 years agoMerge pull request #19715 from mattwire/tokenclean
Tim Otten [Wed, 3 Mar 2021 19:37:37 +0000 (11:37 -0800)]
Merge pull request #19715 from mattwire/tokenclean

NFC Update comments in token classes

3 years agoAdd description to saved search
eileen [Wed, 3 Mar 2021 06:23:29 +0000 (19:23 +1300)]
Add description to saved search

3 years agoUpdate comments in token classes
Matthew Wire [Wed, 3 Mar 2021 11:00:33 +0000 (11:00 +0000)]
Update comments in token classes

3 years agoMerge pull request #19590 from totten/master-authx
Seamus Lee [Wed, 3 Mar 2021 07:04:55 +0000 (18:04 +1100)]
Merge pull request #19590 from totten/master-authx

AuthX - Extended authentication support (portable and router-friendly)

3 years agoAlso add created_date & modified_date per discussion on pr
eileen [Tue, 2 Mar 2021 10:40:15 +0000 (23:40 +1300)]
Also add created_date & modified_date per discussion on pr

3 years agodev/core#2422 Add created_id, modified_id, expires_date to saved search table
eileen [Tue, 2 Mar 2021 04:52:18 +0000 (17:52 +1300)]
dev/core#2422 Add created_id, modified_id, expires_date to saved search table

Per

https://lab.civicrm.org/dev/core/-/issues/2422

These can be exposed in the search kit saved search listing as filters when
we get to that point but the earlier we start
saving them the better the data will be when we do expose

3 years agoMerge pull request #19714 from civicrm/5.35
Eileen McNaughton [Wed, 3 Mar 2021 03:48:15 +0000 (16:48 +1300)]
Merge pull request #19714 from civicrm/5.35

5.35

3 years agoMerge pull request #19703 from colemanw/afformStandalone
Tim Otten [Wed, 3 Mar 2021 03:19:08 +0000 (19:19 -0800)]
Merge pull request #19703 from colemanw/afformStandalone

Afform - Remove ngRoute from afformStandalone page

3 years agoMerge pull request #19711 from totten/5.35-upg-smtp
Seamus Lee [Wed, 3 Mar 2021 00:58:11 +0000 (11:58 +1100)]
Merge pull request #19711 from totten/5.35-upg-smtp

Upgrader (5.34) - Handle unsavable characters in decoded SMTP password

3 years agoMerge pull request #19684 from totten/master-authors
Eileen McNaughton [Tue, 2 Mar 2021 21:49:49 +0000 (10:49 +1300)]
Merge pull request #19684 from totten/master-authors

info.xml - Allow multiple `<author>`s

3 years agodon't try to convert blanks
demeritcowboy [Tue, 2 Mar 2021 21:32:32 +0000 (16:32 -0500)]
don't try to convert blanks

3 years agoMerge pull request #19712 from eileenmcnaughton/merge
Eileen McNaughton [Tue, 2 Mar 2021 20:31:36 +0000 (09:31 +1300)]
Merge pull request #19712 from eileenmcnaughton/merge

5.35 to master

3 years agoMerge branch '5.35' of https://github.com/civicrm/civicrm-core into merge
eileen [Tue, 2 Mar 2021 20:18:02 +0000 (09:18 +1300)]
Merge branch '5.35' of https://github.com/civicrm/civicrm-core into merge

3 years ago(REF) authx - Reorganize internal methods to use an auth-request object
Tim Otten [Fri, 26 Feb 2021 04:18:42 +0000 (20:18 -0800)]
(REF) authx - Reorganize internal methods to use an auth-request object

This significantly trims down the `auth()` method and rearranges as three
methods. A data object is passed between the three methods. The main method:

```
    if ($principal = $this->checkCredential($tgt)) {
      $tgt->setPrincipal($principal);
    }
    $this->checkPolicy($tgt);
    $this->login($tgt);
```

This arrangement lays the groundwork for implementing more varied policies.
For example, we could have a policy where the ability to login via
username/password/api_key is dictated by the user's role or permissions.

3 years ago(REF) Authenticator - Extract field $authxUf
Tim Otten [Fri, 26 Feb 2021 01:57:09 +0000 (17:57 -0800)]
(REF) Authenticator - Extract field $authxUf