Coleman Watts [Sun, 13 Feb 2022 22:43:40 +0000 (17:43 -0500)]
DedupeMerge - Cleanup form code to fix redirects and undefined variables
Fixes undefined template variables, and does the final redirect in an ajax-friendly way.
Coleman Watts [Sun, 13 Feb 2022 22:19:59 +0000 (17:19 -0500)]
SearchKit - Add 'merge contacts' task
Matthew Wire [Sun, 13 Feb 2022 18:53:25 +0000 (18:53 +0000)]
Merge pull request #22679 from mattwire/dummyreturn
Clean return values for dummy payment processor
Seamus Lee [Sun, 13 Feb 2022 04:39:01 +0000 (15:39 +1100)]
Merge pull request #22765 from eileenmcnaughton/block_2
[REF] Simplification in Contact::getValues
Eileen McNaughton [Sun, 13 Feb 2022 01:40:39 +0000 (14:40 +1300)]
Merge pull request #22764 from colemanw/searchKitFixNonDAO
SearchKit - Fix support for non-DAO entities
demeritcowboy [Sat, 12 Feb 2022 15:02:02 +0000 (10:02 -0500)]
Merge pull request #22745 from eileenmcnaughton/noticey
Some more notice fixes in smarty
Eileen McNaughton [Sat, 12 Feb 2022 03:31:56 +0000 (16:31 +1300)]
[REF] Simplification in Contact::getValues
The call to location::getValues takes more lines & is
less readable than just doing the thing.
Note that
1) I could not find any evidence of 'noWebsite' being passed in so I switched to
always add
2) the signature on website:getValues is slightly different (of course).
3) I found that the others that were receiving params as a reference were
not altering it so removed those pass-by-refs
colemanw [Fri, 11 Feb 2022 19:06:23 +0000 (14:06 -0500)]
Merge pull request #22763 from demeritcowboy/classclassclass
Adjust css class for payment processor to use `-`
Coleman Watts [Fri, 11 Feb 2022 16:24:02 +0000 (11:24 -0500)]
SearchKit - Fix support for non-DAO entities
Before: SearchKit would crash if running a search on a non-DAO entity (Extension, Entity, Afform, etc)
After: Works, test added
colemanw [Fri, 11 Feb 2022 16:08:50 +0000 (11:08 -0500)]
Merge pull request #22422 from eileenmcnaughton/taxtermprice
Cleanup around taxTerm assignment
demeritcowboy [Fri, 11 Feb 2022 15:06:13 +0000 (10:06 -0500)]
class
colemanw [Fri, 11 Feb 2022 14:48:59 +0000 (09:48 -0500)]
Merge pull request #22757 from eileenmcnaughton/block_2
[REF] Simplify Location::getValues
colemanw [Fri, 11 Feb 2022 14:42:22 +0000 (09:42 -0500)]
Merge pull request #22756 from eileenmcnaughton/block
Remove unused parameter, pass-by-ref
demeritcowboy [Fri, 11 Feb 2022 14:32:05 +0000 (09:32 -0500)]
Merge pull request #22760 from seamuslee001/fix_space_in_paymentprocess_class_name
[REF] Fix issue where spaces in payment_processor_type.name field cau…
demeritcowboy [Fri, 11 Feb 2022 14:31:18 +0000 (09:31 -0500)]
Merge pull request #22758 from civicrm/dependabot/npm_and_yarn/karma-6.3.14
Bump karma from 6.3.4 to 6.3.14
dependabot[bot] [Fri, 11 Feb 2022 09:43:48 +0000 (09:43 +0000)]
Bump karma from 6.3.4 to 6.3.14
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.4 to 6.3.14.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.4...v6.3.14)
---
updated-dependencies:
- dependency-name: karma
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com>
Seamus Lee [Fri, 11 Feb 2022 09:42:37 +0000 (20:42 +1100)]
Merge pull request #22761 from civicrm/dependabot/npm_and_yarn/ajv-6.12.6
Bump ajv from 6.6.1 to 6.12.6
Seamus Lee [Fri, 11 Feb 2022 06:58:45 +0000 (17:58 +1100)]
Merge pull request #22713 from colemanw/billingBlockCleanup
[REF] Cleanup billingBlock.js
dependabot[bot] [Fri, 11 Feb 2022 06:38:45 +0000 (06:38 +0000)]
Bump ajv from 6.6.1 to 6.12.6
Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.6.1 to 6.12.6.
- [Release notes](https://github.com/ajv-validator/ajv/releases)
- [Commits](https://github.com/ajv-validator/ajv/compare/v6.6.1...v6.12.6)
---
updated-dependencies:
- dependency-name: ajv
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Seamus Lee [Fri, 11 Feb 2022 05:36:02 +0000 (16:36 +1100)]
[REF] Fix issue where spaces in payment_processor_type.name field causes issues with class output on form
Eileen McNaughton [Fri, 11 Feb 2022 04:51:09 +0000 (17:51 +1300)]
[REF] Simplify Location::getValues
Yashodha Chaku [Fri, 11 Feb 2022 04:33:10 +0000 (10:03 +0530)]
Merge pull request #22728 from eileenmcnaughton/local
Format money in custom fields once, on the tpl layer
Eileen McNaughton [Fri, 11 Feb 2022 04:17:36 +0000 (17:17 +1300)]
Remove unused parameter, pass-by-ref
Eileen McNaughton [Thu, 10 Feb 2022 02:33:48 +0000 (15:33 +1300)]
Merge pull request #22743 from civicrm/5.47
5.47
Eileen McNaughton [Thu, 10 Feb 2022 02:03:29 +0000 (15:03 +1300)]
Merge pull request #22744 from eileenmcnaughton/grump
Bypass grumpy mode for contribution search totals & criteria
colemanw [Thu, 10 Feb 2022 01:16:38 +0000 (20:16 -0500)]
Merge pull request #22684 from eileenmcnaughton/contacl
Move acl check for contributionView to the extension
Seamus Lee [Thu, 10 Feb 2022 01:00:45 +0000 (12:00 +1100)]
Merge pull request #22742 from eileenmcnaughton/cust
Fix deprecated warnings, smary grumpy-mode issues in legacy searches
Eileen McNaughton [Thu, 10 Feb 2022 00:30:22 +0000 (13:30 +1300)]
Some more notice fixes in smarty
Eileen McNaughton [Thu, 10 Feb 2022 00:07:57 +0000 (13:07 +1300)]
Merge pull request #22741 from MegaphoneJon/fix-duplicate-contact-typing
enforce required fields on Contact.duplicatecheck
Eileen McNaughton [Wed, 9 Feb 2022 23:58:03 +0000 (12:58 +1300)]
Bypass grumpy mode for contribution totals
These are assigned to the template from php & have nbsp in them (for better or worse)
Eileen McNaughton [Wed, 9 Feb 2022 23:19:13 +0000 (12:19 +1300)]
Fix deprecated warnings, smary grumpy-mode issues in legacy searches
This gets rid of some deprecated warnings and also makes the pager work in smarty grumpy mode
colemanw [Wed, 9 Feb 2022 23:15:10 +0000 (18:15 -0500)]
Merge pull request #22714 from demeritcowboy/grant-searchbuilder
dev/core#3056 - Crash with search builder if civigrant not enabled and have admin rights
Jon Goldberg [Wed, 9 Feb 2022 20:56:11 +0000 (15:56 -0500)]
enforce required fields on Contact.duplicatecheck
demeritcowboy [Sun, 6 Feb 2022 01:06:48 +0000 (20:06 -0500)]
quickfix for crash if civigrant not enabled and have admin rights
Eileen McNaughton [Wed, 9 Feb 2022 10:47:11 +0000 (23:47 +1300)]
Merge pull request #22738 from civicrm/5.47
5.47
Tim Otten [Wed, 9 Feb 2022 04:50:31 +0000 (20:50 -0800)]
Merge pull request #22727 from eileenmcnaughton/mod_money
dev/core#3059 Regression fix - be tolerant with smarty money
Seamus Lee [Wed, 9 Feb 2022 03:45:36 +0000 (14:45 +1100)]
Merge pull request #22735 from civicrm/5.47
5.47
colemanw [Wed, 9 Feb 2022 01:22:06 +0000 (20:22 -0500)]
Merge pull request #22733 from totten/5.47-dedupe-check
(dev/core#3055) Fix dedupe check to not require elevated permissions
Jon Goldberg [Fri, 4 Feb 2022 17:14:01 +0000 (12:14 -0500)]
Fix dedupe check to not require elevated permissions
Eileen McNaughton [Tue, 8 Feb 2022 22:36:48 +0000 (11:36 +1300)]
Merge pull request #22628 from colemanw/civicrm_admin_ui
Add civicrm_admin_ui extension
Matthew Wire [Tue, 8 Feb 2022 20:25:56 +0000 (20:25 +0000)]
Merge pull request #22731 from colemanw/customvaluefailingtest
APIv4 - Fix setting/getting a multi-record customfield with date+time
Matthew Wire [Mon, 7 Feb 2022 21:25:26 +0000 (21:25 +0000)]
APIv4 - Fix setting/getting a multi-record custom field with date+time
colemanw [Tue, 8 Feb 2022 17:14:14 +0000 (12:14 -0500)]
Merge pull request #22677 from eileenmcnaughton/aclmem
Move financial acls for membership to extension
colemanw [Tue, 8 Feb 2022 16:20:08 +0000 (11:20 -0500)]
Merge pull request #22722 from colemanw/restExplorer
APIv4 Explorer - Add REST syntax
colemanw [Tue, 8 Feb 2022 15:55:29 +0000 (10:55 -0500)]
Merge pull request #22380 from braders/core-483-show-customised-preferences-on-validation
Show customised fields on load, if customised option selected.
Coleman Watts [Mon, 7 Feb 2022 17:23:49 +0000 (12:23 -0500)]
APIv4 Explorer - Add REST syntax
Eileen McNaughton [Tue, 8 Feb 2022 04:35:48 +0000 (17:35 +1300)]
Format money in custom fields once, on the tpl layer
This ensures the raw value is available to the template layer and uses it
rather than the formatted value for money display.
It rather feels it would be better to separate out this view use case in case
there are others hidden in there - but I think this tpl is only
used with this assign
Eileen McNaughton [Tue, 8 Feb 2022 03:38:05 +0000 (16:38 +1300)]
Regression fix - be tolerant with smarty money
I've seen issues in extended reports and in core where already-formatted money from
custom fields is formatted again in the smarty layer and, with recent changes
, throwing an exception when the money is greater than 1000
(because the presence of a comma makes it invalid). This adds tolerance
that seems consistent with prior code
Eileen McNaughton [Tue, 8 Feb 2022 02:44:57 +0000 (15:44 +1300)]
Merge pull request #22715 from braders/batchentry-non-numberic-warning
[NFC] Batch entry - Avoid warnings when performing math on empty string.
colemanw [Mon, 7 Feb 2022 21:08:55 +0000 (16:08 -0500)]
Merge pull request #22723 from civicrm/5.47
5.47
Bradley Taylor [Sun, 6 Feb 2022 17:20:19 +0000 (17:20 +0000)]
Cast value to int before performing math
Coleman Watts [Tue, 1 Feb 2022 19:22:27 +0000 (14:22 -0500)]
CustomField - Fix preview link
Coleman Watts [Wed, 26 Jan 2022 19:22:59 +0000 (14:22 -0500)]
Add civicrm_admin_ui extension
So far this extension replaces 2 screns with SearchDisplay Afforms:
- Custom field groups
- Custom fields
demeritcowboy [Mon, 7 Feb 2022 18:22:25 +0000 (13:22 -0500)]
Merge pull request #22716 from colemanw/sortableEntityFix
APIv4 SortableEntity - Fix sorting custom fields with option groups
colemanw [Mon, 7 Feb 2022 15:06:37 +0000 (10:06 -0500)]
Merge pull request #22721 from demeritcowboy/grantinfo
dev/core#3057 - follow-up to fix civigrant info.xml version number in master
demeritcowboy [Mon, 7 Feb 2022 12:53:37 +0000 (07:53 -0500)]
fix version number
Seamus Lee [Mon, 7 Feb 2022 06:36:24 +0000 (17:36 +1100)]
Merge pull request #22718 from civicrm/5.47
5.47
Coleman Watts [Sun, 6 Feb 2022 20:01:20 +0000 (15:01 -0500)]
APIv4 SortableEntity - Fix sorting custom fields with option groups
Before: APIv4 would guess which fields to use for grouping when sorting by weight.
this caused a bug when sorting custom fields which also had an option_group_id, which
was incorrectly guessed to be used for grouping.
After: New `@groupWeightsBy` annotation removes the guesswork.
demeritcowboy [Mon, 7 Feb 2022 04:07:12 +0000 (23:07 -0500)]
Merge pull request #22717 from demeritcowboy/grant-stats
dev/core#3057 - Fix missing civigrant
Eileen McNaughton [Mon, 7 Feb 2022 03:45:40 +0000 (16:45 +1300)]
Merge pull request #22699 from colemanw/searchKitImportCheck
SearchKit - Improve import UI to handle update & preview the import
demeritcowboy [Mon, 7 Feb 2022 03:29:37 +0000 (22:29 -0500)]
Merge pull request #21097 from mattwire/extensionguzzle
Switch extension downloader and extensions feed to use Guzzle HTTP library
demeritcowboy [Mon, 7 Feb 2022 02:26:17 +0000 (21:26 -0500)]
fix missing civigrant
Tim Otten [Sun, 6 Feb 2022 21:10:55 +0000 (13:10 -0800)]
api_v3_ExtensionsTest - Switch to Guzzle-style mocking
colemanw [Sun, 6 Feb 2022 19:09:00 +0000 (14:09 -0500)]
Merge pull request #22688 from colemanw/getComponentName
REF - Use function to get component name from permission
Coleman Watts [Thu, 3 Feb 2022 00:59:20 +0000 (19:59 -0500)]
REF - Use function to get componenent name from permission
demeritcowboy [Sun, 6 Feb 2022 15:31:40 +0000 (10:31 -0500)]
Merge pull request #22711 from braders/br-selfclosing-syntax
Use valid syntax for self-closing br elements
Bradley Taylor [Sat, 5 Feb 2022 14:47:17 +0000 (14:47 +0000)]
Use valid syntax for self-closing br elements
colemanw [Sun, 6 Feb 2022 06:48:34 +0000 (01:48 -0500)]
Merge pull request #22636 from eileenmcnaughton/exampley
Add basic contribution example base for contribution workflows
colemanw [Sun, 6 Feb 2022 06:44:59 +0000 (01:44 -0500)]
Merge pull request #22706 from eileenmcnaughton/notice3
Notice fixes
colemanw [Sun, 6 Feb 2022 06:42:40 +0000 (01:42 -0500)]
Merge pull request #22707 from eileenmcnaughton/notice5
Enotice fix
CiviCRM [Sun, 6 Feb 2022 04:33:44 +0000 (04:33 +0000)]
Set version to 5.48.alpha1
CiviCRM [Sun, 6 Feb 2022 04:30:40 +0000 (04:30 +0000)]
Set version to 5.47.beta1
Tim Otten [Sun, 6 Feb 2022 04:09:51 +0000 (20:09 -0800)]
Merge pull request #22058 from kainuk/lecacy-auth
authx - Add configuration screen
colemanw [Sun, 6 Feb 2022 01:59:19 +0000 (20:59 -0500)]
Merge pull request #22687 from colemanw/cleanupComponentCheck
REF - Switch to using new `CRM_Core_Component::isEnabled()`
Tim Otten [Sat, 5 Feb 2022 21:47:19 +0000 (13:47 -0800)]
authx.setting.php - Add/tweak help text so it appears on the settings page.
Seamus Lee [Sat, 5 Feb 2022 22:05:38 +0000 (09:05 +1100)]
Merge pull request #22710 from braders/fulltext-template-accessibility
Improve field accessibility in legacycustomsearches
Tim Otten [Sat, 5 Feb 2022 21:16:27 +0000 (13:16 -0800)]
authx.setting.php - Change sizes and weights to make settings more readable
Klaas Eikelboom [Fri, 12 Nov 2021 19:14:35 +0000 (20:14 +0100)]
Civilint
Klaas Eikelboom [Mon, 4 Oct 2021 19:35:05 +0000 (21:35 +0200)]
This code seems obsolote
Klaas Eikelboom [Mon, 4 Oct 2021 19:34:13 +0000 (21:34 +0200)]
Add settings screen
Coleman Watts [Sat, 5 Feb 2022 18:04:55 +0000 (13:04 -0500)]
Cleanup billingBlock.js
colemanw [Sat, 5 Feb 2022 17:05:54 +0000 (12:05 -0500)]
Merge pull request #22709 from braders/dedupe-limit-smarty-notice
Don't throw PHP notice when rendering dedupefind template.
colemanw [Sat, 5 Feb 2022 15:40:18 +0000 (10:40 -0500)]
Merge pull request #19727 from totten/master-authx-rest
(dev/core#2077) Make 'civicrm/ajax/rest' interoperable with 'extern/rest.php' parameters
demeritcowboy [Sat, 5 Feb 2022 14:41:19 +0000 (09:41 -0500)]
Merge pull request #22705 from eileenmcnaughton/notice2
Enotice fixes with datepicker
Bradley Taylor [Sat, 5 Feb 2022 14:34:38 +0000 (14:34 +0000)]
Improve field accessibility in legacycustomsearches
demeritcowboy [Sat, 5 Feb 2022 14:22:00 +0000 (09:22 -0500)]
Merge pull request #22708 from braders/feature/priceset-notice-fix
Enotice fix with priceset template
Bradley Taylor [Sat, 5 Feb 2022 13:25:54 +0000 (13:25 +0000)]
Don't throw PHP notice when rendering dedupefind template.
Bradley Taylor [Sat, 5 Feb 2022 12:10:58 +0000 (12:10 +0000)]
Enotice fix with priceset template
Eileen McNaughton [Sat, 5 Feb 2022 01:43:41 +0000 (14:43 +1300)]
Enotice fix
Eileen McNaughton [Sat, 5 Feb 2022 01:32:17 +0000 (14:32 +1300)]
Notice fixes
These primarily affect 'grumpy-mode'
Eileen McNaughton [Sat, 5 Feb 2022 01:23:10 +0000 (14:23 +1300)]
Enotice fixes with datepicker
Datepicker requires some fields to be set to avoid enotices (at least with grumpy mode disabled).
Eileen McNaughton [Sat, 5 Feb 2022 00:51:17 +0000 (13:51 +1300)]
Merge pull request #22704 from braders/remove-invalidprofiles-template-variable
Remove unused invalidProfiles variable, and simplify template.
Tim Otten [Sat, 5 Feb 2022 00:23:15 +0000 (16:23 -0800)]
authx - Extend support for legacy-auth to APIv4
Tim Otten [Fri, 4 Feb 2022 23:34:39 +0000 (15:34 -0800)]
Convert existing `X-Requested-With:` guards to `isWebServiceRequest()`
_Overview_: `civicrm/ajax/api4` and `returnJsonResponse()` inspect the
web-request to see if it comes via AJAX/REST. If so, the call is
allowed and formatted as JSON. The patch refines the test.
_Before_: `X-Requested-With:` signals that a call is AJAX/REST.
_After_: `X-Requested-With:` still signals that a call is AJAX/REST.
Additionally, if `authx` is enabled, then some requests will be treated as
AJAX/REST based on how they are authenticated (ie `xheader`/`X-Civi-Auth:`
and `param`/`?_authx=` are AJAX/REST).
Tim Otten [Fri, 4 Feb 2022 23:27:09 +0000 (15:27 -0800)]
(REF) CRM_Utils_REST::isWebServiceRequest - Mark public. Expand comments.
Bradley Taylor [Fri, 4 Feb 2022 19:39:03 +0000 (19:39 +0000)]
Remove unused invalidProfiles variable, and simplify template.
As well as simplifying things, this avoids PHP notices.
Coleman Watts [Fri, 4 Feb 2022 04:28:35 +0000 (23:28 -0500)]
SearchKit - Enable import to update as well as create
Before: Only create was possible in the "Import" popup; minimal user feedback.
After: Create and update both work, with better user-feedback about what will happen.
demeritcowboy [Fri, 4 Feb 2022 14:55:44 +0000 (09:55 -0500)]
Merge pull request #22697 from eileenmcnaughton/cont
Enotic fixes
Eileen McNaughton [Thu, 13 Jan 2022 04:29:07 +0000 (17:29 +1300)]
Move acl check for contributionView to the extension
Coleman Watts [Fri, 4 Feb 2022 04:24:42 +0000 (23:24 -0500)]
SearchKit - Better user feedback if search entity is missing
Before: After disabling the Afform extension, the search display appears editable
but crashes on missing AfformSubmission entity
After: Not editable, shows message that entity is missing.