civicrm-core.git
3 years agoAdd release-notes/5.40.4.md
Tim Otten [Fri, 27 Aug 2021 03:00:33 +0000 (20:00 -0700)]
Add release-notes/5.40.4.md

3 years agoMerge pull request #21265 from seamuslee001/5.41
Seamus Lee [Thu, 26 Aug 2021 05:13:04 +0000 (15:13 +1000)]
Merge pull request #21265 from seamuslee001/5.41

[NFC] Do not generate a result cache file when running legacycustomse…

3 years ago[NFC] Do not generate a result cache file when running legacycustomsearches phpunit...
Seamus Lee [Thu, 26 Aug 2021 03:13:44 +0000 (13:13 +1000)]
[NFC] Do not generate a result cache file when running legacycustomsearches phpunit tests

3 years agoMerge pull request #21235 from seamuslee001/dev_core_2768
Eileen McNaughton [Thu, 26 Aug 2021 02:06:37 +0000 (14:06 +1200)]
Merge pull request #21235 from seamuslee001/dev_core_2768

Resolve dev/core#2768 Reinstate code into APIv4 that handled magic fu…

3 years agoMerge pull request #21250 from agileware/CIVICRM-1820
Eileen McNaughton [Thu, 26 Aug 2021 01:50:31 +0000 (13:50 +1200)]
Merge pull request #21250 from agileware/CIVICRM-1820

CiviCRM Scheduled Reminders, Effective Start Date and Effective End Date are incorrectly evaluated if these fields contain a value '0000-00-00 00:00:00'

3 years agoCIVICRM-1820 CiviCRM Scheduled Reminders, Effective Start Date and Effective End...
Justin Freeman [Wed, 25 Aug 2021 23:59:14 +0000 (09:59 +1000)]
CIVICRM-1820 CiviCRM Scheduled Reminders, Effective Start Date and Effective End Date are incorrectly evaluated if these fields contain a value '0000-00-00 00:00:00'

3 years agoMerge pull request #21230 from eileenmcnaughton/541-w-order
Seamus Lee [Wed, 25 Aug 2021 22:10:03 +0000 (08:10 +1000)]
Merge pull request #21230 from eileenmcnaughton/541-w-order

FIx order api regression

3 years agoAdd order fix
Eileen McNaughton [Tue, 24 Aug 2021 02:03:48 +0000 (14:03 +1200)]
Add order  fix

3 years agoMerge pull request #21212 from eileenmcnaughton/541-orig
Monish Deb [Tue, 24 Aug 2021 15:59:24 +0000 (21:29 +0530)]
Merge pull request #21212 from eileenmcnaughton/541-orig

dev/financial#180 Fix line item calculation regression on line items (incorrectly treating as exclusive)

3 years agoRevert test change that 'supported' incorrect code change
Eileen McNaughton [Tue, 24 Aug 2021 00:22:35 +0000 (12:22 +1200)]
Revert test change that 'supported' incorrect code change

https://github.com/civicrm/civicrm-core/commit/e967ce8fe2b58b94e2163dde395542e55599da13#diff-44a947115564a688b2d6e0772ad25039b8d244225cf250dbc27ed32a134467a3L395-R396

3 years agoMerge pull request #21239 from kcristiano/dev-2784
Eileen McNaughton [Tue, 24 Aug 2021 07:09:40 +0000 (19:09 +1200)]
Merge pull request #21239 from kcristiano/dev-2784

dev/core#2784 Export PRIMARY fields Fails on CiviCRM 5.40.2 and MariaDB 10.3 with row size issue

3 years agoMove the tested but crazy tax calc to the contribution api
Eileen McNaughton [Mon, 23 Aug 2021 20:57:08 +0000 (08:57 +1200)]
Move the tested but crazy tax calc to the contribution api

3 years agoFix line item calculation from exclusive to inclusive
Eileen McNaughton [Sun, 22 Aug 2021 00:16:12 +0000 (12:16 +1200)]
Fix line item calculation from exclusive to inclusive

This was added https://github.com/civicrm/civicrm-core/commit/e967ce8fe2b58b94e2163dde395542e55599da13#diff-a16d4d7449cf5f3a0616d1d282a32f27ab6d3f7d2726d076c02ad1d4d655af41R512

but incorrectly assumes the totalAmount is exclusive at this point - but
it is inclusive

3 years agoMerge pull request #21238 from eileenmcnaughton/541-lines
Eileen McNaughton [Tue, 24 Aug 2021 04:23:46 +0000 (16:23 +1200)]
Merge pull request #21238 from eileenmcnaughton/541-lines

Fix test to actually pass valid data

3 years agoMerge pull request #21237 from seamuslee001/5.41
Seamus Lee [Tue, 24 Aug 2021 03:08:30 +0000 (13:08 +1000)]
Merge pull request #21237 from seamuslee001/5.41

Add release-notes/5.40.3.md

3 years agoExport PRIMARY fields Fails on CiviCRM 5.40.2 and MariaDB 10.3
Kevin Cristiano [Tue, 24 Aug 2021 02:12:04 +0000 (22:12 -0400)]
Export PRIMARY fields Fails on CiviCRM 5.40.2 and MariaDB 10.3

with row size issue  https://lab.civicrm.org/dev/core/-/issues/2784

3 years agoRe-fix test to work with new check
Eileen McNaughton [Tue, 24 Aug 2021 01:30:10 +0000 (13:30 +1200)]
Re-fix test to work with new check

A new check was enabled for this test recently and it passed because we
were doing recalculation - but that recalculation was not always right
and there is no expectation that passing in the wrong total_amount
is OK so this fixes total_amount to be equal to the
sum of the line items - which is what is checked

3 years agoAdd release-notes/5.40.3.md
Tim Otten [Tue, 24 Aug 2021 01:32:01 +0000 (18:32 -0700)]
Add release-notes/5.40.3.md

3 years agoResolve dev/core#2768 Reinstate code into APIv4 that handled magic functions
Seamus Lee [Tue, 24 Aug 2021 00:12:12 +0000 (10:12 +1000)]
Resolve dev/core#2768 Reinstate code into APIv4 that handled magic functions

Add in test to assert Exception type and exception message that is thrown

3 years agoMerge pull request #21224 from ufundo/oauth-systoken-refresh-fix
Seamus Lee [Mon, 23 Aug 2021 23:28:14 +0000 (09:28 +1000)]
Merge pull request #21224 from ufundo/oauth-systoken-refresh-fix

dev/core#2779 - Specify row fields to fetch in Api4 OAuthSysToken.Refresh

3 years agoMerge pull request #21229 from eileenmcnaughton/cache
Seamus Lee [Mon, 23 Aug 2021 21:31:09 +0000 (07:31 +1000)]
Merge pull request #21229 from eileenmcnaughton/cache

Test cleanup fix

3 years agoTest cleanup fix
Eileen McNaughton [Mon, 23 Aug 2021 19:48:09 +0000 (07:48 +1200)]
Test cleanup fix

3 years agoimplement-basicbatchaction-getselect
Ubuntu [Mon, 23 Aug 2021 16:42:18 +0000 (16:42 +0000)]
implement-basicbatchaction-getselect

3 years agoMerge pull request #21195 from colemanw/UnknownFieldError
Eileen McNaughton [Sat, 21 Aug 2021 00:07:20 +0000 (12:07 +1200)]
Merge pull request #21195 from colemanw/UnknownFieldError

APIv4 - Properly show deprecated joins in unit tests (fixes dev/core#2771)

3 years agoMerge pull request #21192 from jitendrapurohit/reminder
demeritcowboy [Fri, 20 Aug 2021 14:14:08 +0000 (10:14 -0400)]
Merge pull request #21192 from jitendrapurohit/reminder

dev/core#2777 - Fix js break on reminder form

3 years agoAPIv4 - Properly show deprecated joins in unit tests
Coleman Watts [Fri, 20 Aug 2021 14:11:34 +0000 (10:11 -0400)]
APIv4 - Properly show deprecated joins in unit tests

3 years agoFix js break on reminder form
jitendrapurohit [Fri, 20 Aug 2021 11:49:55 +0000 (17:19 +0530)]
Fix js break on reminder form

3 years agoMerge pull request #21189 from eileenmcnaughton/541b
Seamus Lee [Fri, 20 Aug 2021 04:54:11 +0000 (14:54 +1000)]
Merge pull request #21189 from eileenmcnaughton/541b

dev/rc#14 handle api calls post schema change

3 years agodev/rc#14 handle api calls post schema change
Eileen McNaughton [Fri, 20 Aug 2021 02:48:11 +0000 (14:48 +1200)]
dev/rc#14 handle api calls post schema change

3 years agoMerge pull request #21163 from seamuslee001/5.41
Seamus Lee [Tue, 17 Aug 2021 06:49:42 +0000 (16:49 +1000)]
Merge pull request #21163 from seamuslee001/5.41

Add release-notes/5.40.2.md release-notes/5.40.1.md

3 years agoAdd release-notes/5.40.2.md release-notes/5.40.1.md
Tim Otten [Tue, 17 Aug 2021 06:23:00 +0000 (23:23 -0700)]
Add release-notes/5.40.2.md release-notes/5.40.1.md

3 years agoMerge pull request #21151 from eileenmcnaughton/541m
Eileen McNaughton [Mon, 16 Aug 2021 07:06:49 +0000 (19:06 +1200)]
Merge pull request #21151 from eileenmcnaughton/541m

Membership batch processing error

3 years agoMembership batch processing error
Eileen McNaughton [Mon, 16 Aug 2021 04:37:30 +0000 (16:37 +1200)]
Membership batch processing error

This fixes a fatal because of incorrect typing

Affects 5.40

3 years agoMerge pull request #21143 from seamuslee001/fix_enotice_php8
Eileen McNaughton [Mon, 16 Aug 2021 01:19:21 +0000 (13:19 +1200)]
Merge pull request #21143 from seamuslee001/fix_enotice_php8

[REF] Fix e-notice in APIv3 Profile Test on PHP8

3 years agoMerge pull request #21147 from eileenmcnaughton/541
Seamus Lee [Sun, 15 Aug 2021 23:57:44 +0000 (09:57 +1000)]
Merge pull request #21147 from eileenmcnaughton/541

dev/core#2758 fix task tiles

3 years agodev/core#2758 fix task tiles
Eileen McNaughton [Sun, 15 Aug 2021 22:01:07 +0000 (10:01 +1200)]
dev/core#2758 fix task tiles

3 years ago[REF] Fix e-notice in APIv3 Profile Test on PHP8
Seamus Lee [Sat, 14 Aug 2021 23:27:39 +0000 (09:27 +1000)]
[REF] Fix e-notice in APIv3 Profile Test on PHP8

Remove e-notice issue found by dave d

3 years agoMerge pull request #21136 from agh1/5.41.0-releasenotes-initial
Seamus Lee [Sat, 14 Aug 2021 03:12:41 +0000 (13:12 +1000)]
Merge pull request #21136 from agh1/5.41.0-releasenotes-initial

5.41.0 release notes initial run

3 years ago5.41.0 release notes: added boilerplate
Andie Hunt [Fri, 13 Aug 2021 22:15:31 +0000 (18:15 -0400)]
5.41.0 release notes: added boilerplate

3 years ago5.41.0 release notes: raw from script
Andie Hunt [Fri, 13 Aug 2021 22:12:51 +0000 (18:12 -0400)]
5.41.0 release notes: raw from script

3 years agoMerge pull request #21099 from eileenmcnaughton/camp54
Seamus Lee [Fri, 13 Aug 2021 21:27:18 +0000 (07:27 +1000)]
Merge pull request #21099 from eileenmcnaughton/camp54

dev/core#2743 fix api v3 to not unnecessarily load options

3 years agoMerge pull request #21102 from artfulrobot/ui/37
Seamus Lee [Fri, 13 Aug 2021 21:23:27 +0000 (07:23 +1000)]
Merge pull request #21102 from artfulrobot/ui/37

dev/user-interface#37 Reinstate jQueryUI visible focus effect in quicksearch

3 years agoMerge pull request #21124 from MegaphoneJon/fix-event-validation
Eileen McNaughton [Fri, 13 Aug 2021 20:13:05 +0000 (08:13 +1200)]
Merge pull request #21124 from MegaphoneJon/fix-event-validation

fix crmValidate() not loading on event registration pages

3 years agofix crmValidate() not loading on event registration pages
Jon Goldberg [Fri, 13 Aug 2021 17:50:54 +0000 (13:50 -0400)]
fix crmValidate() not loading on event registration pages

3 years agoMerge pull request #21107 from MegaphoneJon/clean-override-total
Eileen McNaughton [Fri, 13 Aug 2021 05:56:17 +0000 (17:56 +1200)]
Merge pull request #21107 from MegaphoneJon/clean-override-total

delocalize total amount before passing to setOverrideTotal

3 years agoMerge pull request #21108 from seamuslee001/5.41
Seamus Lee [Fri, 13 Aug 2021 01:22:45 +0000 (11:22 +1000)]
Merge pull request #21108 from seamuslee001/5.41

[REF] Upgrade CKEditor to 4.16.2

3 years agoMerge pull request #21104 from totten/5.41-typo
Seamus Lee [Thu, 12 Aug 2021 23:35:09 +0000 (09:35 +1000)]
Merge pull request #21104 from totten/5.41-typo

(NFC) release-notes - Fix typo

3 years agoMerge pull request #21100 from eileenmcnaughton/exceptless
Seamus Lee [Thu, 12 Aug 2021 23:34:36 +0000 (09:34 +1000)]
Merge pull request #21100 from eileenmcnaughton/exceptless

dev/core#2749 remove exception when no payment processor configured when no payment processor configured

3 years ago[REF] Upgrade CKEditor to 4.16.2
Seamus Lee [Thu, 12 Aug 2021 22:21:06 +0000 (08:21 +1000)]
[REF] Upgrade CKEditor to 4.16.2

3 years agodelocalize total amount before passing to setOverrideTotal
Jon Goldberg [Thu, 12 Aug 2021 21:55:57 +0000 (17:55 -0400)]
delocalize total amount before passing to setOverrideTotal

3 years ago(NFC) release-notes/5.39.1.md - Fix typo
Tim Otten [Thu, 12 Aug 2021 20:47:59 +0000 (13:47 -0700)]
(NFC) release-notes/5.39.1.md - Fix typo

Typo was autogenerated from a template. Template is also fixed.

3 years agoReinstate jQueryUI visible focus effect in quicksearch user-interface issue 37
Rich Lott / Artful Robot [Thu, 12 Aug 2021 06:56:47 +0000 (07:56 +0100)]
Reinstate jQueryUI visible focus effect in quicksearch user-interface issue 37

3 years agodev/core#2749 remove exception when no payment processor configuredhen no payment...
Eileen McNaughton [Wed, 11 Aug 2021 22:43:52 +0000 (10:43 +1200)]
dev/core#2749 remove exception when no payment processor configuredhen no payment processor configured

This is an attempt to fix a regression https://lab.civicrm.org/dev/core/-/issues/2749
when there are legitimately no payment processors assigned to a page.

I feel like the configuration screens are adequate to enforce this & having an exception like
this in the assign function is the wrong place.

The original issue is that the is_monetary box was not checked & hence the
processor wasn't assigned. This felt like asking users to understand that
a payment method when money options are configured

3 years agoFix one test & remove 2 that covered the error message
Eileen McNaughton [Thu, 12 Aug 2021 00:06:05 +0000 (12:06 +1200)]
Fix one test & remove 2 that covered the error message

3 years agodev/core#2743 fix api v3 to not unnecessarily load options
Eileen McNaughton [Wed, 11 Aug 2021 22:28:50 +0000 (10:28 +1200)]
dev/core#2743 fix api v3 to not unnecessarily load options

3 years agoMerge pull request #21001 from seamuslee001/fix_utf8mb4_test
Seamus Lee [Sat, 7 Aug 2021 04:46:48 +0000 (14:46 +1000)]
Merge pull request #21001 from seamuslee001/fix_utf8mb4_test

[REF] Fix utf8mb4 test in APIv4 and re-enable the altering of databas…

3 years ago[REF] Fix utf8mb4 test in APIv4 and re-enable the altering of database in the v3...
Seamus Lee [Mon, 2 Aug 2021 22:34:47 +0000 (08:34 +1000)]
[REF] Fix utf8mb4 test in APIv4 and re-enable the altering of database in the v3 version of the test and fix handling for first name field

3 years agoSet version to 5.41.beta1
CiviCRM [Sat, 7 Aug 2021 02:12:01 +0000 (02:12 +0000)]
Set version to 5.41.beta1

3 years agoMerge pull request #21053 from eileenmcnaughton/group_odd
Tim Otten [Sat, 7 Aug 2021 02:11:16 +0000 (19:11 -0700)]
Merge pull request #21053 from eileenmcnaughton/group_odd

dev/core#2742 fix group type on group create from form

3 years agoMerge pull request #21051 from eileenmcnaughton/allan
Tim Otten [Sat, 7 Aug 2021 01:57:33 +0000 (18:57 -0700)]
Merge pull request #21051 from eileenmcnaughton/allan

dev/core#2740 fix dashboard regression on links

3 years agoMerge pull request #21050 from eileenmcnaughton/notice
Eileen McNaughton [Sat, 7 Aug 2021 01:14:32 +0000 (13:14 +1200)]
Merge pull request #21050 from eileenmcnaughton/notice

Tpl notice fixes

3 years agodev/core#2742 fix group type on group create from form
Eileen McNaughton [Sat, 7 Aug 2021 00:37:53 +0000 (12:37 +1200)]
dev/core#2742 fix group type on group create from form

3 years agodev/core#2740 fix dashboard regression on links
Eileen McNaughton [Fri, 6 Aug 2021 23:59:50 +0000 (11:59 +1200)]
dev/core#2740 fix dashboard regression on links

3 years agoMerge pull request #21045 from colemanw/fixSearchKitTaskPermissions
Eileen McNaughton [Fri, 6 Aug 2021 23:30:49 +0000 (11:30 +1200)]
Merge pull request #21045 from colemanw/fixSearchKitTaskPermissions

SearchKit - Fix permission to access task list

3 years agoTpl notice fixes
Eileen McNaughton [Fri, 6 Aug 2021 22:38:59 +0000 (10:38 +1200)]
Tpl notice fixes

These fields are both conditionally assigned to the template

3 years agoMerge pull request #21044 from mlutfy/fixContribSymbiotic
demeritcowboy [Fri, 6 Aug 2021 17:57:37 +0000 (13:57 -0400)]
Merge pull request #21044 from mlutfy/fixContribSymbiotic

contributor-key.yml: updates for Symbiotic

3 years agoSearchKit - Fix permission to access task list
Coleman Watts [Fri, 6 Aug 2021 15:08:27 +0000 (11:08 -0400)]
SearchKit - Fix permission to access task list

This regressed in 06ea32c, as a new api action was added but permissions were not declared.

3 years agocontributor-key.yml: updates for Symbiotic
Mathieu Lutfy [Fri, 6 Aug 2021 14:57:49 +0000 (10:57 -0400)]
contributor-key.yml: updates for Symbiotic

3 years agoMerge pull request #21039 from eileenmcnaughton/tok_pseudo
colemanw [Fri, 6 Aug 2021 14:55:47 +0000 (10:55 -0400)]
Merge pull request #21039 from eileenmcnaughton/tok_pseudo

Reconcile tokens misnamed or missing on legacy class

3 years agoMerge pull request #21038 from eileenmcnaughton/tok_names
colemanw [Fri, 6 Aug 2021 14:51:20 +0000 (10:51 -0400)]
Merge pull request #21038 from eileenmcnaughton/tok_names

Switch to using apiv4 for metadata

3 years agoMerge pull request #21041 from eileenmcnaughton/notice2
demeritcowboy [Fri, 6 Aug 2021 14:28:07 +0000 (10:28 -0400)]
Merge pull request #21041 from eileenmcnaughton/notice2

Enotice fix

3 years agoMerge pull request #21040 from eileenmcnaughton/tpl
Eileen McNaughton [Fri, 6 Aug 2021 09:03:13 +0000 (21:03 +1200)]
Merge pull request #21040 from eileenmcnaughton/tpl

Enotice fix

3 years agoMerge pull request #20752 from samuelsov/ReportGroup
Eileen McNaughton [Fri, 6 Aug 2021 07:26:02 +0000 (19:26 +1200)]
Merge pull request #20752 from samuelsov/ReportGroup

Make report subtotals work for custom fields

3 years agoEnotice fix
Eileen McNaughton [Fri, 6 Aug 2021 06:56:39 +0000 (18:56 +1200)]
Enotice fix

This one is a bit of a brain twister but I'm pretty sure the re-ordered IF has the
same result - but one less enotice

3 years agoMerge pull request #20989 from mattwire/mailtasks
Eileen McNaughton [Fri, 6 Aug 2021 06:51:07 +0000 (18:51 +1200)]
Merge pull request #20989 from mattwire/mailtasks

Fix mailing task when there are no tasks

3 years agoEnotice fix
Eileen McNaughton [Fri, 6 Aug 2021 06:32:05 +0000 (18:32 +1200)]
Enotice fix

3 years agoReconcile tokens misnamed on legacy class
Eileen McNaughton [Fri, 6 Aug 2021 03:17:56 +0000 (15:17 +1200)]
Reconcile tokens misnamed on legacy class

This switches to using the same metadata based record for both classes

3 years agoSwitch to using apiv4 for metadata
Eileen McNaughton [Fri, 6 Aug 2021 01:55:04 +0000 (13:55 +1200)]
Switch to using apiv4 for metadata

3 years agoMerge pull request #21036 from eileenmcnaughton/act_mon
Eileen McNaughton [Fri, 6 Aug 2021 04:39:28 +0000 (16:39 +1200)]
Merge pull request #21036 from eileenmcnaughton/act_mon

Reconcile contribution amount tokens

3 years agoReconcile contribution amount tokens
Eileen McNaughton [Fri, 6 Aug 2021 00:38:49 +0000 (12:38 +1200)]
Reconcile contribution amount tokens

This adds non_deductible_amount, as identified in https://github.com/civicrm/civicrm-core/pull/21034

It also moves the metadata functions to a parent class - this class might wind up
being a temporary class as there are 3 other contenders for where this functionality
should go - the TokenTrait, the abstractProvider or the tokenRow class. The intent
is not to make that decision yet - just to provide visual clarity about
what is generic

Note - I've figured out how to switch over to v4 api for this but will do that in a separate PR

3 years agoMerge pull request #21037 from eileenmcnaughton/act_source
Eileen McNaughton [Fri, 6 Aug 2021 02:59:35 +0000 (14:59 +1200)]
Merge pull request #21037 from eileenmcnaughton/act_source

Fix advertised token for source

3 years agoMerge pull request #21035 from eileenmcnaughton/act_more
Eileen McNaughton [Fri, 6 Aug 2021 02:47:29 +0000 (14:47 +1200)]
Merge pull request #21035 from eileenmcnaughton/act_more

Update contribution_page_id token in sched reminders

3 years agoUpdate contribution_page_id token in sched reminders
Eileen McNaughton [Thu, 5 Aug 2021 23:12:43 +0000 (11:12 +1200)]
Update contribution_page_id token in sched reminders

3 years agoFix advertised token for source
Eileen McNaughton [Fri, 6 Aug 2021 00:51:38 +0000 (12:51 +1200)]
Fix advertised token for source

3 years agoMerge pull request #21000 from eileenmcnaughton/act_more
Seamus Lee [Thu, 5 Aug 2021 23:11:11 +0000 (09:11 +1000)]
Merge pull request #21000 from eileenmcnaughton/act_more

 Reconcile and upgrade tokens for payment instrument, financial type

3 years agoReconcile and upgrade tokens for payment instrument, financial type
Eileen McNaughton [Mon, 2 Aug 2021 21:40:32 +0000 (09:40 +1200)]
Reconcile and upgrade tokens for payment instrument, financial type

This switches the last 2 'alias' tokens from Contribute_Tokens to the preferred format,
adds tests & upgrade and switches the advertised tokens. I tested & the token
removed from the sent letter collection still works

Next step is to analyse the remaining differences between the 2 sets of tokens.
My suspicion is that we have enough metadata that we use in search kit that we
don't need a hard-coded white list of tokens in 2 different places & can just
expose 'all the fields' that are not acl or otherwise limited

3 years agoMerge pull request #20999 from eileenmcnaughton/act_up
Seamus Lee [Thu, 5 Aug 2021 21:21:39 +0000 (07:21 +1000)]
Merge pull request #20999 from eileenmcnaughton/act_up

Switch contribution action schedule tokens to use advertised tokens for cancel_date & source

3 years agoMerge pull request #21019 from ejegg/customFieldBulkLog
Seamus Lee [Thu, 5 Aug 2021 21:20:24 +0000 (07:20 +1000)]
Merge pull request #21019 from ejegg/customFieldBulkLog

Fix bulk adding custom fields with logging on

3 years agoMerge pull request #21033 from kurund/patch-2
Mathieu Lu [Thu, 5 Aug 2021 13:10:59 +0000 (09:10 -0400)]
Merge pull request #21033 from kurund/patch-2

Update contributor-key.yml

3 years agoUpdate contributor-key.yml
Kurund Jalmi [Thu, 5 Aug 2021 13:09:32 +0000 (14:09 +0100)]
Update contributor-key.yml

3 years agoMerge pull request #21032 from seamuslee001/master
Seamus Lee [Thu, 5 Aug 2021 10:09:13 +0000 (20:09 +1000)]
Merge pull request #21032 from seamuslee001/master

5.40 up merge

3 years agoMerge in 5.40
Seamus Lee [Thu, 5 Aug 2021 10:08:31 +0000 (20:08 +1000)]
Merge in 5.40

3 years agoMerge pull request #21031 from totten/5.40-bump0
Tim Otten [Thu, 5 Aug 2021 10:03:40 +0000 (03:03 -0700)]
Merge pull request #21031 from totten/5.40-bump0

5.40.0 - Version bump. More release notes.

3 years agoSet version to 5.40.0
Tim Otten [Thu, 5 Aug 2021 09:15:21 +0000 (02:15 -0700)]
Set version to 5.40.0

3 years agoTweak release-notes/5.40.0.md
Tim Otten [Thu, 5 Aug 2021 09:14:06 +0000 (02:14 -0700)]
Tweak release-notes/5.40.0.md

3 years agoMerge pull request #21028 from eileenmcnaughton/540
Seamus Lee [Thu, 5 Aug 2021 09:11:32 +0000 (19:11 +1000)]
Merge pull request #21028 from eileenmcnaughton/540

dev/event#62 - Expose all price fields to backend form (5.40)

3 years agoAdd release-notes/5.39.1.md
Tim Otten [Thu, 5 Aug 2021 08:35:00 +0000 (01:35 -0700)]
Add release-notes/5.39.1.md

3 years agodev/event#62 expose all price fields to backend form
Brian Shaughnessy [Thu, 29 Jul 2021 14:56:41 +0000 (10:56 -0400)]
dev/event#62 expose all price fields to backend form

3 years agoMerge pull request #21020 from colemanw/fixWPUrlHash
Eileen McNaughton [Thu, 5 Aug 2021 06:10:13 +0000 (18:10 +1200)]
Merge pull request #21020 from colemanw/fixWPUrlHash

[REGRESSION] Fix CRM.url to not encode hash on WP

3 years agoMerge pull request #21014 from eileenmcnaughton/pf
Tim Otten [Thu, 5 Aug 2021 06:09:09 +0000 (23:09 -0700)]
Merge pull request #21014 from eileenmcnaughton/pf

dev/core#2739 - Fix contribution tasks using wrong IDs