Eileen McNaughton [Thu, 10 Feb 2022 00:30:22 +0000 (13:30 +1300)]
Some more notice fixes in smarty
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 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
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
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.
Coleman Watts [Fri, 4 Feb 2022 04:18:41 +0000 (23:18 -0500)]
crmDialog - Dynamically update button text & icons, apply callbacks within scope
Before: Only "disabled" property of button was watched and kept in-sync,
button callback was applied outside of Angular digest cycle.
After: Title and icons also kept in-sync,
button callback applied within Angular digest cycle.
Seamus Lee [Fri, 4 Feb 2022 02:49:02 +0000 (13:49 +1100)]
Merge pull request #22696 from civicrm/dependabot/npm_and_yarn/follow-redirects-1.14.7
Bump follow-redirects from 1.11.0 to 1.14.7
Seamus Lee [Thu, 3 Feb 2022 23:17:25 +0000 (10:17 +1100)]
Merge pull request #22695 from civicrm/dependabot/npm_and_yarn/engine.io-4.1.2
Bump engine.io from 4.1.1 to 4.1.2
Eileen McNaughton [Thu, 3 Feb 2022 22:49:50 +0000 (11:49 +1300)]
Enotic fixes
Seamus Lee [Thu, 3 Feb 2022 22:33:54 +0000 (09:33 +1100)]
Merge pull request #22693 from civicrm/dependabot/npm_and_yarn/ansi-regex-5.0.1
Bump ansi-regex from 5.0.0 to 5.0.1
dependabot[bot] [Thu, 3 Feb 2022 22:31:23 +0000 (22:31 +0000)]
Bump follow-redirects from 1.11.0 to 1.14.7
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.11.0 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.11.0...v1.14.7)
---
updated-dependencies:
- dependency-name: follow-redirects
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Eileen McNaughton [Thu, 3 Feb 2022 22:30:32 +0000 (11:30 +1300)]
Merge pull request #22694 from civicrm/dependabot/npm_and_yarn/log4js-6.4.1
Bump log4js from 6.3.0 to 6.4.1
Kartik Kathuria [Wed, 10 Nov 2021 20:37:54 +0000 (02:07 +0530)]
browser test modified
Matthew Wire [Sat, 30 Oct 2021 10:29:18 +0000 (11:29 +0100)]
Abstract guzzle client for testing
Matthew Wire [Wed, 11 Aug 2021 16:19:37 +0000 (17:19 +0100)]
Switch extension browser getRemoteJSON to use guzzle
Matthew Wire [Wed, 11 Aug 2021 16:11:57 +0000 (17:11 +0100)]
Switch extension downloader to use Guzzle.
Seamus Lee [Thu, 3 Feb 2022 22:11:56 +0000 (09:11 +1100)]
Merge pull request #22654 from colemanw/optionGroupName
[REF] Switch OptionGroup BAO to use new centralized logic to make name from title
Eileen McNaughton [Thu, 13 Jan 2022 03:59:41 +0000 (16:59 +1300)]
Move financial acls for membership types to the extension
dependabot[bot] [Thu, 3 Feb 2022 20:42:55 +0000 (20:42 +0000)]
Bump engine.io from 4.1.1 to 4.1.2
Bumps [engine.io](https://github.com/socketio/engine.io) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/socketio/engine.io/releases)
- [Changelog](https://github.com/socketio/engine.io/blob/4.1.2/CHANGELOG.md)
- [Commits](https://github.com/socketio/engine.io/compare/4.1.1...4.1.2)
---
updated-dependencies:
- dependency-name: engine.io
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Thu, 3 Feb 2022 20:42:55 +0000 (20:42 +0000)]
Bump log4js from 6.3.0 to 6.4.1
Bumps [log4js](https://github.com/log4js-node/log4js-node) from 6.3.0 to 6.4.1.
- [Release notes](https://github.com/log4js-node/log4js-node/releases)
- [Changelog](https://github.com/log4js-node/log4js-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/log4js-node/log4js-node/compare/v6.3.0...v6.4.1)
---
updated-dependencies:
- dependency-name: log4js
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Thu, 3 Feb 2022 20:42:50 +0000 (20:42 +0000)]
Bump ansi-regex from 5.0.0 to 5.0.1
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1)
---
updated-dependencies:
- dependency-name: ansi-regex
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Seamus Lee [Thu, 3 Feb 2022 20:42:25 +0000 (07:42 +1100)]
Merge pull request #22692 from demeritcowboy/composer
Update composer.json for composer 2.2 allow-plugins
demeritcowboy [Thu, 3 Feb 2022 18:32:14 +0000 (13:32 -0500)]
update for composer 2.2 allow-plugins
demeritcowboy [Thu, 3 Feb 2022 16:29:51 +0000 (11:29 -0500)]
Merge pull request #22691 from demeritcowboy/ckeditor-uninstall
Fix typo preventing uninstalling ckeditor4
demeritcowboy [Thu, 3 Feb 2022 14:20:41 +0000 (09:20 -0500)]
fix typo
Monish Deb [Thu, 3 Feb 2022 02:13:05 +0000 (07:43 +0530)]
Merge pull request #22685 from eileenmcnaughton/finacl
Move permission access handling for civicrm/admin/financial/financialType?reset=1 to extension
Coleman Watts [Wed, 2 Feb 2022 23:29:30 +0000 (18:29 -0500)]
REF - Switch to using new `CRM_Core_Component::isEnabled()`
Switches more verbose array searches to the new utility function.
Eileen McNaughton [Thu, 13 Jan 2022 04:56:44 +0000 (17:56 +1300)]
More permission access handling for civicrm/admin/financial/financialType?reset=1 to extension
(works for browse & edit)
colemanw [Wed, 2 Feb 2022 20:38:56 +0000 (15:38 -0500)]
Merge pull request #22675 from colemanw/customGroupNameIndex
CustomGroup - Ensure 'name' is always unique
Eileen McNaughton [Wed, 2 Feb 2022 20:29:23 +0000 (09:29 +1300)]
Merge pull request #22609 from colemanw/contactCleanup
[REF] - Cleanup Contact BAO variables
Eileen McNaughton [Wed, 2 Feb 2022 20:06:42 +0000 (09:06 +1300)]
Merge pull request #22681 from totten/master-queue-cleanup
(REF) Queues - Expand docblocks. Extract SQL trait.
Coleman Watts [Tue, 1 Feb 2022 20:03:37 +0000 (15:03 -0500)]
CustomGroup - Ensure 'name' is always unique
Previously, unique 'name' was only enforced in tandem with 'extends'
Now it is required to be unique unconditionally.
colemanw [Wed, 2 Feb 2022 15:12:43 +0000 (10:12 -0500)]
Merge pull request #22657 from totten/master-queue-facade-c
Queues - Add support for using persistent queues
demeritcowboy [Wed, 2 Feb 2022 14:34:16 +0000 (09:34 -0500)]
Merge pull request #22662 from colemanw/softDeleteEntity
[REF] APIv4 - Rename trait 'SoftDelete' to 'SoftDeleteEntity'
demeritcowboy [Wed, 2 Feb 2022 13:48:44 +0000 (08:48 -0500)]
Merge pull request #22647 from mlutfy/translation38ml
dev/translation#38 Fix multilingual triggers for when fields default to an empty string
demeritcowboy [Wed, 2 Feb 2022 13:48:10 +0000 (08:48 -0500)]
Merge pull request #22632 from eileenmcnaughton/msg_send
dev/core#2866 Generate text version of message at send time if not present
Tim Otten [Wed, 2 Feb 2022 10:56:19 +0000 (02:56 -0800)]
Civi::queue() - Tweak prioritization of fields per discussion
Tim Otten [Wed, 2 Feb 2022 06:43:10 +0000 (22:43 -0800)]
(REF) CRM_Queue_Queue_Sql* - Dedupe `createItem()` function
Consolidate duplicate implementations. Move to trait.
Eileen McNaughton [Wed, 26 Jan 2022 23:00:19 +0000 (12:00 +1300)]
dev/core#2866 Generate text version of message at send time if not present
Tim Otten [Wed, 2 Feb 2022 01:38:42 +0000 (17:38 -0800)]
(REF) CRM_Queue_Queue_Sql* - Extract trait for common functions
Most of the methods in CRM/Queue/Queue/Sql.php and CRM/Queue/Queue/SqlParallel.php are
identical. Move them to a common trait so that they're easier to patch.
Tim Otten [Tue, 1 Feb 2022 23:39:52 +0000 (15:39 -0800)]
(NFC) CRM_Queue_Runner - Expand on comments. Tweak layout.