Seamus Lee [Wed, 25 Aug 2021 23:51:48 +0000 (09:51 +1000)]
Merge pull request #21258 from civicrm/5.41
5.41
Joe Murray [Wed, 25 Aug 2021 22:50:10 +0000 (18:50 -0400)]
Changed support to dev/core from ext/oauth
Seamus Lee [Wed, 25 Aug 2021 22:36:25 +0000 (08:36 +1000)]
Merge pull request #20935 from eileenmcnaughton/hhhh
dev/core#2717 Simplify batch membership renewal
Seamus Lee [Wed, 25 Aug 2021 22:16:38 +0000 (08:16 +1000)]
Merge pull request #21106 from eileenmcnaughton/order
dev/core#2634 Add v4 Membership api, access it via 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
Seamus Lee [Wed, 25 Aug 2021 22:07:39 +0000 (08:07 +1000)]
Merge pull request #21257 from eileenmcnaughton/cset
Template fixes - notices, syntax
Seamus Lee [Wed, 25 Aug 2021 22:07:31 +0000 (08:07 +1000)]
Merge pull request #21255 from demeritcowboy/not-so-hidden
Fix invalid parameter giving E_WARNING
Eileen McNaughton [Wed, 25 Aug 2021 19:55:04 +0000 (07:55 +1200)]
E notice fixes
demeritcowboy [Wed, 25 Aug 2021 19:44:58 +0000 (15:44 -0400)]
fix invalid parameter
Tim Otten [Wed, 25 Aug 2021 06:50:10 +0000 (23:50 -0700)]
Settings.tpl - Fix syntax error
Eileen McNaughton [Tue, 24 Aug 2021 02:03:48 +0000 (14:03 +1200)]
Add order fix
Eileen McNaughton [Wed, 25 Aug 2021 19:24:23 +0000 (07:24 +1200)]
Merge pull request #21252 from civicrm/JoeMurray-patch-1
Provided standard links in ext/oauth-client/info.xml, fixed typo
demeritcowboy [Wed, 25 Aug 2021 18:09:04 +0000 (14:09 -0400)]
Merge pull request #21251 from eileenmcnaughton/email
[Ref] Copy emailcommon function back to email trait
demeritcowboy [Wed, 25 Aug 2021 16:24:17 +0000 (12:24 -0400)]
Merge pull request #21101 from eileenmcnaughton/inv3
[REF] Update a few references to invoicing
Joe Murray [Wed, 25 Aug 2021 13:25:25 +0000 (09:25 -0400)]
Provided standard links, fixed typo
Seamus Lee [Wed, 25 Aug 2021 10:11:02 +0000 (20:11 +1000)]
Merge pull request #21217 from colemanw/searchKitButtonTokens
SearchKit - Allow tokens in menu button text
Tim Otten [Wed, 25 Aug 2021 09:35:54 +0000 (02:35 -0700)]
Merge pull request #21134 from eileenmcnaughton/tok_nearly
dev/core#2745 - Contribution Tokens - Support 'contributionId'
Eileen McNaughton [Wed, 25 Aug 2021 07:35:32 +0000 (19:35 +1200)]
[Ref] Copy emailcommon function back to email trait
This is part of ending the email common trait. It is currently 'shared'
with a couple of other places - but most of the functionality is
not that shared & could be easily cleaned up when separated out.
I want to create a trait for PdfTrait like the email trait so
getting the email trait better separated for that
Eileen McNaughton [Wed, 25 Aug 2021 07:21:36 +0000 (19:21 +1200)]
Merge pull request #21006 from
deb1990/rename-pdf-file
dev/core#2121 Ability to change pdf filename before downloading
Seamus Lee [Wed, 25 Aug 2021 01:24:13 +0000 (11:24 +1000)]
Merge pull request #21246 from eileenmcnaughton/master
5.41 to master
colemanw [Wed, 25 Aug 2021 01:21:25 +0000 (21:21 -0400)]
Merge pull request #21244 from demeritcowboy/angular-loader
[NFC] - Replace deprecated function in AngularLoaderTest
Eileen McNaughton [Wed, 25 Aug 2021 01:04:03 +0000 (13:04 +1200)]
Merge pull request #21245 from agileware/CIVICRM-1816
CiviCRM Mailing, function unsub_from_mailing has spelling error, "experiement" impacts A/B Mailing unsubscribes
Eileen McNaughton [Tue, 24 Aug 2021 23:36:12 +0000 (11:36 +1200)]
Revert "Re-fix test to work with new check"
This reverts commit
77136dc6d4216211998729cea305d81868309809.
Eileen McNaughton [Tue, 24 Aug 2021 23:35:28 +0000 (11:35 +1200)]
Merge branch '5.41' of github.com:civicrm/civicrm-core
Justin Freeman [Tue, 24 Aug 2021 23:13:51 +0000 (09:13 +1000)]
CIVICRM-1816 CiviCRM Mailing, function unsub_from_mailing has spelling error, "experiement" impacts A/B Mailing unsubscribes
Seamus Lee [Tue, 24 Aug 2021 22:20:40 +0000 (08:20 +1000)]
Merge pull request #21169 from eileenmcnaughton/email
dev/core#2769 use php email validation not hacked & bad quickform function
demeritcowboy [Tue, 24 Aug 2021 22:01:15 +0000 (18:01 -0400)]
replace deprecated function
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)
demeritcowboy [Tue, 24 Aug 2021 13:58:55 +0000 (09:58 -0400)]
Merge pull request #20898 from JMAConsulting/issue_2701
(Smart Group) is being constantly added while editing the smart group title from 'Manage Group' page
Eileen McNaughton [Tue, 17 Aug 2021 22:44:19 +0000 (10:44 +1200)]
dev/core#2769 use php email validation not hacked qf
Per https://lab.civicrm.org/dev/core/-/issues/2769 we have had problems over the years with
quickform's email validation and we now have a hacked version that is
problematic from a maintenance pov & also doesn't work
with the string I have just encountered: name.-o-.i.10@example.com
(which I am told is valid and which passes the php filter).
We already have an email rule which calls a php native function
which is better maintained than our layers of hacks. This
PR registers our email rule - which overrides the quickform
one. If we merge this we can revert quickform back to
unhacked which will improve debugging
and maintenance (although it's actually bypassed
now with this change)
Eileen McNaughton [Tue, 24 Aug 2021 07:26:45 +0000 (19:26 +1200)]
Merge pull request #21240 from civicrm/5.41
5.41 to master
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
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
Eileen McNaughton [Tue, 24 Aug 2021 04:58:29 +0000 (16:58 +1200)]
Merge pull request #21105 from colemanw/afformSubmission
Afform - Store submissions in a new database table
Eileen McNaughton [Tue, 24 Aug 2021 04:57:43 +0000 (16:57 +1200)]
Merge pull request #21231 from civicrm/5.41
5.41
Eileen McNaughton [Mon, 23 Aug 2021 20:57:08 +0000 (08:57 +1200)]
Move the tested but crazy tax calc to the contribution api
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
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
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
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
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
Tim Otten [Tue, 24 Aug 2021 01:32:01 +0000 (18:32 -0700)]
Add release-notes/5.40.3.md
Coleman Watts [Thu, 12 Aug 2021 21:17:05 +0000 (17:17 -0400)]
Afform - Store submissions in a new database table
This adds the `civicrm_afform_submission` table and accompanying api entity,
and a new Afform setting "create_submission" which will store a
submission record whenever a form is submitted.
Seamus Lee [Tue, 24 Aug 2021 00:33:31 +0000 (10:33 +1000)]
Merge pull request #21233 from eileenmcnaughton/xml
Add date metadata for email.on_hold, reset_date
Seamus Lee [Mon, 23 Aug 2021 23:44:16 +0000 (09:44 +1000)]
Merge pull request #21228 from colemanw/afformFixTitle
Afform - fix contact source field & field defaults
Seamus Lee [Mon, 23 Aug 2021 23:35:52 +0000 (09:35 +1000)]
Merge pull request #21218 from colemanw/afformLocationType
Afform - Rename blocks and joins for clarity
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
Seamus Lee [Mon, 23 Aug 2021 23:06:47 +0000 (09:06 +1000)]
Merge pull request #21208 from colemanw/refNotes
[REF] APIv4 Notes - Ensure child notes are deleted with parent, and hooks are called
Eileen McNaughton [Mon, 23 Aug 2021 22:20:30 +0000 (10:20 +1200)]
Add date metadata for email.on_hold, reset_date
Seamus Lee [Mon, 23 Aug 2021 21:31:09 +0000 (07:31 +1000)]
Merge pull request #21229 from eileenmcnaughton/cache
Test cleanup fix
Coleman Watts [Sat, 21 Aug 2021 16:51:41 +0000 (12:51 -0400)]
Note API - Ensure child notes are deleted with parent, and hooks are called
Deprecates the CRM_Core_BAO_Note::del() function and refactors out all references to it.
Related to work on dev/core#2757
Eileen McNaughton [Mon, 23 Aug 2021 21:14:25 +0000 (09:14 +1200)]
Merge pull request #21226 from colemanw/noteRef
[REF] Remove unused/unneeded variables from Note View page
Coleman Watts [Mon, 23 Aug 2021 20:21:41 +0000 (16:21 -0400)]
Afform - Fix setting default value
String comparison was failing for integer keys.
Eileen McNaughton [Mon, 23 Aug 2021 19:48:09 +0000 (07:48 +1200)]
Test cleanup fix
Coleman Watts [Mon, 23 Aug 2021 18:43:18 +0000 (14:43 -0400)]
Afform - fix contact source field
Contact source is supposed to take its default from the afform title
This fixes it to initialize with the title and keep in sync.
Coleman Watts [Mon, 23 Aug 2021 17:43:00 +0000 (13:43 -0400)]
Refactor out unused/unneeded variables
Monish Deb [Mon, 23 Aug 2021 17:33:48 +0000 (23:03 +0530)]
Merge pull request #21213 from colemanw/entityBatchRef
EntityBatch - Deprecate del() function (dev/core#2757)
Monish Deb [Mon, 19 Jul 2021 11:56:10 +0000 (17:26 +0530)]
(Smart Group) is being constantly added while editing the smart group title from 'Manage Group' page
Coleman Watts [Sun, 22 Aug 2021 21:32:30 +0000 (17:32 -0400)]
Afform - Rename blocks and joins for clarity
Renames the ambiguously named "block" and "join" afform properties,
and changes the naming convention to "af{type}-title-munged".
Ubuntu [Mon, 23 Aug 2021 16:42:18 +0000 (16:42 +0000)]
implement-basicbatchaction-getselect
demeritcowboy [Mon, 23 Aug 2021 14:29:45 +0000 (10:29 -0400)]
Merge pull request #21223 from jitendrapurohit/dedupeerror
Fixes dev/core#2778 - Fatal error on dedupe screen
demeritcowboy [Mon, 23 Aug 2021 14:16:20 +0000 (10:16 -0400)]
Merge pull request #21222 from colemanw/delRecent
Improve test for CRM_Utils_Recent
Mathieu Lu [Mon, 23 Aug 2021 14:02:29 +0000 (10:02 -0400)]
Merge pull request #21216 from demeritcowboy/import-csv-blankline
Alternate to 20131 - Avoid crash during import for blank lines in a one-column csv file
jitendrapurohit [Mon, 23 Aug 2021 12:29:20 +0000 (17:59 +0530)]
Fix fatal error on dedupe screen
Coleman Watts [Mon, 23 Aug 2021 11:40:09 +0000 (07:40 -0400)]
Test cleanup
Debarshi Bhaumik [Mon, 23 Aug 2021 07:36:37 +0000 (13:06 +0530)]
Replace double quotes with single quote
Eileen McNaughton [Mon, 23 Aug 2021 06:53:29 +0000 (18:53 +1200)]
Merge pull request #21204 from colemanw/delRecent
[REF] CRM_Utils_Recent - Use hook listener to delete items
Coleman Watts [Sat, 21 Aug 2021 19:51:29 +0000 (15:51 -0400)]
[REF] - Clean up recentItems functions and add test
Use array_filter() instead of brittle for() loops.
Eileen McNaughton [Mon, 23 Aug 2021 02:50:23 +0000 (14:50 +1200)]
Merge pull request #21219 from eileenmcnaughton/acl_cache
Extract ACL contact cache clearing part out
Seamus Lee [Sun, 22 Aug 2021 23:43:26 +0000 (09:43 +1000)]
Merge pull request #21191 from JMAConsulting/dev_2774
dev/core#2774 : Sort by date column on multirecord field listing section on profile edit mode doesn't work
Eileen McNaughton [Sun, 22 Aug 2021 23:30:11 +0000 (11:30 +1200)]
Extract ACL contact cache clearing part out
This allows us to be nuanced in the acl delete part & still clear the contact cache part
Coleman Watts [Sat, 21 Aug 2021 19:11:37 +0000 (15:11 -0400)]
CRM_Utils_Recent - Use hook listener to delete items
dev/core#2757
Eileen McNaughton [Sun, 22 Aug 2021 23:26:49 +0000 (11:26 +1200)]
Merge pull request #21201 from colemanw/hookDeleteAcl
[REF] dev/core#2757 Move acl delete logic to an event listener
Seamus Lee [Sun, 22 Aug 2021 22:58:17 +0000 (08:58 +1000)]
Merge pull request #21215 from demeritcowboy/alterExtern
[NFC] CRM_Utils_SystemTest - Call to Uri->withPath() using deprecated format
colemanw [Sun, 22 Aug 2021 22:26:32 +0000 (18:26 -0400)]
Merge pull request #21214 from demeritcowboy/extupg
[NFC] CRM_Extension_Manager_ModuleUpgTest - use ?? instead of error-suppression operator
Coleman Watts [Sun, 22 Aug 2021 19:38:03 +0000 (15:38 -0400)]
SearchKit - Allow tokens in menu button text
demeritcowboy [Sun, 22 Aug 2021 14:10:57 +0000 (10:10 -0400)]
avoid crash with one column and blank lines
demeritcowboy [Sun, 22 Aug 2021 11:25:42 +0000 (07:25 -0400)]
deprecated format
Coleman Watts [Sun, 22 Aug 2021 05:21:45 +0000 (01:21 -0400)]
EntityBatch - Deprecate del() function
colemanw [Sun, 22 Aug 2021 05:13:57 +0000 (01:13 -0400)]
Merge pull request #21200 from colemanw/delFunctions
[REF] Deprecate unnecessary del() functions
Coleman Watts [Fri, 20 Aug 2021 18:22:06 +0000 (14:22 -0400)]
Deprecate unnecessary del() functions
demeritcowboy [Sun, 22 Aug 2021 00:08:31 +0000 (20:08 -0400)]
avoid error-supression operator
Seamus Lee [Sat, 21 Aug 2021 22:34:35 +0000 (08:34 +1000)]
Merge pull request #21209 from colemanw/removeUnusedFunctions
Remove unused, duplicate functions getEntitiesByTag
Coleman Watts [Fri, 20 Aug 2021 19:54:06 +0000 (15:54 -0400)]
Move acl delete logic to an event listener
Coleman Watts [Sat, 21 Aug 2021 20:10:36 +0000 (16:10 -0400)]
Remove unused, duplicate functions getEntitiesByTag
According to https://issues.civicrm.org/jira/browse/CRM-13156
the functions were only ever used in the v2 API, which no longer exists.
colemanw [Sat, 21 Aug 2021 18:08:50 +0000 (14:08 -0400)]
Merge pull request #21206 from demeritcowboy/extmgrmodtest
[NFC] CRM_Extension_Manager_ModuleTest - use ?? instead of error-suppression operator
colemanw [Sat, 21 Aug 2021 16:21:04 +0000 (12:21 -0400)]
Merge pull request #21207 from demeritcowboy/queueservice
CRM_Queue_Service - Use ?? instead of error-supression operator
demeritcowboy [Sat, 21 Aug 2021 12:28:35 +0000 (08:28 -0400)]
avoid error-supression operator
demeritcowboy [Sat, 21 Aug 2021 11:54:46 +0000 (07:54 -0400)]
avoid error-suppression operator
colemanw [Sat, 21 Aug 2021 05:13:07 +0000 (01:13 -0400)]
Merge pull request #21203 from eileenmcnaughton/master
5.41 to master (conflicts resolved)
Eileen McNaughton [Sat, 21 Aug 2021 00:13:19 +0000 (12:13 +1200)]
Merge branch '5.41' of github.com:civicrm/civicrm-core
colemanw [Sat, 21 Aug 2021 01:14:34 +0000 (21:14 -0400)]
Merge pull request #21184 from colemanw/pseudoconstantFixes
APIv4 pseudoconstant improvements
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)
Eileen McNaughton [Fri, 20 Aug 2021 22:09:30 +0000 (10:09 +1200)]
Merge pull request #21193 from mattwire/settitle1
REF Switch to CRM_Core_Form::setTitle() instead of CRM_Utils_System::setTitle() part 1
Monish Deb [Fri, 20 Aug 2021 06:51:19 +0000 (12:21 +0530)]
dev/core#2774 : Sort by date column on multirecord field listing section on profile edit mode doesn't work
colemanw [Fri, 20 Aug 2021 17:50:09 +0000 (13:50 -0400)]
Merge pull request #21194 from kurund/grid-display-layout
add grid layout support for searchkit
Tano Rojas [Fri, 20 Aug 2021 16:16:14 +0000 (23:16 +0700)]
Add tests for pdf filename assignation
Coleman Watts [Thu, 19 Aug 2021 14:22:13 +0000 (10:22 -0400)]
APIv4 - Add 'suffixes' to getFields metadata
This breaks apart the concept of a field having 'options' vs
a field supporting suffixes like campaign_id:label.
It is now possible for a field to not have options but still support suffixes.
This also makes the available suffixes for each field discoverable,
e.g. fields like state_province_id support an :abbr suffix.
Coleman Watts [Wed, 18 Aug 2021 21:47:20 +0000 (17:47 -0400)]
REF - Remove redundant `use` statements and add docblock
Coleman Watts [Wed, 18 Aug 2021 19:12:58 +0000 (15:12 -0400)]
Pseudoconstant - always explicitly name abbrColumn
Stop the overly-clever guesswork of abbrColumn so that
it can always be know if a pseudoconstant has an abbreviation.