Eileen McNaughton [Tue, 24 Nov 2020 07:25:50 +0000 (20:25 +1300)]
Merge pull request #19037 from eileenmcnaughton/dep
Remove some deprecated code
Seamus Lee [Tue, 24 Nov 2020 06:32:29 +0000 (17:32 +1100)]
Merge pull request #19032 from eileenmcnaughton/obj
[REF] Simplify single function to receive contribution not objects
Seamus Lee [Tue, 24 Nov 2020 06:31:06 +0000 (17:31 +1100)]
Merge pull request #19033 from eileenmcnaughton/obj2
dev/financial#148 fold call to loadObjects
Seamus Lee [Tue, 24 Nov 2020 06:30:29 +0000 (17:30 +1100)]
Merge pull request #19035 from eileenmcnaughton/obj4
dev/financial#148 fold call to loadObjects - a.net
Seamus Lee [Tue, 24 Nov 2020 06:30:14 +0000 (17:30 +1100)]
Merge pull request #19034 from eileenmcnaughton/obj3
dev/financial#148 duplicate out call to validateObjects
eileen [Tue, 24 Nov 2020 03:18:09 +0000 (16:18 +1300)]
Remove some deprecated code
This was deprecated over a year ago just in case anyone was passing in the legacy param - fully removing now
Eileen McNaughton [Tue, 24 Nov 2020 02:21:28 +0000 (15:21 +1300)]
Merge pull request #19036 from civicrm/5.32
5.32 to master
Eileen McNaughton [Tue, 24 Nov 2020 02:20:48 +0000 (15:20 +1300)]
Merge pull request #19031 from colemanw/bullets
Improve options in list search display
Eileen McNaughton [Tue, 24 Nov 2020 01:14:20 +0000 (14:14 +1300)]
Merge pull request #19030 from civicrm/5.32
5.32
Eileen McNaughton [Tue, 24 Nov 2020 01:13:22 +0000 (14:13 +1300)]
Merge pull request #19027 from mlutfy/fixEvent30
Event Full: fix translation regression
eileen [Tue, 24 Nov 2020 01:04:34 +0000 (14:04 +1300)]
dev/financial#148 fold call to loadObjects
eileen [Tue, 24 Nov 2020 00:58:52 +0000 (13:58 +1300)]
dev/financial#148 duplicate out call to validateObjects
eileen [Tue, 24 Nov 2020 00:49:51 +0000 (13:49 +1300)]
dev/financial#148 fold call to loadObjects
eileen [Tue, 24 Nov 2020 00:40:36 +0000 (13:40 +1300)]
Simplify single function to receive contribution not objects
Contribution is now the only object used in this function - so it should be the only one passed in
Seamus Lee [Tue, 24 Nov 2020 00:12:03 +0000 (11:12 +1100)]
Merge pull request #19015 from eileenmcnaughton/fail
dev/core#927 Update ContributionCancelActions to also handle 'failed'
Coleman Watts [Mon, 23 Nov 2020 23:49:34 +0000 (18:49 -0500)]
Improve options in list search display
Seamus Lee [Mon, 23 Nov 2020 23:39:36 +0000 (10:39 +1100)]
Merge pull request #19029 from seamuslee001/5_31_1_rn
Add release-notes/5.31.1.md
Tim Otten [Mon, 23 Nov 2020 22:28:13 +0000 (14:28 -0800)]
Add release-notes/5.31.1.md
Eileen McNaughton [Mon, 23 Nov 2020 22:50:06 +0000 (11:50 +1300)]
Merge pull request #19020 from eileenmcnaughton/grant
Add Grant v4 api
Mathieu Lutfy [Mon, 23 Nov 2020 22:03:40 +0000 (17:03 -0500)]
Event Full: fix translation regression
eileen [Mon, 23 Nov 2020 01:18:28 +0000 (14:18 +1300)]
Add Grant v4 api
I created a spec provider for a default currency as I didn't think it made sense to require it
Update APIv4 Grant docblock
eileen [Mon, 23 Nov 2020 00:11:07 +0000 (13:11 +1300)]
Remove test as not valid
It is no longer possible to enter a contribution with a cancelled or failed status via the membership form so
this test is not valid. Only pending or completed are permitted
eileen [Sun, 22 Nov 2020 21:05:50 +0000 (10:05 +1300)]
Update ContributionCancelActions to also handle 'failed'
The failed action has no discernable difference from the no-longer-used cancel action. The cancel action had some minor refactoring
done to work through the conclusion that the call to addRecurLineItems was never reached in a meaningful way
but I think we can skip all that & see that fail is not functionally different to cancel & just deprecate the function.
At this point we are very close to simply removing the last core handling for failed & cance & making the extension visible.
The only thing I can see that still needs checking in the 2 functions still to be removed is the handling of
is_override & override_date is tested - which I will do as a follow up
Seamus Lee [Mon, 23 Nov 2020 06:26:19 +0000 (17:26 +1100)]
Merge pull request #19022 from civicrm/5.32
5.32
Eileen McNaughton [Mon, 23 Nov 2020 04:02:56 +0000 (17:02 +1300)]
Merge pull request #18978 from AsylumSeekersCentre/fixReportFilterMultiSelect
Fix issue #2162: allow reports to filter multi-select fields and find entities with multiple selections
Seamus Lee [Mon, 23 Nov 2020 02:26:36 +0000 (13:26 +1100)]
Merge pull request #19007 from alexymik/patch-1
Check for membership type fee before applying tax
Seamus Lee [Mon, 23 Nov 2020 01:38:14 +0000 (12:38 +1100)]
Merge pull request #19012 from eileenmcnaughton/trans3
dev/core#927 [REF] Further removal on unreachable code in transitionComponents
Seamus Lee [Mon, 23 Nov 2020 01:25:31 +0000 (12:25 +1100)]
Merge pull request #19018 from demeritcowboy/case-tasks-deprecated
dev/core#2205 - Deprecated function warning when choosing task from Find Cases results
Eileen McNaughton [Mon, 23 Nov 2020 00:01:04 +0000 (13:01 +1300)]
Merge pull request #19016 from eileenmcnaughton/obj
dev/financial#152 [REF] Pass specific BAO into the recur function rather than the vague 'objects'
Eileen McNaughton [Sun, 22 Nov 2020 23:36:16 +0000 (12:36 +1300)]
Merge pull request #19010 from colemanw/bridges
Use trait instead of class for Entity Bridges; add OptionList trait
Alexy Mikhailichenko [Fri, 20 Nov 2020 20:49:17 +0000 (12:49 -0800)]
Check for membership type fee before applying tax
demeritcowboy [Sun, 22 Nov 2020 23:12:06 +0000 (18:12 -0500)]
deprecated base function
eileen [Sun, 22 Nov 2020 21:58:54 +0000 (10:58 +1300)]
dev/financial#152 Pass specific BAO into the recur function rather than the vague 'objects'
eileen [Sat, 21 Nov 2020 17:19:01 +0000 (06:19 +1300)]
[REF] Further removal on unreachable code in transitionComponents
Once #18997 & #18998 is merged it becomes clear that processContribution can never be true & hence this code is unreachable
Seamus Lee [Sun, 22 Nov 2020 19:39:17 +0000 (06:39 +1100)]
Merge pull request #18998 from eileenmcnaughton/trans2
Remove unused params, return params from processFail
Seamus Lee [Sun, 22 Nov 2020 19:38:32 +0000 (06:38 +1100)]
Merge pull request #18997 from eileenmcnaughton/trans
Remove unused parameters from cancel
Seamus Lee [Sun, 22 Nov 2020 19:33:43 +0000 (06:33 +1100)]
Merge pull request #18880 from vingle/master
changes social media iframes/scripts to links, simplifies markup, adds email & bootstrap classes
Eileen McNaughton [Sun, 22 Nov 2020 00:53:47 +0000 (13:53 +1300)]
Merge pull request #18959 from seamuslee001/dev_core_2153_2
dev/core#2153 #REF Remove outdated updateCustomValues function
Seamus Lee [Wed, 11 Nov 2020 23:20:54 +0000 (10:20 +1100)]
dev/core#2153 #REF Remove outdated updateCustomValues function
Move function call back to where it was under cividesk
Fix delete and ensure updateValue is only called on update
Seamus Lee [Sat, 21 Nov 2020 20:48:42 +0000 (07:48 +1100)]
Merge pull request #19009 from colemanw/limitTest
Fix APIv4 test to assert an exception is thrown
Seamus Lee [Sat, 21 Nov 2020 20:48:07 +0000 (07:48 +1100)]
Merge pull request #19013 from eileenmcnaughton/cancel
[NFC] Minor margin tidy up
Eileen McNaughton [Sat, 21 Nov 2020 20:38:27 +0000 (09:38 +1300)]
Merge pull request #19008 from alifrumin/bookkeepingcolumns
Add standard Contact fields to the Bookkeeping report template
Alice Frumin [Fri, 20 Nov 2020 21:48:11 +0000 (15:48 -0600)]
Adding ALL standard Contact fields to the Bookkeeping report template
eileen [Sat, 21 Nov 2020 17:31:26 +0000 (06:31 +1300)]
[NFC] Minor margin tidy up
Just fixes all the things that get marked as 'not best practice' in the IDE
Eileen McNaughton [Sat, 21 Nov 2020 17:12:31 +0000 (06:12 +1300)]
Merge pull request #19011 from demeritcowboy/event-enotice
E_NOTICE when deleting participant
demeritcowboy [Sat, 21 Nov 2020 14:21:08 +0000 (09:21 -0500)]
E_NOTICE when deleting participant
Coleman Watts [Sat, 21 Nov 2020 02:53:30 +0000 (21:53 -0500)]
Use trait instead of class for Entity Bridges; add OptionList trait
Traits allow each entity to have > 1 type
This excludes both EntityBridge and OptionList types from the
main search dropdown.
Coleman Watts [Sat, 21 Nov 2020 01:49:22 +0000 (20:49 -0500)]
Fix APIv4 test to assert an exception is thrown
The test had only run its assertion in the catch block which would have been skipped if an exception wasn't thrown
Seamus Lee [Fri, 20 Nov 2020 04:28:36 +0000 (15:28 +1100)]
Merge pull request #19004 from civicrm/5.32
5.32
Tim Otten [Fri, 20 Nov 2020 01:09:39 +0000 (17:09 -0800)]
Merge pull request #18987 from colemanw/moduleBundles
Allow Angular modules to require Resource bundles
Tim Otten [Fri, 20 Nov 2020 01:04:02 +0000 (17:04 -0800)]
Merge pull request #19001 from eileenmcnaughton/532
Include oauth-client in tarball
Eileen McNaughton [Fri, 20 Nov 2020 00:24:34 +0000 (13:24 +1300)]
Merge pull request #19003 from civicrm/5.32
5.32 to master
Eileen McNaughton [Fri, 20 Nov 2020 00:23:58 +0000 (13:23 +1300)]
Merge pull request #18999 from colemanw/searchStuff
Search kit bug fixes & List display
eileen [Thu, 19 Nov 2020 23:14:59 +0000 (12:14 +1300)]
Include oauth-client in tarball
Eileen McNaughton [Thu, 19 Nov 2020 23:08:36 +0000 (12:08 +1300)]
Merge pull request #18994 from totten/master-ang-json
crm-ui-debug - If in debug mode, then load pretty-printer for JSON data
Seamus Lee [Thu, 19 Nov 2020 22:30:21 +0000 (09:30 +1100)]
Merge pull request #19000 from civicrm/5.32
5.32
Seamus Lee [Thu, 19 Nov 2020 22:16:46 +0000 (09:16 +1100)]
Merge pull request #18996 from kcristiano/5.32.1931
dev/core#1931 Prevent PayPal from double-encoding the IPN Notify URL 5.32 backport
Coleman Watts [Thu, 19 Nov 2020 21:47:56 +0000 (16:47 -0500)]
Search kit: Fix issues with variable pollution and clean up shared display code
eileen [Thu, 19 Nov 2020 21:46:27 +0000 (10:46 +1300)]
Remove unused params, return params from processFail
eileen [Thu, 19 Nov 2020 21:37:16 +0000 (10:37 +1300)]
Remove unused parameters from cancel
cancel as a protected function is only called from one place and the processContribution value is always false.
This means that the returned processContribution value is always false - so we don't need to return
it as it is set to false already. In addition the currently returned updateResult is no longer
used so we don't need to return that either.
I will do the same changes in a separate PR for processFail
colemanw [Thu, 19 Nov 2020 21:17:26 +0000 (16:17 -0500)]
Merge pull request #18772 from eileenmcnaughton/ids
dev/core#2066 Extract getSelectedIDs
Seamus Lee [Thu, 19 Nov 2020 20:55:17 +0000 (07:55 +1100)]
Merge pull request #18983 from eileenmcnaughton/trans
[REF] Remove always FALSE variable from transitionComponents
Tim Otten [Thu, 19 Nov 2020 09:35:46 +0000 (01:35 -0800)]
crm-ui-debug - If in debug mode, then load pretty-printer for JSON data
Christian Wach [Mon, 16 Nov 2020 19:20:49 +0000 (19:20 +0000)]
Prevent PayPal from double-encoding the IPN Notify URL
Seamus Lee [Thu, 19 Nov 2020 19:18:36 +0000 (06:18 +1100)]
Merge pull request #18986 from demeritcowboy/drupal-permissions-page
dev/drupal#146 - Wrong link for Drupal 8 permissions page / Make CMS permissions url lookup more OO-ey
Seamus Lee [Thu, 19 Nov 2020 19:17:51 +0000 (06:17 +1100)]
Merge pull request #18980 from christianwach/lab-core-1931
dev/core#1931 Prevent PayPal from double-encoding the IPN Notify URL
Coleman Watts [Thu, 19 Nov 2020 18:36:35 +0000 (13:36 -0500)]
Search ext: Fix duplicate group names on search admin page
Coleman Watts [Thu, 19 Nov 2020 18:25:26 +0000 (13:25 -0500)]
Search ext: Add List display
Breaks search displays into their own modules, one per display type.
This gives finer-grained dependency management per display type.
Coleman Watts [Thu, 19 Nov 2020 18:20:51 +0000 (13:20 -0500)]
Search ext: fix loss of configuration while changing search criteria
demeritcowboy [Tue, 17 Nov 2020 14:55:52 +0000 (09:55 -0500)]
oo-ify permissions page links
Eileen McNaughton [Thu, 19 Nov 2020 06:59:04 +0000 (19:59 +1300)]
Merge pull request #18993 from giant-rabbit/153-fix-paypal-redirect
dev/financial#153 Fix redirect to PayPal
Tim Otten [Thu, 19 Nov 2020 04:41:41 +0000 (20:41 -0800)]
Merge pull request #18988 from seamuslee001/dev_core_2197
dev/core#2197 Deploy monaco-editor using composer.json / composer dow…
Peter Haight [Thu, 19 Nov 2020 02:45:06 +0000 (18:45 -0800)]
Fix redirect to PayPal
If you put in double slashes in the path part of the PayPal URL and then
PayPal asks you to do their captcha, they have some sort of bug where
they do the wrong redirect after the captcha to https://cgi-bin/webscr.
Issue #153
Seamus Lee [Wed, 18 Nov 2020 08:53:49 +0000 (19:53 +1100)]
dev/core#2197 Deploy monaco-editor using composer.json / composer downloads method
Remove setup.sh as no longer needed and npm related package files
Eileen McNaughton [Wed, 18 Nov 2020 23:36:40 +0000 (12:36 +1300)]
Merge pull request #18991 from demeritcowboy/serialize-notice
dev/core#2196 - serialize E_NOTICE when saving custom field
Eileen McNaughton [Wed, 18 Nov 2020 22:33:58 +0000 (11:33 +1300)]
Merge pull request #18989 from totten/master-afform-label
afform - Get default field `<label>` from `label` instead of `title`
Seamus Lee [Wed, 18 Nov 2020 21:02:59 +0000 (08:02 +1100)]
Merge pull request #18981 from mattwire/extensionsuitweak
Extensionsuitweak
Tim Otten [Wed, 18 Nov 2020 01:29:56 +0000 (17:29 -0800)]
afform - Get default field `<label>` from `label` instead of `title`
Tim Otten [Wed, 18 Nov 2020 01:29:36 +0000 (17:29 -0800)]
gitignore - Whitelist ext/afform
demeritcowboy [Wed, 18 Nov 2020 00:50:23 +0000 (19:50 -0500)]
fix serialize E_NOTICE
colemanw [Wed, 18 Nov 2020 13:25:51 +0000 (08:25 -0500)]
Merge pull request #18990 from totten/master-afform-gui-url
afform/gui - Fix rendering of the "Form Settings"
Tim Otten [Wed, 18 Nov 2020 10:18:34 +0000 (02:18 -0800)]
afform/gui - Fix rendering of the "Form Settings"
The `<textarea/>` tag is misinterpreted, causing the subsequent fields to disappear.
Coleman Watts [Wed, 18 Nov 2020 01:39:05 +0000 (20:39 -0500)]
Allow Angular modules to require Resource bundles
Eileen McNaughton [Tue, 17 Nov 2020 20:47:27 +0000 (09:47 +1300)]
Merge pull request #18985 from demeritcowboy/create-table-logging
dev/core#2190 - Remove unused lines, replace CRM_Utils_Array::value
demeritcowboy [Mon, 16 Nov 2020 22:36:15 +0000 (17:36 -0500)]
don't assume tablespec exists
eileen [Tue, 17 Nov 2020 01:38:12 +0000 (14:38 +1300)]
[REF] Remove always FALSE variable from transitionComponents
This is not ever passed in now we have removed the call from membership form
I've kept this PR restricted to changes in transitionComponents
since that means the main reviewer task is to confirm the
paramter is never passed in & hence is false, but
quite a lot of other stuff can be ripped out as follow ups
Seamus Lee [Tue, 17 Nov 2020 00:39:08 +0000 (11:39 +1100)]
Merge pull request #18979 from eileenmcnaughton/trans
Remove return value on transitionComponents
Matthew Wire [Mon, 16 Nov 2020 21:11:41 +0000 (21:11 +0000)]
Tweak information displayed by extensions list so it's aimed more at the end-user rather than the developer
colemanw [Mon, 16 Nov 2020 20:27:26 +0000 (15:27 -0500)]
Merge pull request #18971 from colemanw/angularDashboard
Rewrite jquery.dashboard.js as Angular app
Christian Wach [Mon, 16 Nov 2020 19:20:49 +0000 (19:20 +0000)]
Prevent PayPal from double-encoding the IPN Notify URL
Coleman Watts [Fri, 13 Nov 2020 18:23:41 +0000 (13:23 -0500)]
Rewrite jquery.dashboard.js as Angular app
New home dashboard written with Angular + APIv4.
Functionality is mostly unchanged.
The motivation for this is to support afforms embedded within dashboard dashlets.
Eileen McNaughton [Mon, 16 Nov 2020 11:41:48 +0000 (00:41 +1300)]
Merge pull request #18950 from MegaphoneJon/event-44
event#44: Don't allow self-service cancelling after an event when 'hours to cancel' is zero
eileen [Mon, 16 Nov 2020 08:02:21 +0000 (21:02 +1300)]
Remove return value on transitionComponents
We no longer use the result from this function so this removes most of the code that calculates the updateResult value.
There are still instances coming back from the cancel & fail functions that I will remove as a follow up
Seamus Lee [Mon, 16 Nov 2020 06:06:52 +0000 (17:06 +1100)]
Merge pull request #18964 from eileenmcnaughton/trans
dev/core#2155 Remove obscure broken handling for onlinePendingContribution
Eileen McNaughton [Mon, 16 Nov 2020 06:01:11 +0000 (19:01 +1300)]
Merge pull request #18960 from seamuslee001/utf8mb4_install
dev/core#339 Install CiviCRM tables using utf8mb4
Jude Hungerford [Mon, 16 Nov 2020 05:11:46 +0000 (16:11 +1100)]
update CRM_Report_Form->addCustomDataToColumns so it can correctly handle multi-selects
Eileen McNaughton [Mon, 16 Nov 2020 03:20:16 +0000 (16:20 +1300)]
Merge pull request #18977 from civicrm/5.32
5.32 to master
Eileen McNaughton [Mon, 16 Nov 2020 03:16:51 +0000 (16:16 +1300)]
Merge pull request #18976 from colemanw/searchParams
Search ext: use crmRouteBinder to expose params for new searches to url
Coleman Watts [Mon, 16 Nov 2020 00:00:58 +0000 (19:00 -0500)]
Search ext: use crmRouteBinder to expose params for new searches as url arguments
Seamus Lee [Sun, 15 Nov 2020 23:28:01 +0000 (10:28 +1100)]
Merge pull request #18975 from colemanw/fixAfformDep
Fix undeclared afform requirement of ngRoute