Eileen McNaughton [Thu, 21 Apr 2022 04:56:52 +0000 (16:56 +1200)]
Merge pull request #23264 from mlutfy/ui47scroll
dev/user-interface#47 Disable scrolling on time inputs
Eileen McNaughton [Thu, 21 Apr 2022 04:56:34 +0000 (16:56 +1200)]
Merge pull request #23267 from civicrm/5.49
5.49 to master
Eileen McNaughton [Thu, 21 Apr 2022 04:55:51 +0000 (16:55 +1200)]
Merge pull request #23265 from colemanw/pivotTablesFix
SearchKit - Fix selection of fields when creating a Data Segment
Eileen McNaughton [Thu, 21 Apr 2022 02:52:09 +0000 (14:52 +1200)]
Merge pull request #23266 from colemanw/castToArray
APIv4 - Avoid php error
Coleman Watts [Thu, 21 Apr 2022 00:21:29 +0000 (20:21 -0400)]
APIv4 - Avoid php error
Prevents a php error when calling `array_merge()` on `null`.
Eileen McNaughton [Thu, 21 Apr 2022 00:19:25 +0000 (12:19 +1200)]
Merge pull request #23246 from jmcclelland/CustomCheckboxContributionImport
ensure checkbox custom fields on contributions import properly
Coleman Watts [Wed, 20 Apr 2022 22:41:00 +0000 (18:41 -0400)]
SearchKit - Fix selection of fields when creating a Data Segment
Eileen McNaughton [Wed, 20 Apr 2022 21:51:29 +0000 (09:51 +1200)]
Merge pull request #23059 from colemanw/pivotTables
SearchKit - Add data segmentation functionality
Mathieu Lutfy [Wed, 20 Apr 2022 17:44:02 +0000 (13:44 -0400)]
dev/user-interface#47 Disable scrolling on time inputs
colemanw [Wed, 20 Apr 2022 15:14:28 +0000 (11:14 -0400)]
Merge pull request #23159 from eileenmcnaughton/event
Minor simplification of getAmountLevelText
colemanw [Wed, 20 Apr 2022 15:12:25 +0000 (11:12 -0400)]
Merge pull request #23216 from eileenmcnaughton/import_more
[REF] [Import] Use shared file instead of now-identical files
colemanw [Wed, 20 Apr 2022 15:11:29 +0000 (11:11 -0400)]
Merge pull request #23190 from eileenmcnaughton/pradeep
Start to fix misnamed FinancialTrxn bao
colemanw [Wed, 20 Apr 2022 15:07:01 +0000 (11:07 -0400)]
Merge pull request #23213 from eileenmcnaughton/post
[REF] Do not pass form properties within the form
colemanw [Wed, 20 Apr 2022 15:05:23 +0000 (11:05 -0400)]
Merge pull request #23219 from eileenmcnaughton/import_cust
[REF] [Import] Standardise import text for CustomData import
colemanw [Wed, 20 Apr 2022 15:03:51 +0000 (11:03 -0400)]
Merge pull request #23224 from totten/master-signing-signage
System Check - Add a reminder about CIVICRM_SIGN_KEYS.
colemanw [Wed, 20 Apr 2022 15:02:23 +0000 (11:02 -0400)]
Merge pull request #23185 from eileenmcnaughton/smarty_wiz
Do not escape wizard class - procede straight to Hogwarts
colemanw [Wed, 20 Apr 2022 14:44:38 +0000 (10:44 -0400)]
Merge pull request #23195 from eileenmcnaughton/ds3
[Ref] [Import] [csv] Remove non-functional code
colemanw [Wed, 20 Apr 2022 11:22:43 +0000 (07:22 -0400)]
Merge pull request #23211 from eileenmcnaughton/event1
[REF] Fix test to use form flow / helper
Tim Otten [Wed, 20 Apr 2022 04:45:19 +0000 (21:45 -0700)]
Merge pull request #22805 from braders/permission_denied_wordpress_improvement-alternative
WordPress - Display site-theme/decorations on error screens
Eileen McNaughton [Wed, 20 Apr 2022 02:29:37 +0000 (14:29 +1200)]
Merge pull request #23258 from civicrm/5.49
5.49 to master
Tim Otten [Wed, 20 Apr 2022 02:20:45 +0000 (19:20 -0700)]
Merge pull request #23251 from colemanw/managedEntityCleanup
Managed entity cleanup
Tim Otten [Wed, 20 Apr 2022 02:18:20 +0000 (19:18 -0700)]
Merge pull request #23257 from totten/master-error-test
E2E_Core_ErrorTest - Demonstrate whether error pages are well-formed
Seamus Lee [Wed, 20 Apr 2022 01:37:24 +0000 (11:37 +1000)]
Merge pull request #23256 from colemanw/fixDownloadInvoiceButtonPort
Fix dev/core#3168 broken download contribution invoice button
Eileen McNaughton [Wed, 20 Apr 2022 00:55:01 +0000 (12:55 +1200)]
Merge pull request #23164 from mlutfy/eventCancelWaitlist
Event self-service cancel: allow cancelling Waitlist registration
Jamie McClelland [Tue, 19 Apr 2022 13:41:41 +0000 (09:41 -0400)]
ensure checkbox custom fields on contributions import properly
Eileen McNaughton [Wed, 20 Apr 2022 00:07:04 +0000 (12:07 +1200)]
Merge pull request #23247 from colemanw/searchKitAggFix
SearchKit - Prevent errors trying to orderBy nonaggregated columns
Tim Otten [Tue, 19 Apr 2022 22:06:28 +0000 (15:06 -0700)]
E2E_Core_ErrorTest - Demonstrate whether error-pages are well-formed
Coleman Watts [Tue, 19 Apr 2022 22:43:52 +0000 (18:43 -0400)]
Fix dev/core#3168 broken download contribution invoice button
colemanw [Tue, 19 Apr 2022 22:46:59 +0000 (18:46 -0400)]
Merge pull request #23202 from eileenmcnaughton/pay_links
Fix button breakage on viewContribution
colemanw [Tue, 19 Apr 2022 22:41:48 +0000 (18:41 -0400)]
Merge pull request #23253 from eileenmcnaughton/imp_if
[REF] [Import] Obsolete if removal
Eileen McNaughton [Tue, 19 Apr 2022 22:34:56 +0000 (10:34 +1200)]
Merge pull request #23222 from eileenmcnaughton/in_between
[REF] [Import] [Custom] Remove another in-between class
Tim Otten [Tue, 19 Apr 2022 22:02:48 +0000 (15:02 -0700)]
(REF) HttpTestTrait - Promote `assertBodyRegexp()` from `AllFlowsTest` to `HttpTestTrait`
Coleman Watts [Tue, 19 Apr 2022 14:07:13 +0000 (10:07 -0400)]
SearchKit - Prevent errors trying to orderBy nonaggregated columns when using groupBy
Eileen McNaughton [Fri, 15 Apr 2022 04:09:54 +0000 (16:09 +1200)]
Remove another in-between class
A universe search shows no other references
Eileen McNaughton [Mon, 18 Apr 2022 04:31:06 +0000 (16:31 +1200)]
[REF] [Import] Obsolete if removal
This if was left in in the last patch for readability
Coleman Watts [Tue, 19 Apr 2022 18:51:42 +0000 (14:51 -0400)]
ManagedEntities - Refactor class variable $declarations to local variable
demeritcowboy [Tue, 19 Apr 2022 17:40:56 +0000 (13:40 -0400)]
Merge pull request #23183 from eileenmcnaughton/notice
Ensure tags fields are assigned to tpl for email form test
Coleman Watts [Tue, 19 Apr 2022 15:46:41 +0000 (11:46 -0400)]
ManagedEntities - Refactor class variable $plan to local variable
colemanw [Tue, 19 Apr 2022 14:48:08 +0000 (10:48 -0400)]
Merge pull request #23215 from eileenmcnaughton/test_amount
Take a reality check on moneyCleaning in test
colemanw [Tue, 19 Apr 2022 14:46:16 +0000 (10:46 -0400)]
Merge pull request #23237 from eileenmcnaughton/data_source
[REF] [Import] Stop overloading dataSource form
Yashodha Chaku [Tue, 19 Apr 2022 12:40:15 +0000 (18:10 +0530)]
Merge pull request #23235 from eileenmcnaughton/acl
Fix sql error on acl user
Yashodha Chaku [Tue, 19 Apr 2022 12:37:14 +0000 (18:07 +0530)]
Merge pull request #23242 from eileenmcnaughton/imp_var
[REF] [Import] Remove meaningless code
Matthew Wire [Tue, 19 Apr 2022 11:09:11 +0000 (12:09 +0100)]
Merge pull request #23156 from eileenmcnaughton/pppro
Paypal pro, a.net ipn - do not update start date, status
Seamus Lee [Tue, 19 Apr 2022 10:23:14 +0000 (20:23 +1000)]
Merge pull request #22959 from colemanw/managedRefactor
ManagedEntities - Allow targeted reconciliation. Add hook parameter. Simplify logic.
Matthew Wire [Tue, 19 Apr 2022 09:43:54 +0000 (10:43 +0100)]
Merge pull request #23210 from eileenmcnaughton/cancel
Always use cancelSubscription form for cancelling recurring contributions
Tim Otten [Tue, 19 Apr 2022 07:06:43 +0000 (00:06 -0700)]
ManagedEntitiesTest - Add coverage for filtering by module
demeritcowboy [Tue, 19 Apr 2022 03:49:16 +0000 (23:49 -0400)]
Merge pull request #23244 from eileenmcnaughton/wow
I have no words
Eileen McNaughton [Tue, 19 Apr 2022 02:05:19 +0000 (14:05 +1200)]
I have no words
Eileen McNaughton [Tue, 19 Apr 2022 01:39:34 +0000 (13:39 +1200)]
Merge pull request #23241 from eileenmcnaughton/import_abstract
[REF] [Import] remove pointless fini functions.
colemanw [Tue, 19 Apr 2022 00:48:49 +0000 (20:48 -0400)]
Merge pull request #23240 from eileenmcnaughton/import_codes
[REF] [Import] Remove warning count - never returned
Eileen McNaughton [Mon, 18 Apr 2022 23:21:38 +0000 (11:21 +1200)]
[REF] [Import] remove pointless fini functions.
These never do anything - there are there only through copy & paste + a the abstract class requiring them.
In fact all the abstract functions are dumb - the are only called internally
within the classes so I have gotten rid of the abstractness so they
can be removed at will. import makes sense - but the signature doesn't...
Eileen McNaughton [Tue, 19 Apr 2022 00:03:30 +0000 (12:03 +1200)]
Remove meaningless code
Eileen McNaughton [Mon, 18 Apr 2022 23:54:17 +0000 (11:54 +1200)]
Merge pull request #23239 from colemanw/afformLineup
Afform - Improve dragging into dropzones
Tim Otten [Sat, 16 Apr 2022 02:04:06 +0000 (19:04 -0700)]
hook_managed - Accept option module filter
colemanw [Mon, 18 Apr 2022 22:27:30 +0000 (18:27 -0400)]
Merge pull request #23236 from eileenmcnaughton/mapField
[Ref] [Import] Remove another good intention....mapField
Coleman Watts [Thu, 17 Mar 2022 02:00:54 +0000 (22:00 -0400)]
REF - Refactor ManagedEntities with the ability to reconcile a single module
Reconciling a single module (e.g. Afform) is more efficient.
Further refactoring of ManagedEntities for code simplification and efficiency.
Instead of fetching Managed records 3 times (for enabled, disabled and missing modules),
now they are fetched only once and sorted into the correct category.
Eileen McNaughton [Mon, 18 Apr 2022 22:01:19 +0000 (10:01 +1200)]
[REF] [Import] Remove warning count - never returned
Coleman Watts [Mon, 18 Apr 2022 19:42:16 +0000 (15:42 -0400)]
Afform - Improve dragging into dropzones
Eileen McNaughton [Mon, 18 Apr 2022 01:54:32 +0000 (13:54 +1200)]
Stop overloading dataSource form
Coleman Watts [Sun, 17 Apr 2022 18:58:27 +0000 (14:58 -0400)]
SearchKit - Refresh fields after saving a SearchSegment
Coleman Watts [Wed, 30 Mar 2022 23:42:41 +0000 (19:42 -0400)]
SearchKit - Add UI for editing SearchSegments
Coleman Watts [Sat, 16 Apr 2022 23:09:58 +0000 (19:09 -0400)]
SearchKit - Move loadFieldOptions function to searchMeta service for reusability
Coleman Watts [Thu, 14 Apr 2022 02:44:47 +0000 (22:44 -0400)]
SearchKit - Support operators, custom fields & multiple fields in a searchSegment clause.
Coleman Watts [Wed, 13 Apr 2022 23:12:21 +0000 (19:12 -0400)]
APIv4 - Pass entire Api4SelectQuery object to expression when rendering
This permits SearchSegment pseudo-fields to call $query->getField() on multiple
fields, including custom fields, while rendering.
Coleman Watts [Wed, 30 Mar 2022 12:55:00 +0000 (08:55 -0400)]
SearchKit - Fix ORDER BY calculated fields when using GROUP BY
Before: Calculated field functions were repeated verbabim in the SELECT, ORDER BY & GROUP BY clause,
this would cause mySql error when using FULL GROUP BY mode.
After: Calculated field function defined in SELECT clause, alias used in ORDER BY & GROUP BY.
No error when grouping by an ordering by the same calculated field.
Side-benefit: When selecting and ordering by RAND(), the selected random numbers will be in order,
as it's now the same random function used for both instead of a different one.
Coleman Watts [Wed, 30 Mar 2022 01:55:35 +0000 (21:55 -0400)]
SearchKit - Add basic SearchSegment functionality for numeric range groups
colemanw [Mon, 18 Apr 2022 02:31:38 +0000 (22:31 -0400)]
Merge pull request #23228 from eileenmcnaughton/549_m
Fix malformed query when user with no access to any financial acls accesses civimember search
Eileen McNaughton [Sun, 17 Apr 2022 22:49:57 +0000 (10:49 +1200)]
[REF] [Import] [Test] switch test to use full form flow
Eileen McNaughton [Thu, 14 Apr 2022 02:11:23 +0000 (14:11 +1200)]
Remove non-functional code
Instantiating the importJob with a table name and no createTable
does nothing but set the name so that getTableName() gets it
- import_table_name is always set so these lines do nothing
Eileen McNaughton [Thu, 14 Apr 2022 01:37:53 +0000 (13:37 +1200)]
[REF] Minor clean up
Eileen McNaughton [Sun, 17 Apr 2022 22:55:22 +0000 (10:55 +1200)]
[Import] Simplify and limit dataSource retrieval
Eileen McNaughton [Mon, 18 Apr 2022 00:08:04 +0000 (12:08 +1200)]
Remove another good intention....
Eileen McNaughton [Fri, 15 Apr 2022 22:26:28 +0000 (10:26 +1200)]
Fix malformed query when user with no access to any financial acls accesses civimember search
Eileen McNaughton [Sun, 17 Apr 2022 23:29:32 +0000 (11:29 +1200)]
Fix sql error on acl user
colemanw [Sun, 17 Apr 2022 23:05:36 +0000 (19:05 -0400)]
Merge pull request #23217 from eileenmcnaughton/import_act
Standardise activity datasource text
colemanw [Sun, 17 Apr 2022 23:03:11 +0000 (19:03 -0400)]
Merge pull request #23218 from eileenmcnaughton/import_part
Standardise participant import text
colemanw [Sun, 17 Apr 2022 23:02:19 +0000 (19:02 -0400)]
Merge pull request #23227 from eileenmcnaughton/inbetween_4
[REF] [Import] Remove last in-between parser class
colemanw [Sun, 17 Apr 2022 23:01:21 +0000 (19:01 -0400)]
Merge pull request #23221 from eileenmcnaughton/mapField
[Ref] [Import] Remove another 'in-between' class
colemanw [Sun, 17 Apr 2022 23:00:31 +0000 (19:00 -0400)]
Merge pull request #23223 from eileenmcnaughton/in_between2
[REF] [Import] [Contact] Remove in-between class
Eileen McNaughton [Sun, 17 Apr 2022 21:45:04 +0000 (09:45 +1200)]
Merge pull request #23232 from braders/nodefaults-tab-links
Apply nodefaults to contact tabs for escape-on-output
Eileen McNaughton [Sun, 17 Apr 2022 21:29:22 +0000 (09:29 +1200)]
Merge pull request #23231 from civicrm/5.49
5.49
Bradley Taylor [Sat, 16 Apr 2022 08:48:28 +0000 (09:48 +0100)]
Apply nodefaults to contact tabs for escape-on-output
Eileen McNaughton [Sat, 16 Apr 2022 03:30:53 +0000 (15:30 +1200)]
Merge pull request #23229 from pradpnayak/limitcontacts
Limit issue fix
Seamus Lee [Sat, 16 Apr 2022 02:41:55 +0000 (12:41 +1000)]
Merge pull request #23226 from MegaphoneJon/individual-employers
restore using non-organizations as employers
Eileen McNaughton [Fri, 15 Apr 2022 22:54:31 +0000 (10:54 +1200)]
Merge pull request #23220 from totten/master-defn
(REF) CryptoRegistry - Fix type declaration
Seamus Lee [Fri, 15 Apr 2022 22:45:54 +0000 (08:45 +1000)]
Merge pull request #23184 from totten/master-bd-drush
(NFC) Skip CliRunnerTest on php80+drush+Backdrop
Pradeep Nayak [Fri, 15 Apr 2022 22:45:00 +0000 (23:45 +0100)]
Limit issue fix
Seamus Lee [Fri, 15 Apr 2022 22:43:59 +0000 (08:43 +1000)]
Merge pull request #23080 from eileenmcnaughton/isset
Always assign pay_later_receipt
Tim Otten [Fri, 15 Apr 2022 22:41:09 +0000 (15:41 -0700)]
Merge pull request #23199 from eileenmcnaughton/imp
dev/core#1307 Add civicrm_user_job table
Eileen McNaughton [Fri, 15 Apr 2022 22:04:17 +0000 (10:04 +1200)]
Merge pull request #22664 from braders/membershipview-default-values
Set default values on MembershipView to stop PHP notices
Jon Goldberg [Fri, 15 Apr 2022 14:24:11 +0000 (10:24 -0400)]
allow non-organization employers
Eileen McNaughton [Fri, 15 Apr 2022 21:54:16 +0000 (09:54 +1200)]
Remove last in-between parser class
Unlike the others this does have non-core refs in civihr & csvimport -
I suspect these are copy & paste rather than functional but will patch
Eileen McNaughton [Fri, 15 Apr 2022 21:45:53 +0000 (09:45 +1200)]
Merge pull request #23207 from braders/row-action-nodefaults
Apply nodefaults to row actions
Eileen McNaughton [Fri, 15 Apr 2022 21:25:12 +0000 (09:25 +1200)]
Merge pull request #23208 from braders/access-wp-nodefaults
Add nodefaults to access.tpl
Eileen McNaughton [Fri, 15 Apr 2022 21:24:40 +0000 (09:24 +1200)]
Merge pull request #23225 from braders/edit-group-nodefaults
Add nodefaults to group edit form
Bradley Taylor [Fri, 15 Apr 2022 08:59:19 +0000 (09:59 +0100)]
Add nodefaults to group edit form
Tim Otten [Fri, 15 Apr 2022 06:50:51 +0000 (23:50 -0700)]
Overview
--------
The setting `CIVICRM_SIGN_KEYS` was introduced circa 5.36. However, it is
defined in `civicrm.settings.php`, which makes it difficult to reliably
configure in an automated upgrade. Consequently, some sites may not have
this setting, and we must rely on the sysadmin to provide it.
The setting is required for the `crypto.jwt` API (which in turn is used by
some core extensions, like `authx` and `afform`).
Before
------
There is a pre-upgrade message when somebody passes through v5.36.
If you missed the message in 5.36, then you would be unaware of the missing
setting (until you hit some failure because you use some new/update
code-path that relies on it).
After
-----
There is a system status-check. If you don't have `CIVICRM_SIGN_KEYS`, then
it will show a link to https://docs.civicrm.org/sysadmin/en/latest/setup/secret-keys/.
Eileen McNaughton [Fri, 15 Apr 2022 04:04:13 +0000 (16:04 +1200)]
Remove another 'in-between' class
As with Contribution & Membership there is a pointless in-between class that
is only inherited by one class...
Eileen McNaughton [Fri, 15 Apr 2022 04:17:13 +0000 (16:17 +1200)]
Remove in-between class
A universe search finds no other references
Tim Otten [Fri, 15 Apr 2022 03:53:43 +0000 (20:53 -0700)]
(REF) CryptoRegistry - Tighten type declaration