Monish Deb [Mon, 25 Nov 2019 07:03:57 +0000 (12:33 +0530)]
Merge pull request #15950 from eileenmcnaughton/export_ref
[REF] Further cleanup on address handling in merge code.
Monish Deb [Mon, 25 Nov 2019 05:16:20 +0000 (10:46 +0530)]
Merge pull request #15928 from seamuslee001/case_advanced_search
Enable Case search metadata on Advanced Search Form
Eileen McNaughton [Mon, 25 Nov 2019 03:39:16 +0000 (16:39 +1300)]
Merge pull request #15941 from seamuslee001/dev_core_560_sms
dev/core#560 Replace instances of CRM_Core_Error::fatal with Exceptio…
Seamus Lee [Fri, 22 Nov 2019 08:54:02 +0000 (19:54 +1100)]
Enable Case search metadata on Advanced Search Form
eileen [Mon, 25 Nov 2019 01:47:21 +0000 (14:47 +1300)]
[REF] Further cleanup on address handling in merge code.
This is a follow on from https://github.com/civicrm/civicrm-core/pull/15949
This doesn't make any change - it just improves legibility
Seamus Lee [Sat, 23 Nov 2019 21:52:04 +0000 (08:52 +1100)]
dev/core#560 Replace instances of CRM_Core_Error::fatal with Exceptions or Status bounces in SMS processing and appropriately handle error after
Eileen McNaughton [Mon, 25 Nov 2019 01:39:23 +0000 (14:39 +1300)]
Merge pull request #15949 from eileenmcnaughton/export_ref
[REF] Minor code cleanup on the setting of contact greetings.
Eileen McNaughton [Mon, 25 Nov 2019 00:55:34 +0000 (13:55 +1300)]
Merge pull request #15944 from magnolia61/Sort_CMS_tables_alphabetically
Sort CMS Database Table list
Eileen McNaughton [Mon, 25 Nov 2019 00:15:50 +0000 (13:15 +1300)]
Merge pull request #15943 from seamuslee001/sort_arrow_activity_search
[UI] Ensure that when sorting on columns in the find activity search …
eileen [Sun, 24 Nov 2019 23:49:04 +0000 (12:49 +1300)]
[REF] Minor code cleanup on the setting of contact greetings.
I'm trying to review https://github.com/civicrm/civicrm-core/pull/15725 but through no fault of that PR it hits
on one of the parts of the Export code that I still find unreadable :-( This is a further readability fix & it
starts to point me to how to get past the underlying WTF about this code.
Note that I removed the IF around sharedAddress. From Monish's PR I found out that we have a
fairly long-standing regression where the sharedAddress code doesn't actually work :-( so
I'm comfortable this won't break anything :-). We also have good test cover on this chunk from
probably around when the shared address part got broken....
Looking in the UI there is no implication that the greeting for a shared address would display differently -
which is the only explanation I can think of for different handling here. Of course until we
remove the later IF the shared address would do things differently - erm if it worked.
ALl of which is a long way of saying the removal of the IF won't change anything
magnolia61 [Sun, 24 Nov 2019 08:04:19 +0000 (09:04 +0100)]
Sort CMS Database Table list
Seamus Lee [Sun, 24 Nov 2019 03:26:35 +0000 (14:26 +1100)]
[UI] Ensure that when sorting on columns in the find activity search the arrow shows which field is being sorted and direction
Seamus Lee [Sat, 23 Nov 2019 23:37:33 +0000 (10:37 +1100)]
Merge pull request #15930 from seamuslee001/standardise_pledge_search
[REF] Standardise form handling in the Find Pledges search form
Eileen McNaughton [Sat, 23 Nov 2019 03:27:54 +0000 (16:27 +1300)]
Merge pull request #15936 from seamuslee001/advanced_search_metadata
Include Metadata on advanced search form for membership, grant, pledg…
Seamus Lee [Sat, 23 Nov 2019 02:36:38 +0000 (13:36 +1100)]
Merge pull request #15938 from civicrm/5.20
5.20
Seamus Lee [Sat, 23 Nov 2019 00:37:18 +0000 (11:37 +1100)]
Merge pull request #15935 from seamuslee001/case_id_search_field
Reinstate Case ID search field
Seamus Lee [Fri, 22 Nov 2019 21:53:57 +0000 (08:53 +1100)]
Reinstate Case ID search field
Seamus Lee [Fri, 22 Nov 2019 22:30:48 +0000 (09:30 +1100)]
Merge pull request #15934 from eileenmcnaughton/part_sane
[REF] return determination of whether to show expired fields to the calling function
Seamus Lee [Fri, 22 Nov 2019 20:41:35 +0000 (07:41 +1100)]
Include Metadata on advanced search form for membership, grant, pledge, fields
Seamus Lee [Fri, 22 Nov 2019 22:04:36 +0000 (09:04 +1100)]
Merge pull request #15933 from civicrm/5.20
5.20
eileen [Fri, 22 Nov 2019 21:01:24 +0000 (10:01 +1300)]
[REF] return determination of whether to show expired fields to the calling function
As part of my efforts to ensure we are consistency creating valid transactions I'm trying to sort out the way we calculate
amounts to be re-usable from tests but I feel stymied at every turn by spaghetti code.
This unravels a small piece
Seamus Lee [Fri, 22 Nov 2019 20:40:30 +0000 (07:40 +1100)]
Merge pull request #15929 from christianwach/lab-1412
Reinstate traversal as "method of last resort" to find WordPress
Seamus Lee [Fri, 22 Nov 2019 20:35:24 +0000 (07:35 +1100)]
[REF] Standardise form handling in the Find Pledges search form
Christian Wach [Fri, 22 Nov 2019 18:05:49 +0000 (18:05 +0000)]
Reinstate traversal as "method of last resort" to find WordPress
colemanw [Fri, 22 Nov 2019 16:19:22 +0000 (11:19 -0500)]
Merge pull request #15847 from artfulrobot/opaque-menu
Remove background opacity in menus; improving accessibility/readability
Stephen Palmstrom [Fri, 22 Nov 2019 15:42:10 +0000 (15:42 +0000)]
dev/core#1384 Joomla: fix JPATH_BASE when using a virtual directory on Windows (#15915)
Mathieu Lu [Fri, 22 Nov 2019 15:10:55 +0000 (10:10 -0500)]
Merge pull request #15907 from eileenmcnaughton/ex
[NFC] [Test] Minor test cleanup on CiviMailUtils
Seamus Lee [Fri, 22 Nov 2019 02:42:24 +0000 (13:42 +1100)]
Merge pull request #15924 from seamuslee001/dev_core_1414
dev/core#1414 Fix E-notices on the lack of an html key in the psudo m…
Eileen McNaughton [Fri, 22 Nov 2019 02:27:15 +0000 (15:27 +1300)]
Merge pull request #15921 from civicrm/5.20
5.20
Eileen McNaughton [Fri, 22 Nov 2019 02:26:30 +0000 (15:26 +1300)]
Merge pull request #15816 from MiyaNoctem/dev-core-1383-fix-reinstallation-of-extensions-with-logging
dev/core#1383: Fix Re-Installation of Extensions With Logging Enabled
Seamus Lee [Fri, 22 Nov 2019 01:44:29 +0000 (12:44 +1100)]
Merge pull request #15920 from seamuslee001/dev_core_1410
dev/core#1410 Fix E-notice when doin a force case search with a prede…
Seamus Lee [Fri, 22 Nov 2019 01:02:54 +0000 (12:02 +1100)]
dev/core#1414 Fix E-notices on the lack of an html key in the psudo metadata for these psudofields
Seamus Lee [Thu, 21 Nov 2019 20:40:39 +0000 (07:40 +1100)]
dev/core#1410 Fix E-notice when doin a force case search with a predefined case subject field
Seamus Lee [Thu, 21 Nov 2019 23:31:40 +0000 (10:31 +1100)]
Merge pull request #15919 from kcristiano/5.20-1412
dev/core/1412 CiviMail sent via wp-cli and cron mangles mailing urls…
Seamus Lee [Thu, 21 Nov 2019 23:31:18 +0000 (10:31 +1100)]
Merge pull request #15922 from totten/5.20-e2e-cli
(dev/core#1412) E2E - Add test case for path+URL construction in CLI
Tim Otten [Thu, 21 Nov 2019 21:58:38 +0000 (13:58 -0800)]
(dev/core#1412) E2E - Add test case for path+URL construction in CLI
Overview
--------
In dev/core#1412, the regression involved CLI processes producing incorrect URLs.
This adds some test-coverage.
Before
------
No test coverage for URLs in CLI environment.
After
-----
There is some test-coverage. It's able to reveal the existence of the bug from 1412.
Comments
--------
A lot of path/URL construction is dependent on the environment/site-build.
The test does not, on its own, guarantee that all environments work.
Rather, it adds a new slice of cheese to the stack.
This slice is moderately generic - in that I've successfully tested it
localy on `drupal-demo` and `wp-demo` builds. In theory, it should work on
other build types (as long as they set variables `CIVI_CORE`, `CMS_ROOT`,
`CMS_URL`).
Seamus Lee [Thu, 21 Nov 2019 21:58:21 +0000 (08:58 +1100)]
Merge pull request #15918 from MegaphoneJon/core-1411-rc
core#1411: Advanced Search crashes when some form values start with 1
Seamus Lee [Thu, 21 Nov 2019 20:23:09 +0000 (07:23 +1100)]
Merge pull request #15905 from eileenmcnaughton/test_good
Fix CRM_Contribute_BAO_ContributionTest to no longer use unreliable legacy set up method
Kevin Cristiano [Thu, 21 Nov 2019 20:12:01 +0000 (15:12 -0500)]
dev/core/1412 CiviMail sent via wp-cli and cron mangles mailing urls on WP
Jon Goldberg [Thu, 21 Nov 2019 18:32:56 +0000 (13:32 -0500)]
core#1411: Advanced Search crashes when some form values start with 1
Eileen McNaughton [Thu, 21 Nov 2019 19:08:59 +0000 (08:08 +1300)]
Merge pull request #15916 from civicrm/5.20
5.20 to master
Eileen McNaughton [Thu, 21 Nov 2019 19:08:32 +0000 (08:08 +1300)]
Merge pull request #15899 from greenpeace-cee/fix-ambiguous-order-column
Fix ambiguous column in search with ORDER BY
Yashodha Chaku [Thu, 21 Nov 2019 13:19:26 +0000 (18:49 +0530)]
Merge pull request #15906 from eileenmcnaughton/odd
[Test] Remove hard coded it reference
Camilo Rodriguez [Mon, 11 Nov 2019 16:00:30 +0000 (16:00 +0000)]
dev/core#1383: Fix Re-Installation of Extensions With Logging Enabled
When uninstalling an extension, logging tables associated to custom groups and
fields will not be deleted. On re-installation, addition of custom fields will
cause DB errors to be thrown, as columns existing on logging tables are tried
to be created again (they already exist on logging tables).
Fixed by checking if the column exists on log table before trying to create
it, treating it as a modification of the schema if it exists.
Patrick Figel [Wed, 20 Nov 2019 23:47:18 +0000 (00:47 +0100)]
Fix ambiguous column in search with ORDER BY
This fixes an issue where columns whose names are not unique in a
search query cause a DB error when they're used as a sort column.
The issue can be observed in the contribution search when sorting
by contribution status.
The issue is resolved by using the where field of the column spec,
which holds the fully-qualified name of the column.
eileen [Thu, 21 Nov 2019 09:09:54 +0000 (22:09 +1300)]
Minor test cleanup on CiviMailUtils
eileen [Thu, 21 Nov 2019 08:58:50 +0000 (21:58 +1300)]
[Test] Remove hard coded it reference
Honestly - why isn't this failing already? We only need the contributionID so this works
Eileen McNaughton [Thu, 21 Nov 2019 08:52:58 +0000 (21:52 +1300)]
Merge pull request #15904 from eileenmcnaughton/greeting
Move greeting handling up as it is not paymentValidation dependent
eileen [Thu, 21 Nov 2019 08:39:50 +0000 (21:39 +1300)]
Fix CRM_Contribute_BAO_ContributionTest to no longer use unreliable legacy set up method
The whole partial_amount_to_pay params thing works badly & was actually the cause of other fixes stalling for 6 months.
This is part of an effort to deprecate & eliminate it
eileen [Mon, 29 Jul 2019 03:31:20 +0000 (15:31 +1200)]
Move greeting handling up as it is not paymentValidation dependent
Seamus Lee [Thu, 21 Nov 2019 07:36:07 +0000 (18:36 +1100)]
Merge pull request #15819 from seamuslee001/dev_core_183_price_set
dev/core#183 Event Price Set Custom Search to using CRM_Utils_SQL_Tem…
Seamus Lee [Thu, 21 Nov 2019 07:18:09 +0000 (18:18 +1100)]
Merge pull request #15793 from seamuslee001/depreacete_dao_temp_table_name
dev/core#183 Remove references to and noisly deprecated CRM_Core_DAO::createTempTableName
Eileen McNaughton [Thu, 21 Nov 2019 07:14:57 +0000 (20:14 +1300)]
Merge pull request #15792 from seamuslee001/convert_temp_table_creation_campaign_upgrade
dev/core#183 Use Standard CRM_Utils_SQL_TempTable builder to create temporary tabl…
Eileen McNaughton [Thu, 21 Nov 2019 07:04:58 +0000 (20:04 +1300)]
Merge pull request #15876 from seamuslee001/dev_core_183_random_segement
dev/core#183 Convert the generating of temporary tables within the ra…
Seamus Lee [Thu, 21 Nov 2019 06:29:41 +0000 (17:29 +1100)]
Add in unit test of Campaign BAO query voter clause
Seamus Lee [Thu, 21 Nov 2019 06:04:31 +0000 (17:04 +1100)]
Add in unit test of the priceset custom search
Seamus Lee [Mon, 11 Nov 2019 20:42:20 +0000 (07:42 +1100)]
dev/core#183 Event Price Set Custom Search to using CRM_Utils_SQL_TempTable interface
Seamus Lee [Sat, 9 Nov 2019 23:36:00 +0000 (10:36 +1100)]
Remove references to and noisly deprecated CRM_Core_DAO::createTempTableName
Update unit test to match new temp table format
Seamus Lee [Sat, 9 Nov 2019 22:23:20 +0000 (09:23 +1100)]
Use Standard CRM_Utils_SQL_TempTable builder to create temporary table in Campaign and upgrade
Seamus Lee [Thu, 21 Nov 2019 05:30:44 +0000 (16:30 +1100)]
Merge pull request #15785 from eileenmcnaughton/contribution_url_params
Contribution url params - add contribution_page_id as a supported url parameter
Seamus Lee [Thu, 21 Nov 2019 05:07:15 +0000 (16:07 +1100)]
Merge pull request #15902 from eileenmcnaughton/transaction_sillyness
[REF] remove another unnecessary pass-by-reference
Eileen McNaughton [Thu, 21 Nov 2019 04:07:22 +0000 (17:07 +1300)]
Merge pull request #15903 from eileenmcnaughton/except
Convert a few fatals to exceptions.
eileen [Thu, 21 Nov 2019 01:49:54 +0000 (14:49 +1300)]
[REF] remove another unnecessary pass-by-reference
the recur function is only called once. Immediately after it is called there is a return &
the calling function has not passed in any variables by reference - ergo we gain nothing but confusion by using pass-by-ref
here
Seamus Lee [Thu, 21 Nov 2019 01:22:13 +0000 (12:22 +1100)]
Merge in 5.20
Eileen McNaughton [Thu, 21 Nov 2019 01:17:02 +0000 (14:17 +1300)]
Merge pull request #15841 from mattwire/participant_cleanup_removeparticipantfrominput
Remove unused variables in completeOrder()
totten [Wed, 20 Nov 2019 21:53:44 +0000 (21:53 +0000)]
Merge branch '5.20-security_release_release_notes' into '5.20-security'
Release notes for 5.19.2 Release
See merge request security/core!90
totten [Wed, 20 Nov 2019 20:09:10 +0000 (20:09 +0000)]
Update 5.19.2.md
totten [Wed, 20 Nov 2019 19:59:12 +0000 (19:59 +0000)]
Update 5.19.2.md
Seamus Lee [Wed, 20 Nov 2019 19:23:24 +0000 (06:23 +1100)]
Update release notes for Public MRs being merged into 5.19
totten [Wed, 20 Nov 2019 08:14:02 +0000 (08:14 +0000)]
Update 5.19.2.md
totten [Wed, 20 Nov 2019 08:05:07 +0000 (08:05 +0000)]
Update 5.19.2.md
totten [Wed, 20 Nov 2019 07:35:07 +0000 (07:35 +0000)]
Update 5.19.2.md
Seamus Lee [Tue, 19 Nov 2019 22:18:42 +0000 (09:18 +1100)]
Minor update to release notes
Seamus Lee [Mon, 18 Nov 2019 05:38:23 +0000 (16:38 +1100)]
Update release notes as per Tim's copy editing of the SA
Seamus Lee [Mon, 18 Nov 2019 05:34:14 +0000 (16:34 +1100)]
Release notes for 5.19.2 Release
Seamus Lee [Wed, 20 Nov 2019 02:13:35 +0000 (13:13 +1100)]
Update to latest versions of polyfill-ctype and polyfill-iconv
Seamus Lee [Wed, 20 Nov 2019 02:03:22 +0000 (13:03 +1100)]
securiry/core#70 Upgrade Symfony version to 2.8.50
Tim Otten [Wed, 20 Nov 2019 03:50:11 +0000 (19:50 -0800)]
ContactApiKeyTest - Add additional test-case
This case was failing before but now passes with the update
Seamus Lee [Wed, 20 Nov 2019 03:14:16 +0000 (14:14 +1100)]
Ensure that APIv4 Properly filters out permissable fields when no permission to view field exists
Jenkins [Sat, 9 Nov 2019 07:16:07 +0000 (07:16 +0000)]
Update unit test to match the output of the CRM_Utils_String function
Tim Otten [Tue, 29 Oct 2019 01:55:18 +0000 (18:55 -0700)]
SavedSearch API - Only accept safe inputs
Tim Otten [Tue, 29 Oct 2019 01:53:03 +0000 (18:53 -0700)]
CRM_Utils_String::unserialize() - Add wrapper for parsing safe exprs (int/string/array/etc)
Seamus Lee [Sun, 3 Nov 2019 06:20:31 +0000 (17:20 +1100)]
[NFC] Update Doc block as per Patrick
Seamus Lee [Tue, 29 Oct 2019 22:34:55 +0000 (09:34 +1100)]
Revert changes in CRM/Core/BAO{Cache|ConfigSetting}.php CRM/Extension/ClassLoader.php CRM/Queue and CRM/Utils/Cache
Seamus Lee [Tue, 29 Oct 2019 04:26:57 +0000 (15:26 +1100)]
Return FALSE instead of throwing Exception if package throws Exception
Seamus Lee [Tue, 29 Oct 2019 04:21:06 +0000 (15:21 +1100)]
Implement xKerman/restricted-unserialize package to guard against unsafe unserialize
Tim Otten [Thu, 31 Oct 2019 06:00:21 +0000 (23:00 -0700)]
ContactInterchangeTest - Add coverage for APIv4 joins/chains
Tim Otten [Fri, 25 Oct 2019 03:59:08 +0000 (20:59 -0700)]
(security/core#67) Port APIv3's escaping scheme to APIv4
Tim Otten [Fri, 25 Oct 2019 03:57:34 +0000 (20:57 -0700)]
HTMLInputCoder - Add more variants for encoding arrays
Seamus Lee [Wed, 9 Oct 2019 09:24:42 +0000 (20:24 +1100)]
Fix unit test for APIv4 format
Coleman Watts [Mon, 1 Jul 2019 00:47:47 +0000 (20:47 -0400)]
Fix api_key handling from joins
Patrick Figel [Wed, 9 Oct 2019 10:45:33 +0000 (12:45 +0200)]
security/core#65 - Fix XSS in Dashboard Report Title
This fixes an XSS in report titles displayed on the dashboard page
by escaping the title on output.
Seamus Lee [Thu, 8 Aug 2019 21:38:06 +0000 (07:38 +1000)]
security/core#65 Fix Display of Report title that contains XSS in it when shown on dashboard
Patrick Figel [Fri, 5 Jul 2019 18:49:44 +0000 (20:49 +0200)]
security/core#59 - Fix SQL injection in civicrm/ajax/dedupefind
This fixes an SQL injection in civicrm/ajax/dedupefind by validating
the order direction parameter.
Fixes #59
Seamus Lee [Wed, 20 Nov 2019 21:22:34 +0000 (08:22 +1100)]
Merge pull request #15890 from civicrm/5.20
5.20
Seamus Lee [Wed, 20 Nov 2019 19:44:27 +0000 (06:44 +1100)]
Merge pull request #15892 from totten/master-extgettest
(NFC) api_v3_ExtensionTest - Fix when executing on build with 25+ extensions
Seamus Lee [Wed, 20 Nov 2019 19:44:00 +0000 (06:44 +1100)]
Merge pull request #15889 from eileenmcnaughton/refund
dev/core#1409 Remove net_amount from Addtional Payment form
eileen [Wed, 20 Nov 2019 04:54:22 +0000 (17:54 +1300)]
dev/core#1409 Remove net_amount from Addtional Payment form
This is causing a validation problem. We used to have an issue on the contribution form which we eventually
resolved by removing net_amount as it's best calculated anyway
In order to make this changed I had to ensure Payment.create adds the net_amount & had
to do a couple of tweaks for the test to pass
Tim Otten [Wed, 20 Nov 2019 17:56:38 +0000 (09:56 -0800)]
(NFC) api_v3_ExtensionTest - Fix when executing on build with 25+ extensions
Overview
--------
This fixes a small issue with running the test locally.
Before
------
If the system has code for 25+ extensions (whether enabled or not), `api_v3_ExtensionTest` fails.
After
-----
The number of extensions doesn't matter.
Yashodha Chaku [Wed, 20 Nov 2019 12:17:39 +0000 (17:47 +0530)]
Merge pull request #15326 from totten/master-headfoot-2
CiviMail - Only display "Headers and Footers" if there are headers and footers