colemanw [Wed, 6 Apr 2022 12:07:24 +0000 (08:07 -0400)]
Merge pull request #23110 from eileenmcnaughton/silly2
Remove unnecessary pass-by-ref
colemanw [Wed, 6 Apr 2022 12:04:43 +0000 (08:04 -0400)]
Merge pull request #23113 from eileenmcnaughton/silly5
Remove unused variable
colemanw [Wed, 6 Apr 2022 12:04:11 +0000 (08:04 -0400)]
Merge pull request #23112 from eileenmcnaughton/import
Test cleanup (minor)
Eileen McNaughton [Wed, 6 Apr 2022 08:39:26 +0000 (20:39 +1200)]
Merge pull request #23108 from eileenmcnaughton/silly
Remove double return statement
Eileen McNaughton [Wed, 6 Apr 2022 04:42:22 +0000 (16:42 +1200)]
Remove unused variable
Eileen McNaughton [Wed, 6 Apr 2022 04:39:09 +0000 (16:39 +1200)]
Test cleanup
Simplifies test set up of options & ensures they are deleted
Eileen McNaughton [Wed, 6 Apr 2022 04:31:36 +0000 (16:31 +1200)]
Merge pull request #23106 from eileenmcnaughton/import
Test cleanup, deprecate ContributionSoft::retrieve
Seamus Lee [Wed, 6 Apr 2022 04:21:41 +0000 (14:21 +1000)]
Merge pull request #23109 from seamuslee001/master
5.48
Seamus Lee [Wed, 6 Apr 2022 04:21:10 +0000 (14:21 +1000)]
Merge in 5.48
Eileen McNaughton [Wed, 6 Apr 2022 04:21:05 +0000 (16:21 +1200)]
Remove unnecessary pass-by-ref
Seamus Lee [Wed, 6 Apr 2022 04:18:14 +0000 (14:18 +1000)]
Merge pull request #23102 from seamuslee001/dompdf_update
Update DOMPDF to 1.2.1 and update composer-compile-plugin as per master
Monish Deb [Wed, 6 Apr 2022 04:17:58 +0000 (09:47 +0530)]
Merge pull request #23076 from eileenmcnaughton/cont_status
dev/financial#186 Do not display partially paid & partially refunded for selection on edit
Eileen McNaughton [Wed, 6 Apr 2022 04:17:43 +0000 (16:17 +1200)]
Remove double return statement
demeritcowboy [Wed, 6 Apr 2022 03:25:38 +0000 (23:25 -0400)]
Merge pull request #23105 from colemanw/grantViewOptions
CiviGrant - Remove non-functional setting for grants tab
Eileen McNaughton [Wed, 6 Apr 2022 01:43:33 +0000 (13:43 +1200)]
Test cleanup
This removes the only call to ContributionSoft::retrieve that I could
find in core, hence I added a deprecation notice to the function.
There could be some extension uses - although it would never have
been supported to call this rather than the api
colemanw [Wed, 6 Apr 2022 01:47:29 +0000 (21:47 -0400)]
Merge pull request #23040 from eileenmcnaughton/display_opt
Stop passing settings into getTaxLabel
colemanw [Wed, 6 Apr 2022 01:42:38 +0000 (21:42 -0400)]
Merge pull request #23008 from eileenmcnaughton/temp_selected
Re-fix enotice on templateSelected
Coleman Watts [Wed, 6 Apr 2022 01:02:09 +0000 (21:02 -0400)]
CiviGrant - Remove non-functional setting for grants tab in `contact_view_options`
Fixes dev/core#3159
The status of the tab can be controlled at a coarse level by disabling/enabling the CiviGrant extension,
and at a finer level with the Contact Layout Editor extension, making this option unnecessary.
Since it's broken, it seemed best to remove it.
colemanw [Wed, 6 Apr 2022 00:46:34 +0000 (20:46 -0400)]
Merge pull request #22992 from eileenmcnaughton/billingnot
Fix smarty notices in billing form
colemanw [Wed, 6 Apr 2022 00:45:22 +0000 (20:45 -0400)]
Merge pull request #23039 from eileenmcnaughton/inv2
Access invoice_prefix setting directly
colemanw [Wed, 6 Apr 2022 00:30:22 +0000 (20:30 -0400)]
Merge pull request #23038 from eileenmcnaughton/assign3
Assign totalTaxAmount more consistently
colemanw [Wed, 6 Apr 2022 00:29:14 +0000 (20:29 -0400)]
Merge pull request #23077 from eileenmcnaughton/js_cancel
Prevent escaping on cancelInfo_show_ids
colemanw [Wed, 6 Apr 2022 00:24:07 +0000 (20:24 -0400)]
Merge pull request #23096 from eileenmcnaughton/ev_paid
Test usability fix
Eileen McNaughton [Wed, 6 Apr 2022 00:17:47 +0000 (12:17 +1200)]
Merge pull request #23018 from colemanw/afformDeepSearch
SearchKit - Ensure filters work with multiple search displays on a form
Eileen McNaughton [Tue, 5 Apr 2022 22:57:52 +0000 (10:57 +1200)]
Merge pull request #23100 from civicrm/5.48
5.48
Seamus Lee [Tue, 5 Apr 2022 22:06:18 +0000 (08:06 +1000)]
Update DOMPDF to 1.2.1 and update composer-compile-plugin as per master
demeritcowboy [Tue, 5 Apr 2022 20:57:47 +0000 (16:57 -0400)]
Merge pull request #22986 from colemanw/afformFixBlocksAgain
Afform - repeat block metadata update to fix errors when saving blocks
Matthew Wire [Tue, 5 Apr 2022 20:43:42 +0000 (21:43 +0100)]
Merge pull request #23081 from eileenmcnaughton/paypal
First recurring payment (paypal ipn) - remove redundant status set, start_date change
colemanw [Tue, 5 Apr 2022 18:43:43 +0000 (14:43 -0400)]
Merge pull request #23094 from colemanw/contactTypeIconUI
dev/user-interface#26 Use font-awesome icons for contact types and recent items
Coleman Watts [Sun, 3 Apr 2022 01:29:49 +0000 (21:29 -0400)]
RecentItems - Use font-awesome icons in recent items sidebar
Eileen McNaughton [Fri, 1 Apr 2022 04:26:52 +0000 (17:26 +1300)]
Remove redundant status seting in IPN
Eileen McNaughton [Mon, 4 Apr 2022 19:44:25 +0000 (07:44 +1200)]
Merge pull request #23041 from christianwach/lab-core-2103
Event Location fixes
Eileen McNaughton [Mon, 4 Apr 2022 19:42:27 +0000 (07:42 +1200)]
Merge pull request #23052 from konadave/r25088
Don't lose search criteria for smart group built with search builder
Eileen McNaughton [Mon, 4 Apr 2022 19:32:53 +0000 (07:32 +1200)]
Merge pull request #22223 from kurund/pcp-account-improvements
add image upload support for pcp account
demeritcowboy [Mon, 4 Apr 2022 14:16:42 +0000 (10:16 -0400)]
Merge pull request #23083 from jaapjansma/issue_3034
dev/core#3034
Jaap Jansma [Fri, 1 Apr 2022 09:12:08 +0000 (11:12 +0200)]
Fix for issue 3034
Fix for issue 3034
Monish Deb [Mon, 4 Apr 2022 10:49:32 +0000 (16:19 +0530)]
Merge pull request #23079 from colemanw/financialAccountCleanup
Cleanup FinancialAccount BAO to use `writeRecord` and deprecate `add`
Eileen McNaughton [Mon, 4 Apr 2022 02:11:41 +0000 (14:11 +1200)]
Test usability fix
Having the dummy data in the past causes debugging pain
Eileen McNaughton [Mon, 4 Apr 2022 01:35:52 +0000 (13:35 +1200)]
Merge pull request #23095 from seamuslee001/array_key_first_fix
[REF] Create polyfill function for array_key_first which only exists …
Coleman Watts [Sat, 2 Apr 2022 23:26:51 +0000 (19:26 -0400)]
ContactType - Prefer icons over image_URL
This is an intermediary step toward removing the image_URL field.
The UI now uses css-based icons when available, and only falls back to image_URL when
an icon hasn't been set for a given sub-type.
Fixes dev/user-interface#26
Coleman Watts [Sat, 2 Apr 2022 16:13:47 +0000 (12:13 -0400)]
Update contactType form to support icons and deprecate image_URL
Coleman Watts [Sat, 2 Apr 2022 15:52:13 +0000 (11:52 -0400)]
Add system check for contact type image
Seamus Lee [Sun, 3 Apr 2022 21:29:51 +0000 (07:29 +1000)]
[RFF] Use Symfony Polyfil to fix issue with missing array_key_first in ealier php versions
Eileen McNaughton [Sun, 3 Apr 2022 23:01:39 +0000 (11:01 +1200)]
Merge pull request #23093 from braders/feature/activity-search-notices
Avoid PHP notices in activity search
colemanw [Sun, 3 Apr 2022 15:49:20 +0000 (11:49 -0400)]
Merge pull request #23073 from colemanw/contactTypeIcon
Add civicrm_contact_type.icon column
Bradley Taylor [Sat, 2 Apr 2022 17:25:32 +0000 (18:25 +0100)]
Avoid PHP notices in activity search
Eileen McNaughton [Sat, 2 Apr 2022 21:20:37 +0000 (09:20 +1200)]
Merge pull request #22376 from colemanw/searchKitInPlaceCreate
SearchKit - Allow creation of new records via in-place edit
Seamus Lee [Sat, 2 Apr 2022 10:49:35 +0000 (21:49 +1100)]
Merge pull request #23090 from civicrm/dependabot/npm_and_yarn/minimist-1.2.6
Bump minimist from 1.2.5 to 1.2.6
Yashodha Chaku [Sat, 2 Apr 2022 10:16:35 +0000 (15:46 +0530)]
Merge pull request #23049 from pradpnayak/addUniquieId
Add membership_id as a reference to the row
dependabot[bot] [Sat, 2 Apr 2022 05:07:05 +0000 (05:07 +0000)]
Bump minimist from 1.2.5 to 1.2.6
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)
---
updated-dependencies:
- dependency-name: minimist
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Tim Otten [Sat, 2 Apr 2022 05:06:43 +0000 (22:06 -0700)]
Merge pull request #23088 from seamuslee001/update_composer_compile_plugin
[REF] Update Composer compile plugin
Seamus Lee [Sat, 2 Apr 2022 00:15:19 +0000 (11:15 +1100)]
[REF] Update Composer compile plugin
Eileen McNaughton [Fri, 1 Apr 2022 20:49:35 +0000 (09:49 +1300)]
Merge pull request #23085 from civicrm/5.48
5.48
Eileen McNaughton [Fri, 1 Apr 2022 20:49:22 +0000 (09:49 +1300)]
Merge pull request #23086 from demeritcowboy/report-filter
dev/core#3153 - Fix missing filter summary on CiviReports
colemanw [Fri, 1 Apr 2022 20:24:37 +0000 (16:24 -0400)]
Merge pull request #23034 from colemanw/searchKitIcons
SearchKit - Add icon support
colemanw [Fri, 1 Apr 2022 20:20:17 +0000 (16:20 -0400)]
Merge pull request #23042 from eileenmcnaughton/sane
Finish conversion of static function to non-static
colemanw [Fri, 1 Apr 2022 20:18:23 +0000 (16:18 -0400)]
Merge pull request #23069 from eileenmcnaughton/triggers
Avoid trailing spaces in trigger output
demeritcowboy [Fri, 1 Apr 2022 17:55:22 +0000 (13:55 -0400)]
fix missing filter summary
Coleman Watts [Fri, 25 Mar 2022 15:46:13 +0000 (11:46 -0400)]
SearchKit - Add icon support
This allows each column to have one or more icons, based on a field value or a conditional rule.
Coleman Watts [Fri, 25 Mar 2022 15:20:48 +0000 (11:20 -0400)]
SearchKit - Fix deleting css rule
Missing argument to splice was causing all rules to be deleted instead of just the one clicked on.
Also updates style to match other delete buttons in searchKit.
Coleman Watts [Fri, 25 Mar 2022 15:19:16 +0000 (11:19 -0400)]
jQuery - Switch from deprecated `done()` to more standard `then()`
Coleman Watts [Fri, 1 Apr 2022 17:02:14 +0000 (13:02 -0400)]
Fix unit test - don't use empty string as name
demeritcowboy [Fri, 1 Apr 2022 16:46:26 +0000 (12:46 -0400)]
Merge pull request #23051 from adixon/3031-smart-subscribe-check-sql
split sql select into two selects for performance reasons
colemanw [Fri, 1 Apr 2022 16:41:05 +0000 (12:41 -0400)]
Merge pull request #22996 from colemanw/optionGroupShape
Add option_value_fields metadata
Alan Dixon [Mon, 28 Mar 2022 20:23:52 +0000 (16:23 -0400)]
split sql select into two selects for performance reasons
Pradeep Nayak [Mon, 28 Mar 2022 00:05:51 +0000 (01:05 +0100)]
Add membership_id as a reference to the row
colemanw [Fri, 1 Apr 2022 02:30:15 +0000 (22:30 -0400)]
Merge pull request #23075 from civicrm/5.48
5.48
colemanw [Fri, 1 Apr 2022 02:29:53 +0000 (22:29 -0400)]
Merge pull request #23078 from eileenmcnaughton/ft
Ensure formType is assigned to the template
Coleman Watts [Fri, 1 Apr 2022 02:18:29 +0000 (22:18 -0400)]
Cleanup FinancialAccount BAO to use `writeRecord` and deprecate `add`
Sets default values for boolean fields
colemanw [Fri, 1 Apr 2022 01:05:22 +0000 (21:05 -0400)]
Merge pull request #23067 from MegaphoneJon/financial-account-improvements
Add support for financial account custom fields
colemanw [Fri, 1 Apr 2022 00:33:11 +0000 (20:33 -0400)]
Merge pull request #22971 from eileenmcnaughton/pay_later
Ensure pay_later variables assigned to template
colemanw [Fri, 1 Apr 2022 00:32:05 +0000 (20:32 -0400)]
Merge pull request #22972 from eileenmcnaughton/notice_send
Ensure some variables are assigned to the template
colemanw [Fri, 1 Apr 2022 00:29:44 +0000 (20:29 -0400)]
Merge pull request #23037 from eileenmcnaughton/assign2
Ensure soft credit types are assigned to the template
Coleman Watts [Thu, 31 Mar 2022 21:21:45 +0000 (17:21 -0400)]
Add civicrm_contact_type.icon column
Toward dev/user-interface#26
This adds an icon column and populates it with data but does not yet expose it in the UI.
The next step is to switch the UI from using the image_URL column over to using the icon column.
demeritcowboy [Fri, 1 Apr 2022 00:03:45 +0000 (20:03 -0400)]
Merge pull request #23070 from colemanw/searchKitGroupByFix
SearchKit - Fix broken group-by caused by non-aggregated id column
Eileen McNaughton [Thu, 31 Mar 2022 23:31:05 +0000 (12:31 +1300)]
Ensre formType is assigned to the template
Eileen McNaughton [Thu, 31 Mar 2022 23:09:25 +0000 (12:09 +1300)]
Prevent exscaping on cancelInfo_show_ids
demeritcowboy [Thu, 31 Mar 2022 23:05:15 +0000 (19:05 -0400)]
Merge pull request #23072 from eileenmcnaughton/isset
Remove more isset from offline receipt
Eileen McNaughton [Thu, 31 Mar 2022 22:52:30 +0000 (11:52 +1300)]
dev/financial#186 Do not display partially paid & partially refunded for selection on edit
I'm pretty sure these were actually removed at one point and got over-added
back because the original fix over-removed them - ie it took them out
when the contribution's current status was 'Partially paid' etc,
making a no-save change impossible
demeritcowboy [Thu, 31 Mar 2022 22:30:52 +0000 (18:30 -0400)]
Merge pull request #23071 from demeritcowboy/token-time
dev/core#3072 - Put contribution dates in message template back to not including time
Eileen McNaughton [Thu, 31 Mar 2022 21:11:48 +0000 (10:11 +1300)]
Remove more isset from offline receipt
demeritcowboy [Thu, 31 Mar 2022 20:58:55 +0000 (16:58 -0400)]
Merge pull request #23064 from eileenmcnaughton/isset
Remove isset from event registration receipt
demeritcowboy [Thu, 31 Mar 2022 17:21:13 +0000 (13:21 -0400)]
put dates back to not including time
Coleman Watts [Mon, 21 Mar 2022 18:18:10 +0000 (14:18 -0400)]
SearchKit & Afform - Add option_value_fields info to managed option groups
Coleman Watts [Thu, 31 Mar 2022 17:52:23 +0000 (13:52 -0400)]
Add option_value_fields metadata
This allows an optionGroup to declare which columns of the OptionValue table it uses.
Previously this was hard-coded into the form.
Coleman Watts [Thu, 31 Mar 2022 13:49:55 +0000 (09:49 -0400)]
SearchKit - Fix UI to allow aggregation of custom fields
Fixes dev/core#3143
Coleman Watts [Thu, 31 Mar 2022 13:42:42 +0000 (09:42 -0400)]
SearchKit - Fix broken group-by caused by non-aggregated id column
Before: The `id` column was being unconditionally added, breaking FULL_GROUP_BY sql
After: Let the Api4SelectQuery take care of it for DAO entities
colemanw [Thu, 31 Mar 2022 12:03:43 +0000 (08:03 -0400)]
Merge pull request #23066 from colemanw/relationshipCacheJoins
SearchKit - Fix joins when RelationshipCache is base search entity
Eileen McNaughton [Thu, 31 Mar 2022 03:29:45 +0000 (16:29 +1300)]
Avoid trailing spaces in trigger output
Seamus Lee [Thu, 31 Mar 2022 01:35:37 +0000 (12:35 +1100)]
Merge pull request #23068 from seamuslee001/master
5.48
Seamus Lee [Thu, 31 Mar 2022 01:33:11 +0000 (12:33 +1100)]
Merge branch '5.48'
Jon Goldberg [Thu, 31 Mar 2022 00:49:56 +0000 (20:49 -0400)]
Add support for financial account custom fields
Coleman Watts [Wed, 30 Mar 2022 23:58:05 +0000 (19:58 -0400)]
SearchKit - Fix joins when RelationshipCache is base search entity
Seamus Lee [Wed, 30 Mar 2022 23:16:18 +0000 (10:16 +1100)]
Merge pull request #23058 from eileenmcnaughton/ext_notice
Do not default-escape upgrade linkes + Enotice fix on Extension screen
demeritcowboy [Wed, 30 Mar 2022 22:55:06 +0000 (18:55 -0400)]
Merge pull request #23063 from demeritcowboy/timezone-multilingual
dev/core#3151 - Don't localize event_tz field when backing up the field during upgrade
Eileen McNaughton [Wed, 30 Mar 2022 21:49:37 +0000 (10:49 +1300)]
Remove isset from event registration receipt
Eileen McNaughton [Wed, 30 Mar 2022 21:47:10 +0000 (10:47 +1300)]
Remove remaining empty checks on pay_later offline receipt
Seamus Lee [Wed, 30 Mar 2022 20:57:59 +0000 (07:57 +1100)]
Merge pull request #23060 from eileenmcnaughton/isset
Remove issets from event_offline_receipt pay_later_text
demeritcowboy [Wed, 30 Mar 2022 19:41:50 +0000 (15:41 -0400)]
don't localize event_tz field when backing up
Eileen McNaughton [Wed, 30 Mar 2022 20:34:48 +0000 (09:34 +1300)]
Merge pull request #23062 from MegaphoneJon/fix-batch-url
[NFC] Fix URL documenting Batch entity