civicrm-core.git
3 years agoMerge pull request #18818 from civicrm/5.31
Eileen McNaughton [Wed, 21 Oct 2020 09:22:19 +0000 (22:22 +1300)]
Merge pull request #18818 from civicrm/5.31

5.31

3 years agoMerge pull request #18822 from totten/master-prevnexttest
Eileen McNaughton [Wed, 21 Oct 2020 09:21:38 +0000 (22:21 +1300)]
Merge pull request #18822 from totten/master-prevnexttest

(NFC) dev/core#2029 - Make assertions in PrevNextTest more skimmable

3 years agoMerge pull request #18740 from eileenmcnaughton/hook
Monish Deb [Wed, 21 Oct 2020 07:13:56 +0000 (12:43 +0530)]
Merge pull request #18740 from eileenmcnaughton/hook

dev/core#2115 Move some more financialacl code to a hook within the extension

3 years ago(NFC) dev/core#2029 - Make assertions in PrevNextTest more skimmable
Tim Otten [Wed, 21 Oct 2020 05:41:37 +0000 (22:41 -0700)]
(NFC) dev/core#2029 - Make assertions in PrevNextTest more skimmable

Overview
--------

The test appears to have a random failure. Making it more readable may help figure out why.

Before
------

`testDeleteByCacheKey()` and the related `testFillArray()` both have some assertions in these two forms:

```
// Form #1, more verbose
$all = ...getSelections($cacheKey, $action);
$this->assertEquals([...expected...], array_keys($all)...);

// Form #2, more pithy
$this->assertSelections([...expected...], $action, $cacheKey);
```

After
-----

The verbose form is replaced with the pithier form.

In the pithier form, some of the default inputs are made explicit.

Comment
-------

It is confusing that the method `getSelections()` has a parameter `$action`
which can be `get` or `getall` -- and that `getall` does not (in fact) return
selections.  It returns all!  (The fact that the contract is weird makes the
unit-test helpful imho...)

3 years agoMerge pull request #18815 from eileenmcnaughton/recursoft
Seamus Lee [Wed, 21 Oct 2020 05:26:02 +0000 (16:26 +1100)]
Merge pull request #18815 from eileenmcnaughton/recursoft

dev/financial#152 move code only relevant to repeattransaction into that function

3 years agoMerge pull request #18812 from eileenmcnaughton/en
Eileen McNaughton [Wed, 21 Oct 2020 05:02:04 +0000 (18:02 +1300)]
Merge pull request #18812 from eileenmcnaughton/en

dev/core#927 Enable contribution cancel actions extension

3 years agoMerge pull request #18817 from seamuslee001/5-30-1-notes
Seamus Lee [Wed, 21 Oct 2020 04:59:55 +0000 (15:59 +1100)]
Merge pull request #18817 from seamuslee001/5-30-1-notes

release-notes/5.30.1.md

3 years agorelease-notes/5.30.1.md
Tim Otten [Wed, 21 Oct 2020 04:04:24 +0000 (21:04 -0700)]
release-notes/5.30.1.md

3 years agoMerge pull request #18805 from eileenmcnaughton/date
Seamus Lee [Wed, 21 Oct 2020 04:09:44 +0000 (15:09 +1100)]
Merge pull request #18805 from eileenmcnaughton/date

Rationalise date formatting

3 years agoEnable contribution cancel actions
eileen [Tue, 20 Oct 2020 22:56:52 +0000 (11:56 +1300)]
Enable contribution cancel actions

Once completed this extension will be unhidden and available to disable

3 years agoMerge pull request #18811 from colemanw/savedSearchIndex
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

3 years agodev/financial#152 move code only relevant to repeattransaction into that function
eileen [Wed, 21 Oct 2020 00:25:29 +0000 (13:25 +1300)]
dev/financial#152 move code only relevant to repeattransaction into that function

Per https://github.com/civicrm/civicrm-core/pull/18814 I dug into this addRecurSoftCredits and
it simply copies soft credits from the first transaction in the series to the new one. As such
it belongs in repeattransaction not the main body of completeOrder

3 years agoMerge pull request #18786 from eileenmcnaughton/cancelextwtest
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

3 years agoSavedSearch: add UI_name index to upgrade script
Coleman Watts [Tue, 20 Oct 2020 21:19:57 +0000 (17:19 -0400)]
SavedSearch: add UI_name index to upgrade script

3 years agoMerge pull request #18806 from eileenmcnaughton/constant
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

3 years agoMerge pull request #18804 from eileenmcnaughton/manual
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

3 years agoAdd initial test to the new extension
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.

3 years agoMerge pull request #18803 from eileenmcnaughton/canceltest
Seamus Lee [Tue, 20 Oct 2020 19:50:50 +0000 (06:50 +1100)]
Merge pull request #18803 from eileenmcnaughton/canceltest

Remove always-true IF

3 years agoMerge pull request #18784 from eileenmcnaughton/cancelext
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

3 years agoRationalise date formatting
eileen [Tue, 20 Oct 2020 01:54:27 +0000 (14:54 +1300)]
Rationalise date formatting

This came out of discovering a place in the code was 'accidentally formatted correctly'
and finding it far too hard to figure out the right way to specify the date formatting -
something that seems confirmed by finding various places with hard-coded date formattin
rather than using the setting

3 years agoMerge pull request #18809 from colemanw/savedSearchName
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

3 years agoSavedSearch - Add name and label columns
Coleman Watts [Tue, 20 Oct 2020 13:39:02 +0000 (09:39 -0400)]
SavedSearch - Add name and label columns

3 years agoUpdate CRM_Utils_Constant::value to support env variables
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)

3 years agoMerge pull request #18645 from seamuslee001/frontend_group
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…

3 years agoDeclare support for cancelRecurring in manual processor
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

3 years agoRemove always-true IF
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'

3 years agoMerge pull request #18801 from eileenmcnaughton/canceltest
Seamus Lee [Tue, 20 Oct 2020 00:35:36 +0000 (11:35 +1100)]
Merge pull request #18801 from eileenmcnaughton/canceltest

Remove always true if

3 years agoMerge pull request #18800 from agh1/5.31.0-releasenotes-initial
Seamus Lee [Mon, 19 Oct 2020 21:06:57 +0000 (08:06 +1100)]
Merge pull request #18800 from agh1/5.31.0-releasenotes-initial

5.31.0 release notes initial run

3 years agoRemove 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

3 years agoMerge pull request #18790 from eileenmcnaughton/canceltest
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

3 years agoMerge pull request #18798 from eileenmcnaughton/memtest
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

3 years agoMerge pull request #18797 from eileenmcnaughton/apim
Eileen McNaughton [Mon, 19 Oct 2020 19:20:55 +0000 (08:20 +1300)]
Merge pull request #18797 from eileenmcnaughton/apim

Switch to calling api

3 years ago5.31.0 release notes: added boilerplate
Andrew Hunt [Mon, 19 Oct 2020 15:22:06 +0000 (11:22 -0400)]
5.31.0 release notes: added boilerplate

3 years ago5.31.0 release notes: raw from script
Andrew Hunt [Mon, 19 Oct 2020 15:18:21 +0000 (11:18 -0400)]
5.31.0 release notes: raw from script

3 years agoMerge pull request #18796 from eileenmcnaughton/api3
colemanw [Mon, 19 Oct 2020 11:55:58 +0000 (07:55 -0400)]
Merge pull request #18796 from eileenmcnaughton/api3

Switch to calling the api

3 years agoMerge pull request #18785 from eileenmcnaughton/status
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

3 years agoMerge pull request #18789 from jitendrapurohit/emailcc
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

3 years agoReplace BAO calls with api calls in test class
eileen [Mon, 19 Oct 2020 08:10:24 +0000 (21:10 +1300)]
Replace BAO calls with api calls in test class

3 years agoMerge pull request #18795 from eileenmcnaughton/api
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

3 years agoSwitch to calling api
eileen [Mon, 19 Oct 2020 07:18:12 +0000 (20:18 +1300)]
Switch to calling api

Test cover in
CRM_Member_BAO_MembershipTest::testMembershipUpdateDoesNotDeleteRelatedMembershipsByMistake

3 years agoMerge pull request #18791 from eileenmcnaughton/statusm
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

3 years agoSwitch to calling the api
eileen [Mon, 19 Oct 2020 06:48:45 +0000 (19:48 +1300)]
Switch to calling the api

Test cover in
api_v3_ContactTest.testMergeOrganizations

3 years agoMerge pull request #18739 from eileenmcnaughton/ef
Eileen McNaughton [Mon, 19 Oct 2020 06:08:35 +0000 (19:08 +1300)]
Merge pull request #18739 from eileenmcnaughton/ef

[Ref] Minor code extraction

3 years agoAdd test for recurring links and clean up method of retrieving recurring
eileen [Sun, 18 Oct 2020 23:14:53 +0000 (12:14 +1300)]
Add test for recurring links and clean up method of retrieving recurring

3 years ago[Test] - Fix some tests to call API not BAO
eileen [Mon, 19 Oct 2020 04:56:12 +0000 (17:56 +1300)]
[Test] - Fix some tests to call API not BAO

3 years agoRemove instances of variable variables
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

3 years agoFix sendconfirmation api to respect cc and bcc set in params
Jitendra Purohit [Sun, 11 Oct 2020 13:40:04 +0000 (19:10 +0530)]
Fix sendconfirmation api to respect cc and bcc set in params

3 years agoMerge pull request #18788 from civicrm/5.31
Eileen McNaughton [Sat, 17 Oct 2020 05:42:14 +0000 (18:42 +1300)]
Merge pull request #18788 from civicrm/5.31

5.31

3 years agoMerge pull request #18540 from eileenmcnaughton/paypal
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

3 years agoMerge pull request #18766 from eileenmcnaughton/basic
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

3 years agoMerge pull request #18773 from eileenmcnaughton/url
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

3 years agoMerge pull request #18783 from eileenmcnaughton/distinct
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

3 years agodev/core#927 Add shell extension to move contribution cancel actions into
eileen [Fri, 16 Oct 2020 03:35:33 +0000 (16:35 +1300)]
dev/core#927 Add shell extension to move contribution cancel actions into

3 years agounit test for #18306 - order create api test for contribution
Jitendra Purohit [Wed, 7 Oct 2020 11:49:37 +0000 (17:19 +0530)]
unit test for #18306 - order create api test for contribution

3 years agodev/core#2066 Further cleanup on search actions
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

3 years agoMerge pull request #17568 from agileware/CIVICRM-1496
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

3 years agoMerge pull request #18778 from colemanw/plurals
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'

3 years agoFix 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'

3 years agoMerge pull request #18777 from civicrm/5.31
Eileen McNaughton [Thu, 15 Oct 2020 07:47:46 +0000 (20:47 +1300)]
Merge pull request #18777 from civicrm/5.31

5.31

3 years agoCIVICRM-1496 Reword text on the contribution confirmation page
Pengyi Zhang [Wed, 10 Jun 2020 05:52:21 +0000 (15:52 +1000)]
CIVICRM-1496 Reword text on the contribution confirmation page

3 years agoMerge pull request #18776 from seamuslee001/dev_core_2125
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…

3 years agoMerge pull request #18775 from colemanw/searchRefactor
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

3 years agodev/core#2125 Ensure that the id that is used in the field is the group id not the...
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

3 years agoMerge pull request #18411 from MegaphoneJon/pcp-wysiwyg
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

3 years agoMerge pull request #18400 from aydun/class_api_tweak_2
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.

3 years agoMerge pull request #18774 from civicrm/5.31
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

3 years agoMerge pull request #18765 from totten/5.31-res-alias
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

3 years agoMerge pull request #18761 from MegaphoneJon/event43-test
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

3 years agodev/core#2066 Use shared function to set the next url
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

3 years agoSearch ext: Support is_deleted field but not api_key or hash
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

3 years agoSearch ext: Add settingsCallback to searchAdmin module
Coleman Watts [Tue, 13 Oct 2020 21:47:38 +0000 (17:47 -0400)]
Search ext: Add settingsCallback to searchAdmin module

3 years agoSearch ext: Reorganize into searchAdmin and searchActions modules
Coleman Watts [Tue, 13 Oct 2020 15:54:36 +0000 (11:54 -0400)]
Search ext: Reorganize into searchAdmin and searchActions modules

3 years agoMerge pull request #18770 from civicrm/5.31
Eileen McNaughton [Wed, 14 Oct 2020 09:48:33 +0000 (22:48 +1300)]
Merge pull request #18770 from civicrm/5.31

5.31

3 years agoMerge pull request #18768 from eileenmcnaughton/ids
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

3 years agoMerge pull request #18767 from eileenmcnaughton/task
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

3 years agoMerge pull request #18763 from eileenmcnaughton/531
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

3 years agoMerge pull request #18449 from colemanw/multiValueAutocomplete
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

3 years agoMerge pull request #18764 from civicrm/5.31
Seamus Lee [Wed, 14 Oct 2020 08:59:09 +0000 (19:59 +1100)]
Merge pull request #18764 from civicrm/5.31

5.31

3 years agoMerge pull request #18581 from demeritcowboy/requirements-check
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

3 years agodev/core#2066 Extract getSelectedIDs
eileen [Wed, 14 Oct 2020 04:19:22 +0000 (17:19 +1300)]
dev/core#2066 Extract getSelectedIDs

3 years agodev/core#2066 Use shared function to set the next url
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 ....

3 years agoFix unreleased regression on search tasks from basic search
eileen [Wed, 14 Oct 2020 03:41:19 +0000 (16:41 +1300)]
Fix unreleased regression on search tasks from basic search

3 years agoTest for event#43
Jon Goldberg [Tue, 13 Oct 2020 23:10:25 +0000 (19:10 -0400)]
Test for event#43

3 years agoMerge pull request #18762 from demeritcowboy/all-ALL
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

3 years agoMerge pull request #18758 from mlutfy/event43rc
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

3 years agodev/core#2119 Fix mailig code to exclude deleted recipients
eileen [Wed, 14 Oct 2020 01:51:04 +0000 (14:51 +1300)]
dev/core#2119 Fix mailig code to exclude deleted recipients

3 years agodev/core#2117 - scriptFile, styleFile - Automatically register URL aliases
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.

3 years agodev/core#2117 - Resources - Allow each snippet to have `aliases`
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.

3 years agomake sure we're `all` on the same page
demeritcowboy [Tue, 13 Oct 2020 23:21:01 +0000 (19:21 -0400)]
make sure we're `all` on the same page

3 years agoMerge pull request #18757 from civicrm/5.31
Eileen McNaughton [Tue, 13 Oct 2020 23:07:09 +0000 (12:07 +1300)]
Merge pull request #18757 from civicrm/5.31

5.31

3 years agoMerge pull request #18754 from colemanw/angularPerms
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

3 years agodev/event#43 Contact Dashboard: fix Event Participations
Mathieu Lutfy [Tue, 13 Oct 2020 19:51:58 +0000 (15:51 -0400)]
dev/event#43 Contact Dashboard: fix Event Participations

3 years agoMerge pull request #18753 from agh1/placeholderfix-5.31
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)

3 years agoMerge pull request #18756 from civicrm/5.31
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

3 years agoMerge pull request #18751 from demeritcowboy/utf8convert-triggers
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

3 years agoMerge pull request #18750 from eileenmcnaughton/weird
Eileen McNaughton [Tue, 13 Oct 2020 19:14:33 +0000 (08:14 +1300)]
Merge pull request #18750 from eileenmcnaughton/weird

Extract setNextUrl

3 years agoAngular Loader: Allow modules to specify permissions to add client-side
Coleman Watts [Tue, 13 Oct 2020 12:52:34 +0000 (08:52 -0400)]
Angular Loader: Allow modules to specify permissions to add client-side

3 years agoMerge pull request #18749 from totten/master-crmMailing-factory
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

3 years agodev/core#2118 supply better automatic placeholders for select
Andrew Hunt [Tue, 13 Oct 2020 16:15:38 +0000 (12:15 -0400)]
dev/core#2118 supply better automatic placeholders for select

3 years agorebuild triggers after utf8mb4 conversion
demeritcowboy [Tue, 13 Oct 2020 15:14:39 +0000 (11:14 -0400)]
rebuild triggers after utf8mb4 conversion