Coleman Watts [Sun, 28 Feb 2021 04:35:42 +0000 (23:35 -0500)]
Afform - Support embedding afforms in WP shortcodes
This implements the necessary hooks & callbacks for picking an afform from the Civi shortcode popup,
and displaying the afform when viewing a single WP post/page or list of posts.
Note that unlike traditional Civi shortcodes, afform does not rely on invoking a civi page request,
but simply outputs the AngularJS directive.
Coleman Watts [Sun, 28 Feb 2021 04:33:49 +0000 (23:33 -0500)]
Afform - add entityRef widget support.
Adds a v3 Afform api solely for the purpose of enabling entityRef widgets, which use APIv3.
Seamus Lee [Wed, 7 Apr 2021 02:36:04 +0000 (12:36 +1000)]
Merge pull request #19887 from colemanw/afformContactSummary
Embed afforms & search displays on contact summary screen as blocks and tabs
Seamus Lee [Wed, 7 Apr 2021 02:35:13 +0000 (12:35 +1000)]
Merge pull request #19980 from eileenmcnaughton/deduper
[REF] Minor cleanup - remove unused variables
colemanw [Wed, 7 Apr 2021 01:45:01 +0000 (21:45 -0400)]
Merge pull request #19934 from eileenmcnaughton/recur
dev/core#2487 Update defaults for civicrm_contribution_recur table
Tim Otten [Wed, 7 Apr 2021 01:16:13 +0000 (18:16 -0700)]
Merge pull request #19946 from MikeyMJCO/patch-9
(NFC) Add FUNDING.yml to display a SPONSOR link that directs to c.o
eileen [Wed, 7 Apr 2021 00:53:01 +0000 (12:53 +1200)]
[REF] Minor cleanup - remove unused variables
This also removes the use of mergeHandler in place of this - which is usually an interim
refactoring step when a function is moved
Coleman Watts [Wed, 24 Mar 2021 13:30:39 +0000 (09:30 -0400)]
SearchKit - display count in tab header if embedded in contact summary tab
Coleman Watts [Wed, 24 Mar 2021 03:09:35 +0000 (23:09 -0400)]
Afform - Enable embedded forms on contact summary screen as blocks and tabs
Eileen McNaughton [Tue, 6 Apr 2021 23:15:40 +0000 (11:15 +1200)]
Merge pull request #19976 from jitendrapurohit/pledgepayment
Fix re-calculation of payment dates on pledge
colemanw [Tue, 6 Apr 2021 22:02:07 +0000 (18:02 -0400)]
Merge pull request #19550 from eileenmcnaughton/msg_tpl_convert
Convert token processing to use token processor
Eileen McNaughton [Tue, 6 Apr 2021 21:26:26 +0000 (09:26 +1200)]
Merge pull request #19970 from colemanw/optionValueDomain
dev/core#2488 - When setting default optionValue, limit query to specified domain
Seamus Lee [Tue, 6 Apr 2021 21:03:57 +0000 (07:03 +1000)]
Merge pull request #19974 from eileenmcnaughton/setup
Phpunit 8 support - add void to setup
Eileen McNaughton [Tue, 6 Apr 2021 19:19:02 +0000 (07:19 +1200)]
Merge pull request #19979 from civicrm/5.36
5.36 to master
Eileen McNaughton [Tue, 6 Apr 2021 19:18:34 +0000 (07:18 +1200)]
Merge pull request #19977 from agh1/5.36.0-releasenotes-initial
5.36.0 release notes initial run
Coleman Watts [Tue, 23 Mar 2021 12:44:15 +0000 (08:44 -0400)]
Afform Gui - Cleanup "Form Settings" tab
Minor code cleanup, help text tweaks and organization on the config-form tab
colemanw [Tue, 6 Apr 2021 18:43:19 +0000 (14:43 -0400)]
Merge pull request #19968 from mlutfy/ui35
dev/user-interface#35 civicrm.css: add support for mobile devices on forms
Andrew Hunt [Tue, 6 Apr 2021 16:23:18 +0000 (12:23 -0400)]
5.36.0 release notes: added boilerplate
Andrew Hunt [Tue, 6 Apr 2021 16:20:56 +0000 (12:20 -0400)]
5.36.0 release notes: raw from script
Mathieu Lutfy [Mon, 5 Apr 2021 13:47:43 +0000 (09:47 -0400)]
civicrm.css: add support for mobile devices on forms
colemanw [Tue, 6 Apr 2021 12:39:19 +0000 (08:39 -0400)]
Merge pull request #19922 from colemanw/angularLoader
AngularJS - Allow loading multiple apps on a single page
Eileen McNaughton [Tue, 6 Apr 2021 10:30:10 +0000 (22:30 +1200)]
Merge pull request #19820 from greenpeace-cee/GP-15884-activity-contact-not-updated
dev/core#2450 - Update source/target contacts on contribution updates
Jitendra Purohit [Tue, 6 Apr 2021 09:42:02 +0000 (15:12 +0530)]
Fix recalculation of dates on pledge
eileen [Tue, 6 Apr 2021 08:53:30 +0000 (20:53 +1200)]
Phpunit 8 support - add void to setup
Manuel Flandorfer [Tue, 23 Mar 2021 11:01:21 +0000 (12:01 +0100)]
dev/core#2450 - Update source/target contacts on contribution updates
dev/core#2450 - Incorporate requested changes
dev/core#2450 - Make activity target contact parameter an array
dev/core#2450 - Delete now obsolete comment about target contact updates
dev/core#2450 - Compare activity contact IDs on contribution update
to avoid unnecessary updates
dev/core#2450 - Simplify API calls in unit test
dev/core#2450 - Remove limit from activity contact query
Monish Deb [Tue, 6 Apr 2021 06:05:01 +0000 (11:35 +0530)]
Merge pull request #19904 from eileenmcnaughton/pdf
[REF] [Search-kit-actions] Cleanup around contribution pdf common
Monish Deb [Tue, 6 Apr 2021 05:39:27 +0000 (11:09 +0530)]
Merge pull request #19628 from vakeesan26/master
dev/core#2383 fix for contact custom data date field not working in scheduled reminder
Eileen McNaughton [Tue, 6 Apr 2021 03:18:19 +0000 (15:18 +1200)]
Merge pull request #19971 from eileenmcnaughton/setup
Remove empty setUp() functions
eileen [Tue, 6 Apr 2021 01:45:08 +0000 (13:45 +1200)]
Remove empty setUp() functions
Coleman Watts [Mon, 5 Apr 2021 23:40:06 +0000 (19:40 -0400)]
dev/core#2488 - When setting default optionValue, limit query to specified domain
Eileen McNaughton [Mon, 5 Apr 2021 23:25:11 +0000 (11:25 +1200)]
Merge pull request #19959 from colemanw/afFilterRange
SearchKit - Support implied operators in exposed search forms
Coleman Watts [Mon, 5 Apr 2021 21:22:46 +0000 (17:22 -0400)]
Afform - Allow search range by postal code
Search display forms only allow numeric fields to be a search range,
but postal code is an exception (it's stored as a string but is numeric in some locales)
Coleman Watts [Mon, 5 Apr 2021 20:40:17 +0000 (16:40 -0400)]
Afform - Set defaults for search filter fields
Eileen McNaughton [Mon, 5 Apr 2021 19:43:39 +0000 (07:43 +1200)]
Merge pull request #19961 from systopia/issue/2502_master
dev/core#2502 Proposed fix/workaround for CORE-2502
Eileen McNaughton [Mon, 5 Apr 2021 19:40:45 +0000 (07:40 +1200)]
Merge pull request #19907 from colemanw/civiCaseApi
APIv4 - Add CiviCase, CaseType, CaseContact entities
Coleman Watts [Wed, 31 Mar 2021 19:50:19 +0000 (15:50 -0400)]
SearchKit - Add unit test for SearchDisplay::run
Coleman Watts [Wed, 31 Mar 2021 18:30:12 +0000 (14:30 -0400)]
Afform - Support search-by-range and search-by-multiple-values
This adds support for filter operators in SearchKit. It does not expose an operator selector to Afform
but allows an operator to be implied through the type of field configured.
e.g. a multiselect implies the IN operator & a range select implies BETWEEN.
B. Endres [Thu, 1 Apr 2021 11:57:50 +0000 (13:57 +0200)]
proposed fix/workaround for CORE-2502
Eileen McNaughton [Mon, 5 Apr 2021 07:46:35 +0000 (19:46 +1200)]
Merge pull request #19317 from ahed-compucorp/dev/core#2285
dev/core#2285 Fix civicrm_alterReportVar hook for contribute detail r…
Eileen McNaughton [Mon, 5 Apr 2021 07:27:16 +0000 (19:27 +1200)]
Merge pull request #19920 from totten/master-upgrade-token
Upgrader - Display note about token formatting
Eileen McNaughton [Mon, 5 Apr 2021 07:21:10 +0000 (19:21 +1200)]
Merge pull request #19948 from demeritcowboy/defrev-recdate
dev/financial#172 - Warning when saving a contribution with a recognition date
Eileen McNaughton [Sat, 3 Apr 2021 20:03:04 +0000 (08:03 +1200)]
Merge pull request #19963 from systopia/issue/2164_2
Proposed fix for CORE-2164
B. Endres [Sat, 3 Apr 2021 17:47:53 +0000 (19:47 +0200)]
proposed fix for CORE-2164
Coleman Watts [Thu, 1 Apr 2021 22:41:23 +0000 (18:41 -0400)]
Add APIv4 CaseType entity
The `definition` field requires special formatting; so this change
allows api fields to specify `output_formatters`, which are per-field
callback functions for altering the output of a `get` request.
Coleman Watts [Thu, 25 Mar 2021 14:48:33 +0000 (10:48 -0400)]
APIv4 - Add CiviCase and CaseContact entities
Mathieu Lu [Fri, 2 Apr 2021 16:24:56 +0000 (12:24 -0400)]
Merge pull request #18982 from mlutfy/wp82
dev/wordpress#82 Add support for creating WordPress accounts from the contact record
Eileen McNaughton [Thu, 1 Apr 2021 22:02:06 +0000 (11:02 +1300)]
Merge pull request #19962 from jaapjansma/dev_2503
Fix for dev/core#2503
Jaap Jansma [Thu, 1 Apr 2021 13:30:10 +0000 (15:30 +0200)]
Fix for dev/core#2503
Seamus Lee [Thu, 1 Apr 2021 03:08:51 +0000 (14:08 +1100)]
Merge pull request #19949 from eileenmcnaughton/dedupe
[REF] Minor cleanup - strictness & formatting
Monish Deb [Thu, 1 Apr 2021 02:48:08 +0000 (08:18 +0530)]
Merge pull request #19911 from eileenmcnaughton/new
[REF] [Towards membership api] more consistent handling on amount
Seamus Lee [Wed, 31 Mar 2021 22:21:55 +0000 (09:21 +1100)]
Merge pull request #19938 from demeritcowboy/php74-money
dev/financial#171 - Trigger an error if non-numeric value passed to Money::format()
Eileen McNaughton [Wed, 31 Mar 2021 21:24:55 +0000 (10:24 +1300)]
Merge pull request #19937 from samuelsov/core#527
dev/core#527 use public title for on behalf profile and confirm/thank you profile in emails
Eileen McNaughton [Wed, 31 Mar 2021 20:51:15 +0000 (09:51 +1300)]
Merge pull request #19951 from pradpnayak/fixgetlineitem
Donot over-ride total amount incase contribution has more than one line item
Eileen McNaughton [Wed, 31 Mar 2021 20:49:18 +0000 (09:49 +1300)]
Merge pull request #19958 from demeritcowboy/htmlmoney
dev/financial#171 - Don't try to money_format html
Eileen McNaughton [Wed, 31 Mar 2021 20:47:42 +0000 (09:47 +1300)]
Merge pull request #19561 from seamuslee001/search_task_map
Expose mapping search task to Search Kit
Samuel Vanhove [Wed, 31 Mar 2021 19:49:25 +0000 (15:49 -0400)]
dev/core#527 simpler solution
colemanw [Wed, 31 Mar 2021 18:26:38 +0000 (14:26 -0400)]
Merge pull request #19955 from eileenmcnaughton/merge_locations
[REF] Move function from static class to OO class
demeritcowboy [Wed, 31 Mar 2021 13:36:50 +0000 (09:36 -0400)]
don't try to money_format html
Monish Deb [Wed, 31 Mar 2021 09:41:31 +0000 (15:11 +0530)]
Merge pull request #19924 from eileenmcnaughton/mem_ex
[REF] Extract getMembershipTypeValues
Eileen McNaughton [Wed, 31 Mar 2021 09:33:04 +0000 (22:33 +1300)]
Merge pull request #19956 from civicrm/5.36
5.36
Monish Deb [Wed, 31 Mar 2021 05:22:55 +0000 (10:52 +0530)]
Merge pull request #19952 from eileenmcnaughton/5.36
dev/core#2498 Fix regression on saving dedupe rules
Seamus Lee [Wed, 31 Mar 2021 05:07:35 +0000 (16:07 +1100)]
Merge pull request #19936 from jmcclelland/only-include-completed
Only include completed contributions in the aggregate custom search
Seamus Lee [Wed, 31 Mar 2021 05:05:20 +0000 (16:05 +1100)]
Merge pull request #19894 from eileenmcnaughton/acl
Only call getGroupACLRoles if contactID is present
Seamus Lee [Wed, 31 Mar 2021 05:01:07 +0000 (16:01 +1100)]
Merge pull request #19944 from civicrm/dependabot/npm_and_yarn/y18n-4.0.1
Bump y18n from 4.0.0 to 4.0.1
Seamus Lee [Wed, 31 Mar 2021 04:59:28 +0000 (15:59 +1100)]
Merge pull request #19953 from eileenmcnaughton/jobtest
NFC cleanup in test class
eileen [Wed, 31 Mar 2021 03:47:13 +0000 (16:47 +1300)]
[REF] Move function from static class to OO class
Part of using the mergeHandler to (slowly) make code more readable.
changes from
self::mergeLocations();
to mergeHandler->mergeLocations()
eileen [Wed, 31 Mar 2021 02:51:50 +0000 (15:51 +1300)]
NFC cleanup in hook class
Eileen McNaughton [Wed, 31 Mar 2021 02:35:30 +0000 (15:35 +1300)]
Merge pull request #19950 from eileenmcnaughton/dead_fn
Remove unused private function
Pradeep Nayak [Wed, 31 Mar 2021 01:55:37 +0000 (02:55 +0100)]
Adding test to support fix
Eileen McNaughton [Wed, 31 Mar 2021 01:46:26 +0000 (14:46 +1300)]
Merge pull request #19941 from eileenmcnaughton/html_to_money
Stop passing html to crmMoney
Pradeep Nayak [Wed, 31 Mar 2021 01:16:23 +0000 (02:16 +0100)]
Donot over-ride total amount incase contribution has more than one line item
eileen [Wed, 31 Mar 2021 01:28:11 +0000 (14:28 +1300)]
dev/core#2498 Fix regression on saving dedupe rules
eileen [Wed, 31 Mar 2021 00:35:22 +0000 (13:35 +1300)]
Remove unused private function
eileen [Wed, 31 Mar 2021 00:17:58 +0000 (13:17 +1300)]
[REF] Minor cleanup
Makes typing a bit stricter, uses preferred strpos function
demeritcowboy [Tue, 30 Mar 2021 23:04:12 +0000 (19:04 -0400)]
datepicker remnant
Seamus Lee [Tue, 30 Mar 2021 22:45:54 +0000 (09:45 +1100)]
Merge pull request #19940 from eileenmcnaughton/dave_shall_not_break_our_tests
Fix to avoid passing non-money to money::format
colemanw [Tue, 30 Mar 2021 20:02:40 +0000 (16:02 -0400)]
Merge pull request #19933 from eileenmcnaughton/pt
dev/core#2486 Add payment token api
eileen [Tue, 30 Mar 2021 00:33:38 +0000 (13:33 +1300)]
Stop passing html to crmMoney
colemanw [Tue, 30 Mar 2021 19:03:34 +0000 (15:03 -0400)]
Merge pull request #19945 from eileenmcnaughton/group_filter
[REF] Extract portion of GroupContact load that builds the temporary table
Coleman Watts [Tue, 30 Mar 2021 14:49:20 +0000 (10:49 -0400)]
Afform - Fix help_pre and help_post from custom fields
Previously, default help_pre and help_post would not show if set for a custom field.
Coleman Watts [Tue, 30 Mar 2021 14:18:49 +0000 (10:18 -0400)]
Afform - Use bootstrap classes on form elements
Mikey O'Toole [Tue, 30 Mar 2021 10:44:08 +0000 (11:44 +0100)]
Add FUNDING.yml to display a SPONSOR link that directs to c.o
eileen [Mon, 29 Mar 2021 00:54:16 +0000 (13:54 +1300)]
Add payment token api
I put up a merge request to edit in somewhere to link to
https://lab.civicrm.org/documentation/docs/user-en/-/merge_requests/472 since I couldn't
see anywhere that payment tokens were discussed
eileen [Tue, 30 Mar 2021 05:42:36 +0000 (18:42 +1300)]
[REF] Extract portion of GroupContact load that builds the temporary table
This is mostly a straight extraction. I chose to pass groupIDs in as an array
as I think that creates greater flexibility and I chose to pass CRM_Utils_SQL_TempTable
in rather than load it in the function because I have some ideas I'm working through
about how that might also provide more flexibilty
Those things can be changed later if we want as it IS a protected function
dependabot[bot] [Tue, 30 Mar 2021 04:10:40 +0000 (04:10 +0000)]
Bump y18n from 4.0.0 to 4.0.1
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)
Signed-off-by: dependabot[bot] <support@github.com>
Eileen McNaughton [Tue, 30 Mar 2021 04:10:12 +0000 (17:10 +1300)]
Merge pull request #19935 from colemanw/afGuiFixes
Afform GUI - Improve drag-n-drop and add link to edit search
Eileen McNaughton [Tue, 30 Mar 2021 03:18:13 +0000 (16:18 +1300)]
Merge pull request #19943 from civicrm/5.36
5.36 to master
Eileen McNaughton [Tue, 30 Mar 2021 03:17:30 +0000 (16:17 +1300)]
Merge pull request #19942 from eileenmcnaughton/5.36
Revert "dev/core#2028 Add in a status check for checking if the wkhtm…
eileen [Tue, 30 Mar 2021 00:50:28 +0000 (13:50 +1300)]
Revert "dev/core#2028 Add in a status check for checking if the wkhtmltopdf package is installed in the expected location, Also ensure if it isn't then the pdf generation falls back on the current default which is DOMPDF"
This reverts commit
6bbe0cf6c513c49f89179aa153cabad3a2a059b7.
eileen [Tue, 30 Mar 2021 00:25:55 +0000 (13:25 +1300)]
Fix to avoid passing non-money to money::format
Coleman Watts [Mon, 29 Mar 2021 03:18:37 +0000 (23:18 -0400)]
AfformGui - Improve dragging & dropping with more space & clearer borders
This adds more space for dragging & dropping elements so it's not so difficult to put things in the right place
Eileen McNaughton [Mon, 29 Mar 2021 19:09:20 +0000 (08:09 +1300)]
Merge pull request #19931 from eileenmcnaughton/fa
dev/core#2486 Add v4 batch api
Eileen McNaughton [Mon, 29 Mar 2021 18:08:18 +0000 (07:08 +1300)]
Merge pull request #19923 from MikeyMJCO/patch-8
Set the `Other Amount` input in a price set to not autocomplete
Eileen McNaughton [Mon, 29 Mar 2021 18:06:15 +0000 (07:06 +1300)]
Merge pull request #19873 from demeritcowboy/multiemail-activityids
dev/core#2463 - Adjust returned list of activity ids when sending emails since it changes in 5.36+
demeritcowboy [Mon, 29 Mar 2021 17:54:24 +0000 (13:54 -0400)]
trigger an error if non-numeric
Samuel Vanhove [Mon, 29 Mar 2021 16:06:07 +0000 (12:06 -0400)]
dev/core#527 use public title for on behalf profile and confirm/thank you pages
Jamie McClelland [Mon, 29 Mar 2021 14:27:25 +0000 (10:27 -0400)]
Only include completed contributions in the aggregate custom search
There is little value in getting the aggregate contributions if failed
contributions are also included.
eileen [Sun, 28 Mar 2021 23:42:43 +0000 (12:42 +1300)]
Add v4 batch api
Coleman Watts [Mon, 29 Mar 2021 03:17:18 +0000 (23:17 -0400)]
AfformGui - Add link to edit SavedSearch to searchDisplay element
Eileen McNaughton [Mon, 29 Mar 2021 01:41:46 +0000 (14:41 +1300)]
Merge pull request #19932 from eileenmcnaughton/ft
dev/core#2486 Add entity financial trxn