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: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
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
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 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
Seamus Lee [Wed, 20 Nov 2019 08:17:57 +0000 (19:17 +1100)]
Merge pull request #15863 from seamuslee001/status_bounce_extension
[REF] Convert CRM_Core_Error::fatal to CRM_Core_Error::statusBounce i…
Seamus Lee [Wed, 20 Nov 2019 06:39:17 +0000 (17:39 +1100)]
Merge pull request #15888 from seamuslee001/lab_core_1406
dev/core#1406 Ensure that we use the CRM_Member_DAO_Membership as dao…
Seamus Lee [Fri, 15 Nov 2019 22:26:55 +0000 (09:26 +1100)]
[REF] Convert CRM_Core_Error::fatal to CRM_Core_Exception in Extension folder
Seamus Lee [Wed, 20 Nov 2019 04:42:52 +0000 (15:42 +1100)]
dev/core#1406 Ensure that we use the CRM_Member_DAO_Membership as dao for the civicrm_membership table
Eileen McNaughton [Wed, 20 Nov 2019 00:38:06 +0000 (13:38 +1300)]
Merge pull request #15821 from seamuslee001/dev_core_183_custom_group
dev/core#183 Convert Include group / exclude group and include tags /…
Seamus Lee [Wed, 20 Nov 2019 00:21:31 +0000 (11:21 +1100)]
Merge pull request #15886 from seamuslee001/nfc_composer_lock_update
[NFC] Update composer lockfile to remove warning
Eileen McNaughton [Wed, 20 Nov 2019 00:13:41 +0000 (13:13 +1300)]
Merge pull request #15864 from mfb/string-type-declaration
Add string type declarations to global API functions.
Seamus Lee [Sun, 17 Nov 2019 19:54:46 +0000 (06:54 +1100)]
dev/core#183 Convert the generating of temporary tables within the random segment custom search to using standard CRM_Utils_SQL_TemporaryTable method
Seamus Lee [Tue, 19 Nov 2019 21:16:18 +0000 (08:16 +1100)]
[NFC] Update composer lockfile to remove warning
mark burdett [Tue, 19 Nov 2019 04:13:03 +0000 (20:13 -0800)]
Various tests assume civicrm_api() $entity param is nullable.
mark burdett [Fri, 15 Nov 2019 22:37:45 +0000 (14:37 -0800)]
Add string type declarations to global API functions.
Matthew Wire (MJW Consulting) [Wed, 13 Nov 2019 05:57:07 +0000 (18:57 +1300)]
Remove unused variables in completeOrder()
Matthew Wire [Tue, 19 Nov 2019 02:24:27 +0000 (15:24 +1300)]
Merge pull request #15880 from mlutfy/fixUserDashboardEvent
Remove nbsp from UserDashboard Event section
Seamus Lee [Tue, 19 Nov 2019 01:42:33 +0000 (12:42 +1100)]
Merge pull request #15817 from colemanw/Fix
Fix api explorer formatting IS NULL clauses
Eileen McNaughton [Mon, 18 Nov 2019 21:52:07 +0000 (10:52 +1300)]
Merge pull request #15881 from civicrm/5.20
5.20
Seamus Lee [Mon, 18 Nov 2019 21:26:04 +0000 (08:26 +1100)]
Merge pull request #15879 from alifrumin/rn5.20
First pass at sorting and annotating 5.20 release notes
Mathieu Lutfy [Mon, 18 Nov 2019 20:59:06 +0000 (15:59 -0500)]
Remove nbsp from UserDashboard Event section
Eileen McNaughton [Mon, 18 Nov 2019 20:53:05 +0000 (09:53 +1300)]
Merge pull request #15878 from civicrm/5.20
5.20
Alice Frumin [Fri, 8 Nov 2019 21:28:06 +0000 (16:28 -0500)]
release notes 5.20 - first pass at editing, sorting and annotating
Eileen McNaughton [Mon, 18 Nov 2019 20:25:44 +0000 (09:25 +1300)]
Merge pull request #15846 from greenpeace-cee/fix-cancel-date
Fix contribution cancel_date not being loaded
Tim Otten [Wed, 18 Sep 2019 17:55:56 +0000 (13:55 -0400)]
crmMailingAB - Only display "Headers and Footers" if there are headers and footers
Tim Otten [Wed, 18 Sep 2019 17:55:24 +0000 (13:55 -0400)]
crmMailing - Only display "Headers and Footers" if there are headers and footers
Patrick Figel [Thu, 14 Nov 2019 13:19:04 +0000 (14:19 +0100)]
dev/core#1391 - Fix contribution cancel_date not being loaded
This fixes an issue where the contribution cancel_date is not loaded
in the contribution search, causing cancelled contributions not to be
greyed out and the cancel date not to be shown.
Matthew Wire [Mon, 18 Nov 2019 05:10:49 +0000 (18:10 +1300)]
Merge pull request #15800 from eileenmcnaughton/anet_valid
Remove unused parameter recur from CompleteOrder signature
Matthew Wire [Mon, 18 Nov 2019 05:09:41 +0000 (18:09 +1300)]
Merge pull request #15871 from eileenmcnaughton/init_fatal
[REF] Move CRM_Event_Form_EventFees::buildQuickForm to Participant_Form class
Matthew Wire [Mon, 18 Nov 2019 05:09:04 +0000 (18:09 +1300)]
Merge pull request #15866 from eileenmcnaughton/test_dumb
[NFC] [Test-only] Remove partially paid from statuses tested for RenewContribution
Matthew Wire [Mon, 18 Nov 2019 05:08:18 +0000 (18:08 +1300)]
Merge pull request #15870 from eileenmcnaughton/init_set
[REF] Minor simplifcation on initSet
Matthew Wire [Mon, 18 Nov 2019 05:07:05 +0000 (18:07 +1300)]
Merge pull request #15854 from eileenmcnaughton/test_fix
[NFC] Test fix - incorrect records created due to test set up using PartiallyPaid when no payment is made
Matthew Wire [Mon, 18 Nov 2019 05:04:11 +0000 (18:04 +1300)]
Merge pull request #15869 from eileenmcnaughton/add_pay
[REF] remove unused lines of code
eileen [Mon, 18 Nov 2019 00:11:18 +0000 (13:11 +1300)]
Convert a few fatals to exceptions.
This is a general thing we are doing. In this case they are all ones that really should
never be hit
Seamus Lee [Sun, 17 Nov 2019 23:28:40 +0000 (10:28 +1100)]
Merge pull request #15826 from seamuslee001/dev_core_183_dedupe
dev/core#183 CRM/Dedupe/BAO/QueryBuilder/IndividualUnsupervised.php report to using CRM_Utils…
Seamus Lee [Sun, 17 Nov 2019 21:38:00 +0000 (08:38 +1100)]
Merge pull request #15853 from demeritcowboy/civicasetestcase-duplicate-option-values
[TEST] dev/core#1394 - Avoid duplicate activity types in tests that use CiviCaseTestCase
Seamus Lee [Sun, 17 Nov 2019 21:35:14 +0000 (08:35 +1100)]
Merge pull request #15849 from seamuslee001/dev_core_183_dedupe_test
[NFC] Add in unit test of code being altered by #15826
Seamus Lee [Sun, 17 Nov 2019 21:34:48 +0000 (08:34 +1100)]
Merge pull request #15874 from seamuslee001/dev_core_183_env_check
dev/core#183 Use standard temporary table name format when creating t…
Seamus Lee [Thu, 14 Nov 2019 19:51:36 +0000 (06:51 +1100)]
Add in unit test of code being altered by #15826
Eileen McNaughton [Sun, 17 Nov 2019 20:23:57 +0000 (09:23 +1300)]
Merge pull request #15875 from civicrm/5.20
5.20
Seamus Lee [Sun, 17 Nov 2019 19:50:59 +0000 (06:50 +1100)]
Merge pull request #15872 from eileenmcnaughton/sybunt
Fix Sybunt to select mark rows as selected
Seamus Lee [Sun, 17 Nov 2019 19:45:43 +0000 (06:45 +1100)]
dev/core#183 Use standard temporary table name format when creating temporary utf8mb4 temporary table
Eileen McNaughton [Sun, 17 Nov 2019 19:29:04 +0000 (08:29 +1300)]
Merge pull request #15873 from eileenmcnaughton/cont_ag
dev/core#1377 Fix bug where search action doesn't work.
Seamus Lee [Sun, 17 Nov 2019 08:38:03 +0000 (19:38 +1100)]
Merge pull request #15865 from eileenmcnaughton/query
Fix incorrect reference on extracted function