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

4 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

4 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

4 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

4 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

4 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

4 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

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

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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

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

4 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

4 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

4 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

4 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

4 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

4 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

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

4 years agoMerge pull request #18721 from artfulrobot/artfulrobot-relcache-utf8
colemanw [Tue, 13 Oct 2020 15:14:15 +0000 (11:14 -0400)]
Merge pull request #18721 from artfulrobot/artfulrobot-relcache-utf8

Remove explicit COLLATE utf8_bin from RelationshipCache trigger

4 years agoCRM_Mailing_Info - Init Angular data via `settingsFactory` instead of `settings`
Tim Otten [Tue, 13 Oct 2020 02:53:27 +0000 (19:53 -0700)]
CRM_Mailing_Info - Init Angular data via `settingsFactory` instead of `settings`

4 years agoCRM_Mailing_Info - Extract method 'createAngularSettings()'
Tim Otten [Tue, 13 Oct 2020 02:52:09 +0000 (19:52 -0700)]
CRM_Mailing_Info - Extract method 'createAngularSettings()'

4 years agoMerge pull request #18731 from colemanw/angularSettingsFactory
colemanw [Tue, 13 Oct 2020 12:04:56 +0000 (08:04 -0400)]
Merge pull request #18731 from colemanw/angularSettingsFactory

AngularLoader: Support 'settingsFactory' callbacks in angular modules.

4 years agoReplace hard-coded utf8_bin with binary in-use collation
Rich Lott / Artful Robot [Tue, 13 Oct 2020 09:39:35 +0000 (10:39 +0100)]
Replace hard-coded utf8_bin with binary in-use collation

4 years agoExtract setNextUrl
eileen [Tue, 13 Oct 2020 07:05:59 +0000 (20:05 +1300)]
Extract setNextUrl

This code is repeated all over the task sub system. This is a first attempt to
extract it on the parent class in order to start consolidating it

4 years agoMerge pull request #18747 from eileenmcnaughton/aip2
Eileen McNaughton [Tue, 13 Oct 2020 02:07:05 +0000 (15:07 +1300)]
Merge pull request #18747 from eileenmcnaughton/aip2

[REF] Replace long if block with early return

4 years ago[REF] Replace long if block with early return
eileen [Mon, 12 Oct 2020 23:41:28 +0000 (12:41 +1300)]
[REF] Replace long if block with early return

4 years agoMerge pull request #18744 from eileenmcnaughton/aip
Seamus Lee [Mon, 12 Oct 2020 23:08:20 +0000 (10:08 +1100)]
Merge pull request #18744 from eileenmcnaughton/aip

dev/financial#152 simplify passed parameters

4 years agoMerge pull request #18743 from vingle/patch-9
Eileen McNaughton [Mon, 12 Oct 2020 22:26:01 +0000 (11:26 +1300)]
Merge pull request #18743 from vingle/patch-9

More accurate language around social media sharing

4 years agodev/financial#152 simplify passed parameters
eileen [Mon, 12 Oct 2020 20:33:08 +0000 (09:33 +1300)]
dev/financial#152 simplify passed parameters

Rather than passing objects this switches to specifically passing the 2 objects being used in
the recur function

4 years agoMerge pull request #18742 from jitendrapurohit/merge-uid
Seamus Lee [Mon, 12 Oct 2020 20:27:41 +0000 (07:27 +1100)]
Merge pull request #18742 from jitendrapurohit/merge-uid

Fix main contact uf url on merge screen

4 years agoMerge pull request #18738 from eileenmcnaughton/lines
Matthew Wire [Mon, 12 Oct 2020 20:12:45 +0000 (21:12 +0100)]
Merge pull request #18738 from eileenmcnaughton/lines

dev/core#2115 remove reference to financialACLs in bounce

4 years agoMerge pull request #18735 from eileenmcnaughton/aipn
Matthew Wire [Mon, 12 Oct 2020 20:11:44 +0000 (21:11 +0100)]
Merge pull request #18735 from eileenmcnaughton/aipn

dev/financial#152 simplify interaction with membership, deprecate function

4 years agoMerge pull request #18736 from eileenmcnaughton/pp
Matthew Wire [Mon, 12 Oct 2020 20:07:37 +0000 (21:07 +0100)]
Merge pull request #18736 from eileenmcnaughton/pp

dev/financial#152 simplify passed parameters

4 years agoMerge pull request #18668 from eileenmcnaughton/no_opt
Monish Deb [Mon, 12 Oct 2020 17:01:39 +0000 (22:31 +0530)]
Merge pull request #18668 from eileenmcnaughton/no_opt

dev/core#2079 Eliminate unused query on CRM_Core_BAO_CustomQuery::_construct

4 years agoMerge pull request #18589 from eileenmcnaughton/ex_class
Monish Deb [Mon, 12 Oct 2020 16:04:30 +0000 (21:34 +0530)]
Merge pull request #18589 from eileenmcnaughton/ex_class

[REF]  Separate export form classes out & simplify task handling

4 years agoChange in language
Nicol [Mon, 12 Oct 2020 14:42:23 +0000 (16:42 +0200)]
Change in language

Change in language to be more accurate, in relation to this issue: https://lab.civicrm.org/dev/user-interface/-/issues/21#note_48976.

4 years agoUpdate Petition.php
Nicol [Mon, 12 Oct 2020 14:39:34 +0000 (16:39 +0200)]
Update Petition.php

Change in language to be more accurate, in relation to this issue: https://lab.civicrm.org/dev/user-interface/-/issues/21#note_48976.

4 years agoMerge pull request #18555 from eileenmcnaughton/del_primary
Monish Deb [Mon, 12 Oct 2020 14:39:12 +0000 (20:09 +0530)]
Merge pull request #18555 from eileenmcnaughton/del_primary

dev/core#2047 Fix merge code so that deleted contacts are not left without a primary address

4 years agoUpdate Settings.php
Nicol [Mon, 12 Oct 2020 14:34:38 +0000 (16:34 +0200)]
Update Settings.php

Change in language to be more accurate, in relation to this issue: https://lab.civicrm.org/dev/user-interface/-/issues/21#note_48976.

4 years agoFix main contact uf url on merge screen
Jitendra Purohit [Mon, 12 Oct 2020 11:36:20 +0000 (17:06 +0530)]
Fix main contact uf url on merge screen

4 years agodev/core#2039 Fix merge code so that deleted contacts are not left without a primary...
eileen [Tue, 22 Sep 2020 02:43:29 +0000 (14:43 +1200)]
dev/core#2039 Fix merge code so that deleted contacts are not left without a primary address

This was picked up in tests to ensure that removing a line of code creating excessing queries
would not cause regressions.

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

I considered altering the test to exclude deleted contacts but we run the risk that if a contact
is undeleted they will have no primary address so I figured the integrity makes sense.

Note there are a couple of queries in this code that can go (retrieving stuff
we already have) - depending how I go on getting review on this & related tidy up I'll remove them
in a later PR

4 years agoAngularLoader: Support 'settingsFactory' callbacks in angular modules.
Coleman Watts [Sat, 10 Oct 2020 20:58:17 +0000 (16:58 -0400)]
AngularLoader: Support 'settingsFactory' callbacks in angular modules.

This allows Angular modules with complex/expensive data to provide it with a callback,
which will only be invoked if the module is actively loaded on the page.

Normally, module settings are calculated on every page request, even if they are not needed.

4 years agoMerge pull request #18737 from eileenmcnaughton/ppp
Eileen McNaughton [Sun, 11 Oct 2020 23:03:34 +0000 (12:03 +1300)]
Merge pull request #18737 from eileenmcnaughton/ppp

dev/financial#152 remove unused parameter

4 years agodev/core#2115 remove reference to financialACLs in bounce
eileen [Sun, 11 Oct 2020 21:57:04 +0000 (10:57 +1300)]
dev/core#2115 remove reference to financialACLs in bounce

I believe that the other 2 criteria suffice. allMembershipDetails is built from
CRM_Member_BAO_Membership::buildMembershipTypeValues()  which is altered by
financial acls but also potentially by other extensions so I don't think the bounce
should be restricted to when financial acls are in play

4 years agodev/financial#152 remove unused parameter
eileen [Sun, 11 Oct 2020 21:15:28 +0000 (10:15 +1300)]
dev/financial#152 remove unused parameter

4 years agodev/financial#152 simplify passed parameters
eileen [Sun, 11 Oct 2020 21:07:40 +0000 (10:07 +1300)]
dev/financial#152 simplify passed parameters

the  function now only requires  so this simplifies so it only receives that

4 years agodev/financial#152 simplify interaction with membership, deprecate function
eileen [Sun, 11 Oct 2020 20:36:18 +0000 (09:36 +1300)]
dev/financial#152 simplify interaction with membership, deprecate function

ids['membership'] is only calculated in the Authorize.net IPN flow for the purpose of determining
the autoRenew membership parameter for recurringNotify. This is currently passed to sendRecurringStartOrEndNotification
but that does not add any simplification & cannot be used elsewhere - so deprecating.

This is tested in testIPNPaymentMembershipRecurSuccessNoLeakage

4 years agoMerge pull request #18651 from eileenmcnaughton/cf
Matthew Wire [Sun, 11 Oct 2020 09:31:18 +0000 (10:31 +0100)]
Merge pull request #18651 from eileenmcnaughton/cf

[REF] Minor simplification - don't use a variable for table name

4 years agoMerge pull request #18728 from eileenmcnaughton/aip
Matthew Wire [Sun, 11 Oct 2020 09:30:08 +0000 (10:30 +0100)]
Merge pull request #18728 from eileenmcnaughton/aip

dev/financial#152 Pass contribution directly to completeOrder

4 years agoMerge pull request #18733 from eileenmcnaughton/aipn
Matthew Wire [Sun, 11 Oct 2020 09:28:50 +0000 (10:28 +0100)]
Merge pull request #18733 from eileenmcnaughton/aipn

dev/financial#152 [REF] Extract getMembershipID

4 years agoMerge pull request #18734 from eileenmcnaughton/ppp
Matthew Wire [Sun, 11 Oct 2020 09:28:01 +0000 (10:28 +0100)]
Merge pull request #18734 from eileenmcnaughton/ppp

dev/financial#152 Remove unreachable code

4 years agoMerge pull request #18727 from colemanw/entityTest
Seamus Lee [Sun, 11 Oct 2020 02:37:10 +0000 (13:37 +1100)]
Merge pull request #18727 from colemanw/entityTest

[Test] Ensure all APIv4 entities have basic info

4 years agodev/financial#152 Remove unreachable code
eileen [Sun, 11 Oct 2020 00:36:19 +0000 (13:36 +1300)]
dev/financial#152 Remove unreachable code

This code cann only be reached if txnType is recurring_payment. Given that we can look
at the earlier switch and see that in that case first must be TRUE or it would have
already returned. Ergo this code is unreachable - and would have been
since the earlier code switched to using the api to handle non-firsts

4 years agoMerge pull request #18732 from eileenmcnaughton/fail
Seamus Lee [Sun, 11 Oct 2020 00:07:23 +0000 (11:07 +1100)]
Merge pull request #18732 from eileenmcnaughton/fail

dev/financial#152 Remove unused parameters from BaseIPN->failed signature

4 years agodev/financial#152 [REF] Extract getMembershipID
eileen [Sat, 10 Oct 2020 23:30:36 +0000 (12:30 +1300)]
dev/financial#152 [REF] Extract getMembershipID

Note that since NULL is valid we can just return the result of the query. Bypassing for
component=event doesn't provide enough value to justify relying on a url param
as opposed to just looking it up & feels very original-form-flow

4 years agoMerge pull request #18730 from eileenmcnaughton/pp
Seamus Lee [Sat, 10 Oct 2020 23:20:49 +0000 (10:20 +1100)]
Merge pull request #18730 from eileenmcnaughton/pp

dev/financial#152 Remove unused parameters from BaseIPN->cancelled signature

4 years agoMerge pull request #18729 from eileenmcnaughton/aipn
Eileen McNaughton [Sat, 10 Oct 2020 22:37:07 +0000 (11:37 +1300)]
Merge pull request #18729 from eileenmcnaughton/aipn

dev/financial#152 Clean up & test contributionPageID handling

4 years agodev/financial#152 Remove unused parameters from BaseIPN->failed signature
eileen [Sat, 10 Oct 2020 21:54:36 +0000 (10:54 +1300)]
dev/financial#152 Remove unused parameters from BaseIPN->failed signature

Same as https://github.com/civicrm/civicrm-core/pull/18730 but for failed

4 years agoTest: Ensure all APIv4 entities have basic info
Coleman Watts [Sat, 10 Oct 2020 15:15:45 +0000 (11:15 -0400)]
Test: Ensure all APIv4 entities have basic info

4 years agoRemove unused parameters from BaseIPN->cancelled signature
eileen [Sat, 10 Oct 2020 21:20:33 +0000 (10:20 +1300)]
Remove unused parameters from BaseIPN->cancelled signature

4 years agodev/financial#152 Clean up & test contributionPageID handling
eileen [Sat, 10 Oct 2020 20:32:12 +0000 (09:32 +1300)]
dev/financial#152 Clean up & test contributionPageID handling

4 years agoMerge pull request #18726 from demeritcowboy/static-pdfformat
Seamus Lee [Sat, 10 Oct 2020 20:30:54 +0000 (07:30 +1100)]
Merge pull request #18726 from demeritcowboy/static-pdfformat

dev/core#2110 - Warning "Non-static method CRM_Contact_Page_AJAX::pdfFormat() should not be called statically" when changing the page format on print/merge document

4 years agodev/financial#152 Pass contribution directly to completeOrder
eileen [Sat, 10 Oct 2020 19:53:45 +0000 (08:53 +1300)]
dev/financial#152 Pass contribution directly to completeOrder

We have done quite a a bit of cleanup on this and the only value in objects now used is
contribution - this is really explict in the code as we actually unset objects after
extracting contribution.

This alters the function signature such that it receives contribution directly rather than
in an array

4 years agoMerge pull request #18631 from eileenmcnaughton/ppp
colemanw [Sat, 10 Oct 2020 19:39:33 +0000 (15:39 -0400)]
Merge pull request #18631 from eileenmcnaughton/ppp

dev/financial#152 [REF] Parse ids before sending to single function (minor simplification)

4 years agoMerge pull request #18629 from eileenmcnaughton/aipn
colemanw [Sat, 10 Oct 2020 19:38:26 +0000 (15:38 -0400)]
Merge pull request #18629 from eileenmcnaughton/aipn

dev/financial#152 [REF] Parse ids before sending to recur function (minor simplification)

4 years agoMerge pull request #17969 from seamuslee001/widget_normal_route
Eileen McNaughton [Sat, 10 Oct 2020 19:14:35 +0000 (08:14 +1300)]
Merge pull request #17969 from seamuslee001/widget_normal_route

dev/cloud-native#16 Migrate Contribution Page widget extern url to us…

4 years agoMerge pull request #18725 from civicrm/5.31
colemanw [Sat, 10 Oct 2020 18:11:24 +0000 (14:11 -0400)]
Merge pull request #18725 from civicrm/5.31

5.31

4 years agoMerge pull request #18717 from eileenmcnaughton/static2
colemanw [Sat, 10 Oct 2020 15:39:01 +0000 (11:39 -0400)]
Merge pull request #18717 from eileenmcnaughton/static2

dev/core#2108 fix deprecation notice take 2

4 years agoMerge pull request #18713 from eileenmcnaughton/531
colemanw [Sat, 10 Oct 2020 15:33:42 +0000 (11:33 -0400)]
Merge pull request #18713 from eileenmcnaughton/531

dev/core#2102 Fix hang on event edit

4 years agomake routing endpoint static
demeritcowboy [Sat, 10 Oct 2020 13:32:26 +0000 (09:32 -0400)]
make routing endpoint static

4 years agoMerge pull request #18723 from colemanw/crmSearchCleanup
Seamus Lee [Fri, 9 Oct 2020 23:22:35 +0000 (10:22 +1100)]
Merge pull request #18723 from colemanw/crmSearchCleanup

Search ext: misc cleanup & fixes

4 years agodev/cloud-native#16 Migrate Contribution Page widget extern url to use the normal...
Seamus Lee [Mon, 27 Jul 2020 01:53:58 +0000 (11:53 +1000)]
dev/cloud-native#16 Migrate Contribution Page widget extern url to use the normal CMS routing mechanism

Update test to test both endpoints

4 years agoSearch ext: Ensure all entities have titlePlural to fix sort/display
Coleman Watts [Fri, 9 Oct 2020 21:12:57 +0000 (17:12 -0400)]
Search ext: Ensure all entities have titlePlural to fix sort/display

4 years agoMerge pull request #18719 from JMAConsulting/core_2105
Eileen McNaughton [Fri, 9 Oct 2020 20:56:04 +0000 (09:56 +1300)]
Merge pull request #18719 from JMAConsulting/core_2105

core#2105: Groups children now get shown with SPAN CSS error

4 years agoMerge pull request #18716 from eileenmcnaughton/static
colemanw [Fri, 9 Oct 2020 20:55:54 +0000 (16:55 -0400)]
Merge pull request #18716 from eileenmcnaughton/static

dev/core#2108 fix deprecation notice

4 years agoSearch ext: misc cleanup & fixes
Coleman Watts [Fri, 9 Oct 2020 20:44:06 +0000 (16:44 -0400)]
Search ext: misc cleanup & fixes

- Fixes white on white button text by adding btn-default class
- Fixes missing field names in the bulk-update action
- Decouples searchActions from the main search controller
- Misc cleanup

4 years agoMerge pull request #18720 from artfulrobot/artfulrobot-core-issue-1428
colemanw [Fri, 9 Oct 2020 20:40:57 +0000 (16:40 -0400)]
Merge pull request #18720 from artfulrobot/artfulrobot-core-issue-1428

dev/core#1428 Add test for Activity::update()

4 years agoMerge pull request #18715 from seamuslee001/dev_financial_11
Seamus Lee [Fri, 9 Oct 2020 09:03:23 +0000 (20:03 +1100)]
Merge pull request #18715 from seamuslee001/dev_financial_11

dev/financial#11 Expand unit test to ensure that the correct currency…

4 years agoAdd test for Activity::update()
Rich Lott / Artful Robot [Fri, 9 Oct 2020 08:26:27 +0000 (09:26 +0100)]
Add test for Activity::update()

4 years agocore#2105: Groups children now get shown with SPAN CSS error
Monish Deb [Fri, 9 Oct 2020 04:23:04 +0000 (09:53 +0530)]
core#2105: Groups children now get shown with SPAN CSS error

4 years agodev/core#2108 fix deprecation notice take 2
eileen [Fri, 9 Oct 2020 03:43:34 +0000 (16:43 +1300)]
dev/core#2108 fix deprecation notice take 2

Loosens the deprecation notice - alternative to https://github.com/civicrm/civicrm-core/pull/18716 but
we should merge both IMHO

4 years agodev/core#2108 fix deprecation notice
eileen [Fri, 9 Oct 2020 03:36:39 +0000 (16:36 +1300)]
dev/core#2108 fix deprecation notice

This addresses the deprecation warning by moving the text to the tpl layer - we could ease up
on the deprecation for type = 'static' but the pattern didn't seem to make much sense or to be
consistent with how we normally do things

4 years agoMerge pull request #18714 from MegaphoneJon/financial-111
Seamus Lee [Fri, 9 Oct 2020 00:54:23 +0000 (11:54 +1100)]
Merge pull request #18714 from MegaphoneJon/financial-111

Financial#111: Contribution tokens always display amount with default…

4 years agodev/financial#11 Expand unit test to ensure that the correct currency is outputted...
Seamus Lee [Fri, 9 Oct 2020 00:51:06 +0000 (11:51 +1100)]
dev/financial#11 Expand unit test to ensure that the correct currency is outputted in the token

4 years agoMerge pull request #18688 from seamuslee001/dompdf_upgrade
Eileen McNaughton [Fri, 9 Oct 2020 00:46:32 +0000 (13:46 +1300)]
Merge pull request #18688 from seamuslee001/dompdf_upgrade

[REF] Upgrade DomPDF to v0.8.6

4 years agodev/core#2102 Fix hang on event edit
eileen [Thu, 8 Oct 2020 20:57:45 +0000 (09:57 +1300)]
dev/core#2102 Fix hang on event edit

Per https://lab.civicrm.org/dev/core/-/issues/2102

4 years agoFinancial#111: Contribution tokens always display amount with default currency
Jon Goldberg [Thu, 8 Oct 2020 21:20:32 +0000 (17:20 -0400)]
Financial#111: Contribution tokens always display amount with default currency

4 years agoSet version to 5.32.alpha1
CiviCRM [Thu, 8 Oct 2020 09:45:03 +0000 (09:45 +0000)]
Set version to 5.32.alpha1

4 years agoSet version to 5.31.beta1
CiviCRM [Thu, 8 Oct 2020 09:44:07 +0000 (09:44 +0000)]
Set version to 5.31.beta1

4 years agoMerge pull request #18710 from eileenmcnaughton/locev2
Tim Otten [Thu, 8 Oct 2020 08:42:39 +0000 (01:42 -0700)]
Merge pull request #18710 from eileenmcnaughton/locev2

dev/core#2096 Fix in-master-only regression on creating new events

4 years agoMerge pull request #18708 from eileenmcnaughton/locev
Seamus Lee [Thu, 8 Oct 2020 05:18:29 +0000 (16:18 +1100)]
Merge pull request #18708 from eileenmcnaughton/locev

Add unit test that ultimately failed to hit the desired code but does add cover

4 years agoMerge pull request #18711 from seamuslee001/move_to_alpha1_stage
Seamus Lee [Thu, 8 Oct 2020 05:17:23 +0000 (16:17 +1100)]
Merge pull request #18711 from seamuslee001/move_to_alpha1_stage

Move to alpha1 stage

4 years ago[REF] Move recently added upgrade steps from 5.31.0 to 5.31.alpha1 step
Seamus Lee [Thu, 8 Oct 2020 02:20:23 +0000 (13:20 +1100)]
[REF] Move recently added upgrade steps from 5.31.0 to 5.31.alpha1 step

4 years agodev/core#2096 Fix in-master-only regression on creating new events
eileen [Thu, 8 Oct 2020 02:19:08 +0000 (15:19 +1300)]
dev/core#2096 Fix in-master-only regression on creating new events