eileen [Mon, 22 Mar 2021 21:10:11 +0000 (10:10 +1300)]
[REF] Simplify BAO_ACL table references
It does not appear to me, from my testing that the value in entity_table could
be something other than the actual table name (in fact I suspect
it would only ever be civicrm_acl_role - I'm working to confirm that).
This simplifies and switches to executeQuery which is multilingual aware
Seamus Lee [Mon, 22 Mar 2021 22:33:16 +0000 (09:33 +1100)]
Merge pull request #19829 from vingle/patch-11
Add .clear class to break inline flow on social share footer
Eileen McNaughton [Mon, 22 Mar 2021 21:24:11 +0000 (10:24 +1300)]
Merge pull request #19716 from jitendrapurohit/lifetime
update to lifetime membership does not clear the end date
Seamus Lee [Mon, 22 Mar 2021 21:21:53 +0000 (08:21 +1100)]
Merge pull request #19866 from eileenmcnaughton/nfc
[NFC] Cleanup in test class
colemanw [Mon, 22 Mar 2021 20:44:11 +0000 (16:44 -0400)]
Merge pull request #19660 from totten/master-afform-token
Afform - Add support for email tokens `{afform.myFormUrl}`
colemanw [Mon, 22 Mar 2021 20:35:23 +0000 (16:35 -0400)]
Merge pull request #19858 from eileenmcnaughton/loop
Fix loop
colemanw [Mon, 22 Mar 2021 14:04:38 +0000 (10:04 -0400)]
Merge pull request #19856 from colemanw/customFieldLabels
SearchKit - Include custom group title with custom field label
eileen [Mon, 22 Mar 2021 10:45:44 +0000 (23:45 +1300)]
Remove never-gonna-happen todos
eileen [Mon, 22 Mar 2021 10:41:28 +0000 (23:41 +1300)]
Share function for identical code
eileen [Mon, 22 Mar 2021 10:36:54 +0000 (23:36 +1300)]
Use custom data trait for custom data
eileen [Mon, 22 Mar 2021 10:30:46 +0000 (23:30 +1300)]
Remove call to deprecated function
eileen [Mon, 22 Mar 2021 10:20:23 +0000 (23:20 +1300)]
[NFC] Cleanup in test class
Eileen McNaughton [Mon, 22 Mar 2021 08:52:26 +0000 (21:52 +1300)]
Merge pull request #19864 from eileenmcnaughton/nfc
[NFC] Minor cleanup on test class
Seamus Lee [Mon, 22 Mar 2021 08:18:57 +0000 (19:18 +1100)]
Merge pull request #19861 from eileenmcnaughton/mem_tax
[REF] Simplify a couple of variables
eileen [Mon, 22 Mar 2021 07:20:28 +0000 (20:20 +1300)]
[NFC] Minor cleanup on test class
Eileen McNaughton [Mon, 22 Mar 2021 04:34:32 +0000 (17:34 +1300)]
Merge pull request #19603 from JMAConsulting/issue-2226
core#2226: Scheduled Reminder fails to send if From Name includes comma
Eileen McNaughton [Mon, 22 Mar 2021 03:32:06 +0000 (16:32 +1300)]
Merge pull request #18466 from mattwire/scheduledJobFatalErrorHandler
Remove fatalErrorHandler from scheduled jobs manager
eileen [Mon, 22 Mar 2021 02:41:55 +0000 (15:41 +1300)]
[REF] Simplify a couple of variables
Rather than rely on these being passed around retrieve them with
a consistent function.
Note tax_amount is retrieved one other place but that is fixed in
https://github.com/civicrm/civicrm-core/pull/19757
Line item will be used less once
https://github.com/civicrm/civicrm-core/pull/19801 is merged
Seamus Lee [Mon, 22 Mar 2021 01:12:47 +0000 (12:12 +1100)]
Merge pull request #19857 from eileenmcnaughton/task1
[REF] Extract getQueryParams
Seamus Lee [Mon, 22 Mar 2021 01:09:09 +0000 (12:09 +1100)]
Merge pull request #19859 from civicrm/5.36
5.36
Seamus Lee [Mon, 22 Mar 2021 01:07:36 +0000 (12:07 +1100)]
Merge pull request #19728 from totten/master-authx-guards
(dev/core#2077) AuthX - Allow optional "guards"
colemanw [Mon, 22 Mar 2021 00:11:42 +0000 (20:11 -0400)]
Merge pull request #19812 from eileenmcnaughton/recur
[REF] Clarify & simplify is_recur param
Coleman Watts [Sun, 21 Mar 2021 22:11:59 +0000 (18:11 -0400)]
SearchKit - Include custom group title with custom field label
This makes it easier to tell custom fields apart in SearchKit when they have similar names to core or other custom fields.
This takes advantage of API4.getFields returning both a "title" and "label" attribute.
This keeps "title" the same while appending group title to "label".
colemanw [Sun, 21 Mar 2021 23:39:41 +0000 (19:39 -0400)]
Merge pull request #19825 from colemanw/api4BridgeJoinSubquery
APIv4 - Use subquery to LEFT JOIN via a bridge entity
eileen [Sun, 21 Mar 2021 23:19:47 +0000 (12:19 +1300)]
Fix loop
It turns out that if you 'break' advanced search (in my case
I applied a patch that caused invalid sql) it enters a loop.
I really can't see why 'while' would have ever made sense here.
There is nothing to cause it to 'move along'
eileen [Fri, 19 Mar 2021 21:13:56 +0000 (10:13 +1300)]
Extract getQueryParams
Coleman Watts [Sun, 21 Mar 2021 20:32:54 +0000 (16:32 -0400)]
SearchKit - Add "EXCLUDE" join type, to search for entities that do not have a relationship to another entity
Coleman Watts [Thu, 18 Mar 2021 01:53:31 +0000 (21:53 -0400)]
APIv4 - Use subquery to LEFT JOIN via a bridge entity
Bridge entities are supposed to be transparent in APIv4, but when LEFT joining,
an artifact of the double-join would give extraneous results.
Coleman Watts [Wed, 17 Mar 2021 12:41:54 +0000 (08:41 -0400)]
APIv4 - Simplify long function by extracting part of it
colemanw [Sun, 21 Mar 2021 20:50:36 +0000 (16:50 -0400)]
Merge pull request #19828 from eileenmcnaughton/act_contact_hook
dev/core#2390 Add hook support for Activity Contact
colemanw [Sun, 21 Mar 2021 20:36:27 +0000 (16:36 -0400)]
Merge pull request #19842 from eileenmcnaughton/task
[unreleased regression] Fix export contribution to share tasktrait
Eileen McNaughton [Sun, 21 Mar 2021 20:35:11 +0000 (09:35 +1300)]
Merge pull request #19853 from colemanw/api4ExplorerCssFix
Api4 Explorer - Prevent long results from breaking layout
eileen [Sun, 21 Mar 2021 20:33:54 +0000 (09:33 +1300)]
Fix ts to E::ts
Tim Otten [Thu, 4 Mar 2021 12:41:34 +0000 (04:41 -0800)]
authx - If 'authx_guards' is set, then enforce them
Tim Otten [Thu, 4 Mar 2021 10:17:01 +0000 (02:17 -0800)]
authx - Declare setting "authx_guards"
Eileen McNaughton [Sun, 21 Mar 2021 19:56:11 +0000 (08:56 +1300)]
Merge pull request #19826 from demeritcowboy/nomulticase
dev/core#2463 - Remove loop that since at least 5.23 does nothing for single cases and crashes for multiple, and for multiple recipients only uses the last activity id for 5.36+
Coleman Watts [Sun, 21 Mar 2021 19:11:02 +0000 (15:11 -0400)]
Api4 Explorer - Prevent long results from breaking layout
Eileen McNaughton [Sat, 20 Mar 2021 06:56:12 +0000 (19:56 +1300)]
Merge pull request #19852 from eileenmcnaughton/nfc_test
[NFC] Minor test cleanup
Seamus Lee [Sat, 20 Mar 2021 05:29:48 +0000 (16:29 +1100)]
Merge pull request #19851 from demeritcowboy/ids-php74
dev/core#2366 - Failing test for php 7.4 and IDS for non-admins
eileen [Sat, 20 Mar 2021 04:12:05 +0000 (17:12 +1300)]
[NFC] Minor test cleanup
Eileen McNaughton [Sat, 20 Mar 2021 03:11:24 +0000 (16:11 +1300)]
Merge pull request #19850 from seamuslee001/mysql8_logging_test_fix
[NFC] Fix logging schema test to work on MySQL8 as it no longer outpu…
demeritcowboy [Sat, 20 Mar 2021 02:58:11 +0000 (22:58 -0400)]
failing test for php 7.4 and IDS
Seamus Lee [Sat, 20 Mar 2021 01:49:08 +0000 (12:49 +1100)]
[NFC] Fix logging schema test to work on MySQL8 as it no longer outputs a length for int columns
Seamus Lee [Sat, 20 Mar 2021 00:08:56 +0000 (11:08 +1100)]
Merge pull request #19849 from seamuslee001/member_event_form_test_fixes
[NFC] Fix test failures on PHP 7.4 caused by either NULL being set fo…
Seamus Lee [Fri, 19 Mar 2021 23:27:12 +0000 (10:27 +1100)]
Merge pull request #19847 from seamuslee001/fix_test_failures_mysql8
[NFC] Fix Test failures on MySQL 8 caused by change in output of eith…
Seamus Lee [Fri, 19 Mar 2021 23:07:44 +0000 (10:07 +1100)]
Merge pull request #19846 from seamuslee001/fix_contribution_page_tests
[NFC] Fix PHP 7.4 errors on ContributionPage tests
Seamus Lee [Fri, 19 Mar 2021 23:06:06 +0000 (10:06 +1100)]
Merge pull request #19845 from seamuslee001/fix_membership_type_test
[NFC] Fix Membership Type Test error on php7.4
Seamus Lee [Fri, 19 Mar 2021 22:47:55 +0000 (09:47 +1100)]
Merge pull request #19844 from seamuslee001/php74_membership_api_fix
[REF] Fix APIv3 MembershipJob test failure on php7.4 by only doing ch…
Seamus Lee [Fri, 19 Mar 2021 22:45:52 +0000 (09:45 +1100)]
[NFC] Fix test failures on PHP 7.4 caused by either NULL being set for the membership_type_id or Payment Processor not being set on the form
Seamus Lee [Fri, 19 Mar 2021 22:17:14 +0000 (09:17 +1100)]
[NFC] Fix Test failures on MySQL 8 caused by change in output of either create table or Column names in queries
Seamus Lee [Fri, 19 Mar 2021 21:54:54 +0000 (08:54 +1100)]
[NFC] Fix PHP 7.4 errors on ContributionPage tests
Seamus Lee [Fri, 19 Mar 2021 21:37:06 +0000 (08:37 +1100)]
[NFC] Fix Membership Type Test error on php7.4
Seamus Lee [Fri, 19 Mar 2021 21:29:30 +0000 (08:29 +1100)]
[REF] Fix APIv3 MembershipJob test failure on php7.4 by only doing checking if it is not empty
eileen [Fri, 19 Mar 2021 20:55:47 +0000 (09:55 +1300)]
Fix export contribution to share tasktrait
colemanw [Fri, 19 Mar 2021 19:07:12 +0000 (15:07 -0400)]
Merge pull request #19787 from demeritcowboy/cancel-button
dev/financial#170 - Cancel button on financial batch export is no longer an input so code needs updating
colemanw [Fri, 19 Mar 2021 17:43:16 +0000 (13:43 -0400)]
Merge pull request #19839 from tschuettler/core_2466
(dev/core#2466) - Drop HTML markup in exports for link custom fields
colemanw [Fri, 19 Mar 2021 17:43:00 +0000 (13:43 -0400)]
Merge pull request #19834 from eileenmcnaughton/seq
Code cleanup in bootstrap.php
colemanw [Fri, 19 Mar 2021 12:18:25 +0000 (08:18 -0400)]
Merge pull request #19835 from eileenmcnaughton/task
[REF] Minor function extraction
Thomas Schüttler [Fri, 19 Mar 2021 11:25:34 +0000 (12:25 +0100)]
Drop HTML markup in exports for link custom fields
Seamus Lee [Fri, 19 Mar 2021 08:57:16 +0000 (19:57 +1100)]
Merge pull request #19838 from eileenmcnaughton/nfc
[NFC] Minor coding standards cleanup
Seamus Lee [Fri, 19 Mar 2021 03:52:54 +0000 (14:52 +1100)]
Merge pull request #19836 from eileenmcnaughton/legacy
Remove legacy phpunit param
eileen [Fri, 19 Mar 2021 02:50:51 +0000 (15:50 +1300)]
[NFC] Minor coding standards cleanup
eileen [Fri, 19 Mar 2021 01:32:32 +0000 (14:32 +1300)]
[REF] Minor function extraction
Seamus Lee [Fri, 19 Mar 2021 02:02:27 +0000 (13:02 +1100)]
Merge pull request #19833 from eileenmcnaughton/test
Remove safe+mode setting
eileen [Fri, 19 Mar 2021 02:00:19 +0000 (15:00 +1300)]
Remove legacy phpunit param
Seamus Lee [Fri, 19 Mar 2021 01:48:18 +0000 (12:48 +1100)]
Merge pull request #19832 from seamuslee001/core_ext_void
[NFC] Add in Void statements on varios Core Ext Tests to future support PHP…
Eileen McNaughton [Fri, 19 Mar 2021 01:10:58 +0000 (14:10 +1300)]
Merge pull request #19624 from agileware/CIVICRM-1670
Issue #2384 - Remove text about email receipts for each recurring contribution
eileen [Fri, 19 Mar 2021 00:38:13 +0000 (13:38 +1300)]
Code cleanup in bootstrap.php
eileen [Fri, 19 Mar 2021 00:27:10 +0000 (13:27 +1300)]
Remove safe+mode setting
This is php5.4 compatibility = not needed
Seamus Lee [Fri, 19 Mar 2021 00:14:49 +0000 (11:14 +1100)]
Add in Void statements on varios Core Ext Tests to future support PHPUnit8
Eileen McNaughton [Thu, 18 Mar 2021 22:07:46 +0000 (11:07 +1300)]
Merge pull request #19831 from colemanw/angularUpgrade
Upgrade angularJs from 1.8.0 to 1.8.2
Seamus Lee [Thu, 18 Mar 2021 21:48:55 +0000 (08:48 +1100)]
Merge pull request #19753 from eileenmcnaughton/format
dev/core#1494 & dev/translation#65 call brickmoney number formatting, where supported
Eileen McNaughton [Thu, 18 Mar 2021 21:24:42 +0000 (10:24 +1300)]
Merge pull request #19830 from kewljuice/patch-6
Fix deprecated Redis::delete() (issue #2468)
Coleman Watts [Thu, 18 Mar 2021 20:34:05 +0000 (16:34 -0400)]
Upgrade angularJs from 1.8.0 to 1.8.2
Wouter H [Thu, 18 Mar 2021 19:45:52 +0000 (20:45 +0100)]
Fix deprecated Redis::delete() (issue #2468)
Nicol [Thu, 18 Mar 2021 14:33:40 +0000 (15:33 +0100)]
Add .clear class to override left float on buttons
.crm-button has a float: left, which was added in #18880, and can in some themes cause the subsequent lines to flow back inline. This fixes that (and adds a little padding under the buttons).
Seamus Lee [Thu, 18 Mar 2021 08:33:13 +0000 (19:33 +1100)]
Merge pull request #19827 from civicrm/5.36
5.36
eileen [Thu, 18 Mar 2021 06:57:05 +0000 (19:57 +1300)]
dev/core#2390 Add hook support for Activity Contact
Alternative to https://github.com/civicrm/civicrm-core/pull/19623
per comments on that PR.
Tim Otten [Thu, 18 Mar 2021 02:00:27 +0000 (19:00 -0700)]
Add release-notes/5.35.1
Tim Otten [Tue, 16 Feb 2021 21:45:23 +0000 (13:45 -0800)]
(security/core#105) Joomla::authenticate() - Fix escaping
Tim Otten [Tue, 16 Feb 2021 21:42:52 +0000 (13:42 -0800)]
(security/core#105) Joomla::checkUserNameEmailExists - Fix mismatched escaping
This uses the escaping rule from CRM_Core_DAO to construct a query for JDatabaseDriver.
However, they use different connections and (therefore) could require different
escaping rules.
Tim Otten [Thu, 25 Feb 2021 01:54:42 +0000 (17:54 -0800)]
(security/core#104) CRM_Utils_System::authenticateKey - Use secure equality test
Tim Otten [Thu, 25 Feb 2021 05:01:26 +0000 (21:01 -0800)]
(security/core#97) PHP CLI guard is the opposite of correct
Coleman Watts [Fri, 29 Jan 2021 19:30:38 +0000 (14:30 -0500)]
Escape api params in APIv4 Explorer
Seamus Lee [Wed, 23 Dec 2020 09:04:18 +0000 (20:04 +1100)]
Purify PCP introductory text field
Seamus Lee [Wed, 23 Dec 2020 08:45:56 +0000 (19:45 +1100)]
Escape information supplied by extensions to prevent XSS
Seamus Lee [Mon, 9 Nov 2020 09:11:24 +0000 (20:11 +1100)]
security/core#97 Ensure that php scripts where applicable in sql and tools that should only be run in CLI can be run in CLI
Use more portable check for cli and add in 404 header as per Rich's comments
Seamus Lee [Mon, 16 Nov 2020 08:06:16 +0000 (19:06 +1100)]
security/core#100 Escape uploaded data to prevent Reflected Cross site scripting from uploaded CSVs
demeritcowboy [Thu, 18 Mar 2021 02:49:41 +0000 (22:49 -0400)]
remove loop that since at least 5.23 does nothing for single cases and crashes for multiple, and for multiple recipients only uses the last activity id for 5.36+
Seamus Lee [Wed, 17 Mar 2021 21:50:01 +0000 (08:50 +1100)]
Merge pull request #19824 from eileenmcnaughton/url_form
Remove now-empty function
Eileen McNaughton [Wed, 17 Mar 2021 19:21:44 +0000 (08:21 +1300)]
Merge pull request #19765 from colemanw/inPlaceEdit
SearchKit - Add "in-place edit" feature
eileen [Wed, 17 Mar 2021 19:20:50 +0000 (08:20 +1300)]
Remove now-empty function
Eileen McNaughton [Wed, 17 Mar 2021 19:19:00 +0000 (08:19 +1300)]
Merge pull request #19823 from tunbola/fix-isfrontpage-wrong-value
dev/core#2464: Fix Drupal Base 'isFrontEndPage' Returns Wrong Value After Saving A Settings Page
Tunbola Ogunwande [Wed, 17 Mar 2021 14:07:59 +0000 (15:07 +0100)]
dev/core#2464: Rebuild Menu after clearing db cache
colemanw [Wed, 17 Mar 2021 01:45:39 +0000 (21:45 -0400)]
Merge pull request #19766 from WeMoveEU/faster-select2-groups
dev/core#2451 Faster processing of optgroups in select2 elements
colemanw [Wed, 17 Mar 2021 01:38:45 +0000 (21:38 -0400)]
Merge pull request #19816 from eileenmcnaughton/dupe_state
[NFC] Minor IDE cleanup in test class
Eileen McNaughton [Tue, 16 Mar 2021 22:07:09 +0000 (11:07 +1300)]
Merge pull request #19821 from eileenmcnaughton/import
Remove an unnecessary ampersand
eileen [Tue, 16 Mar 2021 20:28:42 +0000 (09:28 +1300)]
Remove an unnecessary ampersand
Eileen McNaughton [Tue, 16 Mar 2021 07:15:26 +0000 (20:15 +1300)]
Merge pull request #19794 from MegaphoneJon/core-2459
dev/core#2459 Fix custom fields changed from multiple-choice data type to Text
Eileen McNaughton [Tue, 16 Mar 2021 07:10:59 +0000 (20:10 +1300)]
Merge pull request #19798 from colemanw/api4cleanup
APIv4 - Code cleanup & improve links to @see annotations in Explorer