eileen [Sun, 22 Nov 2020 00:57:43 +0000 (13:57 +1300)]
Add test demonstrating that an extraneous activity is being created
This test checks that 1 & only 1 activity is created when a membership is cancelled because the related contribution is cancelled.
It is currently failing as there is an extra 'status changed from cancelled to cancelled' activity created.
The fix is simple but not included as https://github.com/civicrm/civicrm-core/pull/18997 needs to be merged first
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 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
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
Seamus Lee [Sun, 15 Nov 2020 23:21:42 +0000 (10:21 +1100)]
Merge pull request #18974 from civicrm/5.32
5.32
Coleman Watts [Sun, 15 Nov 2020 19:59:29 +0000 (14:59 -0500)]
Fix undeclared afform requirement of ngRoute
Seamus Lee [Sun, 15 Nov 2020 19:25:59 +0000 (06:25 +1100)]
Merge pull request #18967 from seamuslee001/dev_core_2178
dev/core#2178 Fix regression on adding contacts to a newly created group
colemanw [Sun, 15 Nov 2020 17:59:22 +0000 (12:59 -0500)]
Merge pull request #18970 from MegaphoneJon/core-2188
fix default 'is searchable' to prevent breaking advanced search
Seamus Lee [Thu, 12 Nov 2020 01:00:13 +0000 (12:00 +1100)]
dev/core#339 Install CiviCRM tables using utf8mb4
Update sample custom value tables as appropriate as well
Fix conflict between test setting ROW_FORMAT being compressed and the ROW_FORMAT of the original table being DYNAMIC
Jon Goldberg [Fri, 13 Nov 2020 22:19:08 +0000 (17:19 -0500)]
fix default 'is searchable' to prevent breaking advanced search
Seamus Lee [Fri, 13 Nov 2020 04:48:12 +0000 (15:48 +1100)]
Merge pull request #18748 from eileenmcnaughton/log
dev/core#2120 Do not attempt to obsolete primary key on log tables
Seamus Lee [Fri, 13 Nov 2020 04:03:12 +0000 (15:03 +1100)]
dev/core#2178 Fix regression on adding contacts to a newly created group
Eileen McNaughton [Fri, 13 Nov 2020 03:18:41 +0000 (16:18 +1300)]
Merge pull request #18965 from MegaphoneJon/mailing-80
Don't break clickthrough URLs when there's leading whitespace
Seamus Lee [Fri, 13 Nov 2020 00:46:40 +0000 (11:46 +1100)]
Merge pull request #18966 from demeritcowboy/nl-nl-default
[NFC] Follow-on to 18963 to add example setting in civicrm.settings template for setting CMS inheritance for nl_BE
Seamus Lee [Fri, 13 Nov 2020 00:26:01 +0000 (11:26 +1100)]
Merge pull request #18962 from colemanw/dashboardPerms
API - Finer-grained permisions for the dashboard & dashlet entities
demeritcowboy [Thu, 12 Nov 2020 23:22:20 +0000 (18:22 -0500)]
example setting
Eileen McNaughton [Thu, 12 Nov 2020 22:31:47 +0000 (11:31 +1300)]
Merge pull request #18963 from samuelsov/nli18n
Add a way to choose between nl_NL and nl_BE
Coleman Watts [Thu, 12 Nov 2020 15:23:53 +0000 (10:23 -0500)]
API - Finer-grained permisions for the dashboard & dashlet entities
This allows contacts without "administer CiviCRM" permission to access these api entities.
Permissions are restricted to contacts they have access to, and write permissions are
limited to a contact only editing their own dashboard.
Jon Goldberg [Thu, 12 Nov 2020 21:56:44 +0000 (16:56 -0500)]
Don't break clickthrough URLs when there's leading whitespace
eileen [Thu, 12 Nov 2020 20:50:20 +0000 (09:50 +1300)]
dev/core#2155 Remove obscure broken handling for onlinePendingContribution
Per https://lab.civicrm.org/dev/core/-/issues/2155 there is some obscure functionality for
completing a pending contribution under some cases. My testing suggests it is long-term broken.
See GL for more
Samuel Vanhove [Thu, 12 Nov 2020 16:39:47 +0000 (11:39 -0500)]
Add a way to choose between nl_NL and nl_BE
Matthew Wire [Thu, 12 Nov 2020 12:01:14 +0000 (12:01 +0000)]
Merge pull request #18961 from eileenmcnaughton/msg
dev/core#2158 Remove detail about updating related components when editing a contribution status
eileen [Thu, 12 Nov 2020 02:49:31 +0000 (15:49 +1300)]
dev/core#2158 Remove detail about updating related components when editing a contribution status
Note that with this merged it's also possible to remove a lot of code from transitionComponents
Eileen McNaughton [Thu, 12 Nov 2020 00:11:01 +0000 (13:11 +1300)]
Merge pull request #18952 from eileenmcnaughton/aip
Standardise more params in completeOrder
Seamus Lee [Wed, 11 Nov 2020 23:15:01 +0000 (10:15 +1100)]
Merge pull request #18912 from yashodha/dev_2153
(dev/core#2153) BUG: when changing a custom group option value CiviCR…
eileen [Tue, 10 Nov 2020 03:06:04 +0000 (16:06 +1300)]
Standardise more params in completeOrder
This moves the loading of the following params from the first contribution from Authorize.net to
completeOrder
- amount_level
- address_id
In addition campaign_id is moved, however, this is only in it is not an
input param or derived from the recur record
Eileen McNaughton [Wed, 11 Nov 2020 22:25:12 +0000 (11:25 +1300)]
Merge pull request #18956 from civicrm/5.32
5.32
Seamus Lee [Wed, 11 Nov 2020 20:02:48 +0000 (07:02 +1100)]
Merge pull request #18958 from alifrumin/5.32rn
[NFC ] 5.32 Release Notes - first pass
Alice Frumin [Mon, 9 Nov 2020 20:34:58 +0000 (14:34 -0600)]
5.32 release notes
Seamus Lee [Wed, 11 Nov 2020 03:57:09 +0000 (14:57 +1100)]
Merge pull request #18955 from totten/5.32-oauth-return
dev/core#2141 - Tighten up new page `civicrm/oauth-client/return`
Tim Otten [Tue, 10 Nov 2020 22:25:21 +0000 (14:25 -0800)]
dev/core#2141 - Tighten up new page `civicrm/oauth-client/return`
Overview
--------
The route `civicrm/oauth-client/return` is added in 5.32 as the main "Redirect URL".
In normal usage, the page shouldn't be visible to a user (because the
developer should define some alternative UI) -- but one might see it (a)
during development, (b) if there's an error, or (c) if a clever user mucks
about.
Improvements:
* Error handling
* Present error messages more nicely
* Record errors in the log
* Report more info via hook_oauthReturnError
* Other UI
* Redact token details (dependent upon permission `manage OAuth client secrets`)
* Set a more sensibile page title
* Make output blobs conditional and collapsible
Seamus Lee [Tue, 10 Nov 2020 20:46:48 +0000 (07:46 +1100)]
Merge pull request #18948 from aydun/core#2172
core#2172 - Fix 'Find Respondents' in CiviCampaigns
Seamus Lee [Tue, 10 Nov 2020 10:13:35 +0000 (21:13 +1100)]
Merge pull request #18953 from civicrm/5.32
5.32
Seamus Lee [Tue, 10 Nov 2020 06:53:25 +0000 (17:53 +1100)]
Merge pull request #18951 from totten/5.32-ms-imap
dev/mail#79 - Fix MS Exchange/IMAP. Use OpenID Connect.
Tim Otten [Tue, 10 Nov 2020 00:47:50 +0000 (16:47 -0800)]
dev/mail#79 - Use OpenID Connect with MS Exchange
At time of writing, there appears to be a problem in Microsoft's services:
if you request both `User.Read` and `IMAP.AccessAsUser.All`, then the token
does not actually work for IMAP access.
However, it is does work to combine `openid` and `IMAP.AccessAsUser.All`.
This patch revises the MS Exchange definition to get resource-owner details
via OpenID Connect's `id_token`.
Tim Otten [Tue, 10 Nov 2020 00:43:39 +0000 (16:43 -0800)]
dev/mail#79 - Add option to get resource-owner via OpenID Connect
At time of writing, there appears to be a problem in Microsoft's services:
if you request both `User.Read` and `IMAP.AccessAsUser.All`, then the token
does not actually work for IMAP access.
However, it is does work to combine `openid` and `IMAP.AccessAsUser.All`.
This patch to CiviGenericProvider makes it easier to get resource-owner
details via OpenID Connect's `id_token`.
Seamus Lee [Tue, 10 Nov 2020 00:25:51 +0000 (11:25 +1100)]
Merge pull request #18949 from colemanw/legacyAutocomplete
APIv3 - Fix legacy handling for html_type Autocomplete-Select
Jon Goldberg [Mon, 9 Nov 2020 23:14:46 +0000 (18:14 -0500)]
event#44: Don't allow self-service cancelling after an event when 'hours to cancel' is zero
Coleman Watts [Mon, 9 Nov 2020 21:44:49 +0000 (16:44 -0500)]
Fix legacy handling for html_type Autocomplete-Select
Legacy handling was returning "Autocomplete-Multi-Select" which was never a real html_type.