Seamus Lee [Tue, 4 Aug 2020 22:34:17 +0000 (08:34 +1000)]
Merge pull request #18066 from seamuslee001/dev_drupal_131
dev/drupal#131 Ensure that the General class exists
Seamus Lee [Tue, 4 Aug 2020 20:48:47 +0000 (06:48 +1000)]
dev/drupal#131 Ensure that the General class exists
Seamus Lee [Tue, 4 Aug 2020 10:13:27 +0000 (20:13 +1000)]
Merge pull request #18061 from seamuslee001/5274_notes
[NFC] 5.27.4 Release Notes
Matthew Wire [Tue, 4 Aug 2020 10:05:44 +0000 (11:05 +0100)]
Merge pull request #18062 from eileenmcnaughton/error_juice
Improve error handling on IPN
eileen [Tue, 4 Aug 2020 07:44:33 +0000 (19:44 +1200)]
Improve error handling on IPN
https://civicrm.stackexchange.com/questions/37277/paypal-standard-payments-are-being-accepted-but-marked-as-incomplete-transaction/37279#37279
shows how unhelpful this error is - getting data from the exception should help.
Targetting 5.28 in case the gitlab relates to a regression & we need to solicit more debug info
Tim Otten [Tue, 4 Aug 2020 06:26:11 +0000 (23:26 -0700)]
release-notes.md - Small copy-edits
Tim Otten [Mon, 3 Aug 2020 10:04:07 +0000 (03:04 -0700)]
Add release-notes/5.27.4.md
Seamus Lee [Tue, 4 Aug 2020 04:11:44 +0000 (14:11 +1000)]
Merge pull request #18053 from seamuslee001/test_ports
[NFC] Port some recent test fixes from master to 5.28
Tim Otten [Tue, 14 Jul 2020 18:18:08 +0000 (11:18 -0700)]
(REF) WebsiteTest - Mitigate flaky failures
Overview
--------
In recent days, api_v3_WebsiteTest has emitted sporadic failures like this:
```
api_v3_WebsiteTest::testDeleteWebsite with data set #0 (3)
Failed asserting that 3 matches expected 0.
/home/jenkins/bknix-max/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/api/v3/WebsiteTest.php:75
/home/jenkins/bknix-max/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:209
/home/jenkins/bknix-max/extern/phpunit7/phpunit7.phar:615
```
and
```
api_v3_WebsiteTest::testDeleteWebsiteInvalid with data set #0 (3)
Failed asserting that 4 matches expected 1.
/home/jenkins/bknix-max/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/api/v3/WebsiteTest.php:88
/home/jenkins/bknix-max/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:209
/home/jenkins/bknix-max/extern/phpunit7/phpunit7.phar:615
```
These failures do not reproduce for me in isolation.
Before
------
Both the failing assertions make an implicit assumption that the baseline content of `civicrm_website` is empty.
After
-----
The failing assertions use an explicit baseline (`$beforeCount`).
Comments
--------
The test failures are sporadic and only seem to seem occur when run in the full suite.
My theory is that something else is leaking `civicrm_website` records;
however, it's hard to track that down amidst a full suite (when the full
suite takes so long to execute). Therefore, I cannot be certain that this
is actually fixes the problem. However, this really just tightens up the
assumptions of the test - as long as it passes the PR tests, it should be
safe to merge and then watch in the `CiviCRM-Core-Matrix`.
eileen [Sun, 2 Aug 2020 04:41:16 +0000 (16:41 +1200)]
Fix for failing test
BY ensuring join_date is in the past we get away from situations where there is no valid status
demeritcowboy [Fri, 31 Jul 2020 15:39:56 +0000 (11:39 -0400)]
re-re-fix test
eileen [Fri, 31 Jul 2020 04:27:55 +0000 (16:27 +1200)]
Re-fix test
The strtotime calculation adds 4 months before setting the day of month. However
July 31 + 4 months is 1 Dec - ie the month is 12 not 11 due to there being only 30 days. So to
get 27 Nov we need to get the July month (7) and add 4 and voila 11, not 12
demeritcowboy [Thu, 30 Jul 2020 03:28:56 +0000 (23:28 -0400)]
update failing test
demeritcowboy [Tue, 21 Jul 2020 03:14:46 +0000 (23:14 -0400)]
make test less time-sensitive
eileen [Thu, 16 Jul 2020 07:12:54 +0000 (19:12 +1200)]
api_v3_TaxContributionPageTest fix - remove hard coded processor id
Eileen McNaughton [Sat, 1 Aug 2020 03:47:11 +0000 (15:47 +1200)]
Merge pull request #18017 from seamuslee001/dev_mail_72
dev/mail#72 Remove call to custom fatal error handler from CRM_Core_E…
Seamus Lee [Fri, 31 Jul 2020 23:33:52 +0000 (09:33 +1000)]
dev/mail#72 Remove call to custom fatal error handler from CRM_Core_Error::debug_log_message
Tim Otten [Fri, 31 Jul 2020 21:55:23 +0000 (14:55 -0700)]
Merge pull request #18011 from totten/5.28-tbl
FiveTwentyEight - Provide concrete details about civicrm.files
Tim Otten [Fri, 31 Jul 2020 04:47:26 +0000 (21:47 -0700)]
FiveTwentyEight - Provide concrete details about civicrm.files
This hopefully makes it easier to decide what to do without needing a
scavenger hunt.
Seamus Lee [Thu, 30 Jul 2020 23:43:33 +0000 (09:43 +1000)]
Merge pull request #17983 from kcristiano/5.28-wp-notices
dev/wordpress/66 Add Upgrade Notice regarding legacy paths
Seamus Lee [Wed, 29 Jul 2020 21:26:58 +0000 (07:26 +1000)]
Merge pull request #17868 from seamuslee001/remove_civicrm_files_override
[REF] Remove civicrm.files override for WordPress to fix issues with…
Kevin Cristiano [Tue, 28 Jul 2020 21:00:47 +0000 (17:00 -0400)]
dev/wordpress/66 Add Upgrade Notice regarding legacy paths
Signed-off-by: Kevin Cristiano <kcristiano@kcristiano.com>
Eileen McNaughton [Mon, 27 Jul 2020 09:58:19 +0000 (21:58 +1200)]
Merge pull request #17973 from seamuslee001/ref_profile_date_fields
[REF] Fix regression where adding any date based field onto a profile…
Seamus Lee [Mon, 27 Jul 2020 03:39:06 +0000 (13:39 +1000)]
[REF] Fix regression where adding any date based field onto a profile triggers an error date preferences not configured when previewing the profile
Seamus Lee [Sun, 26 Jul 2020 21:18:38 +0000 (07:18 +1000)]
Merge pull request #17960 from demeritcowboy/contribution-default
dev/core#1911 - Default not being set for fixed contribution amounts or any price field that is not type text
demeritcowboy [Sun, 26 Jul 2020 14:12:15 +0000 (10:12 -0400)]
default not being set for price fields
Eileen McNaughton [Sat, 25 Jul 2020 00:40:20 +0000 (12:40 +1200)]
Merge pull request #17947 from agh1/dev-core-1899-5-28
dev/core#1899 specify display mode for action links with icons
Andrew Hunt [Fri, 24 Jul 2020 00:46:27 +0000 (20:46 -0400)]
dev/core#1899 specify display mode for action links with icons
Eileen McNaughton [Thu, 23 Jul 2020 22:42:12 +0000 (10:42 +1200)]
Merge pull request #17929 from demeritcowboy/required-not-5.28
dev/core#1903 - Avoid E_WARNING and remove code
demeritcowboy [Thu, 23 Jul 2020 20:26:11 +0000 (16:26 -0400)]
avoid E_WARNING and remove code
Seamus Lee [Thu, 23 Jul 2020 06:44:09 +0000 (16:44 +1000)]
Merge pull request #17925 from seamuslee001/5.28
Add release-notes/5.27.3
Tim Otten [Thu, 23 Jul 2020 04:53:40 +0000 (21:53 -0700)]
Add release-notes/5.27.3
Seamus Lee [Wed, 22 Jul 2020 00:13:27 +0000 (10:13 +1000)]
Merge pull request #17906 from seamuslee001/lab_core_1846
dev/core#1846 Make DAO upgrade safe
Coleman Watts [Fri, 3 Jul 2020 16:20:04 +0000 (12:20 -0400)]
Fix failing settingTest and mark setting.fill as deprecated
The settingTest class was being too aggressive about creating and deleting domains,
this teaches it to not delete pre-existing domains.
Also marks an old unused api function deprecated.
Coleman Watts [Wed, 1 Jul 2020 17:25:31 +0000 (13:25 -0400)]
Add upgrade-safe DAO::getSupportedFields method
Switches api v3 and v4 to use that method so they are upgrade-safe by default.
Seamus Lee [Sun, 19 Jul 2020 21:36:49 +0000 (07:36 +1000)]
Merge pull request #17890 from christianwach/lab-core-1889-3
Prevent session from starting during WordPress pseudo-cron procedures
Christian Wach [Sat, 18 Jul 2020 20:08:50 +0000 (21:08 +0100)]
Prevent session from starting during WordPress pseudo-cron procedures
Seamus Lee [Fri, 17 Jul 2020 21:55:29 +0000 (07:55 +1000)]
Merge pull request #17875 from colemanw/customFieldVersionCheck
Ensure serialize field exists before adding to query
Coleman Watts [Fri, 17 Jul 2020 16:16:35 +0000 (12:16 -0400)]
Ensure serialize field exists before adding to query
Seamus Lee [Thu, 16 Jul 2020 21:39:01 +0000 (07:39 +1000)]
[REF] Remmove civicrm.files override for WordPress to fix issues with users struggling to find extensions
Monish Deb [Thu, 16 Jul 2020 06:51:35 +0000 (12:21 +0530)]
Merge pull request #17836 from seamuslee001/dev_core_1874
dev/core#1874 Fix fatal error by passing through the string formatTyp…
Seamus Lee [Thu, 16 Jul 2020 03:40:10 +0000 (13:40 +1000)]
Merge pull request #17851 from alifrumin/5.28rn
[NFC] 5.28 Release Notes First Pass
Seamus Lee [Thu, 16 Jul 2020 03:39:54 +0000 (13:39 +1000)]
Merge pull request #17857 from demeritcowboy/membershiptest-5.28
[Test framework] - Backport of membership test fix
Seamus Lee [Thu, 16 Jul 2020 01:25:41 +0000 (11:25 +1000)]
Merge pull request #17854 from demeritcowboy/missing-codeversion-5.28
dev/core#1882 - Missing version number in status check message about db version vs code version
demeritcowboy [Thu, 16 Jul 2020 01:21:52 +0000 (21:21 -0400)]
backport of membership test fix
Seamus Lee [Thu, 16 Jul 2020 00:42:15 +0000 (10:42 +1000)]
Merge pull request #17853 from seamuslee001/dev_wordpress_62
dev/wordpress#62 Update adrienrn/php-mimetyper gitignore file to ensu…
demeritcowboy [Wed, 15 Jul 2020 23:52:24 +0000 (19:52 -0400)]
missing version number in message
Alice Frumin [Tue, 14 Jul 2020 21:15:53 +0000 (17:15 -0400)]
5.28 release notes: first pass
Seamus Lee [Wed, 15 Jul 2020 21:44:41 +0000 (07:44 +1000)]
dev/wordpress#62 Update adrienrn/php-mimetyper gitignore file to ensure that sites that manage their systems using git can access the db.json file
Seamus Lee [Wed, 15 Jul 2020 00:41:00 +0000 (10:41 +1000)]
Merge pull request #17840 from seamuslee001/5272_rns
5.27.1 and 5.27.2 Release Notes
Tim Otten [Fri, 10 Jul 2020 05:55:29 +0000 (22:55 -0700)]
Add release-notes/5.27.1.md
Tim Otten [Tue, 14 Jul 2020 22:08:56 +0000 (15:08 -0700)]
Update 5.27.2.md
Remove dev/core#1847 - the initial fix caused other regressions, and the full fix merits a longer incubation
Tim Otten [Tue, 14 Jul 2020 21:30:03 +0000 (14:30 -0700)]
5.27.2 - Add release notes
Seamus Lee [Tue, 14 Jul 2020 21:13:52 +0000 (07:13 +1000)]
dev/core#1874 Fix fatal error by passing through the string formatType rather than the date format when adding datepicker fields from metadata
Seamus Lee [Mon, 13 Jul 2020 23:24:12 +0000 (09:24 +1000)]
Merge pull request #17820 from seamuslee001/1867_qill
dev/core#1867 Ensure that the qill matches the filter when no time is…
Seamus Lee [Mon, 13 Jul 2020 22:19:48 +0000 (08:19 +1000)]
dev/core#1867 Ensure that the qill matches the filter when no time is supplied
Seamus Lee [Mon, 13 Jul 2020 22:20:02 +0000 (08:20 +1000)]
Merge pull request #17811 from eileenmcnaughton/fromto
dev/core#1867 CiviReport filters: Fix incorrect defaulting to the beginning rather than end the to-range day
Seamus Lee [Mon, 13 Jul 2020 22:05:09 +0000 (08:05 +1000)]
Merge pull request #17814 from eileenmcnaughton/dedupe
Fix dedupe on same-activity-connection
eileen [Mon, 13 Jul 2020 11:09:34 +0000 (23:09 +1200)]
Fix dedupe on same-activity-connection
Seamus Lee [Mon, 13 Jul 2020 09:55:19 +0000 (19:55 +1000)]
Merge pull request #17803 from eileenmcnaughton/dedupe
dev/core#1862 Skip cache tables during merge, rely on cache management processes
eileen [Mon, 13 Jul 2020 05:47:08 +0000 (17:47 +1200)]
Fix incorrect defaulting to the beginning rather than end the to-range day
eileen [Mon, 13 Jul 2020 01:15:28 +0000 (13:15 +1200)]
dev/core#1862 Skip cache tables during merge, rely on cache management processes
We later call Contact.create on both contacts so that should manage the caches for this update 'as well as for any other update'
and solve the bug + reduce locking queries
Seamus Lee [Mon, 13 Jul 2020 05:03:03 +0000 (15:03 +1000)]
Merge pull request #17797 from seamuslee001/dev_core_1865
dev/core#1865 Remove civiwp and option query strings from redirected …
Seamus Lee [Mon, 13 Jul 2020 01:34:04 +0000 (11:34 +1000)]
Merge pull request #17762 from eileenmcnaughton/date
dev/core#1847 Fix datepicker to respect the searchDate offsets
eileen [Mon, 6 Jul 2020 01:52:08 +0000 (13:52 +1200)]
dev/core#1847 Fix datepicker to respect the searchDate offsets
I have some misgivings about this since I suspect the rationale behind the search offsets was primarily about the clunky UI.
Having said that I think the datepicker UI is a bit clunky on this front too as it's not obvious you can choose earlier
dates. This does at least restore established behaviour.
https://lab.civicrm.org/dev/core/-/issues/1847
Seamus Lee [Mon, 13 Jul 2020 00:12:28 +0000 (10:12 +1000)]
Merge pull request #17798 from seamuslee001/dev_core_1864
dev/core#1864 Ensure that when search in trash is not checked that on…
Seamus Lee [Sun, 12 Jul 2020 23:03:42 +0000 (09:03 +1000)]
Merge pull request #17792 from agh1/5.28.0-releasenotes-initial
5.28.0 release notes initial run
Seamus Lee [Sun, 12 Jul 2020 21:31:38 +0000 (07:31 +1000)]
dev/core#1865 Remove civiwp and option query strings from redirected url as they only relate to CiviCRM internal uses
Seamus Lee [Sun, 12 Jul 2020 22:47:42 +0000 (08:47 +1000)]
dev/core#1864 Ensure that when search in trash is not checked that only contacts not deleted are returned in the advanced search form
Andrew Hunt [Sat, 11 Jul 2020 23:08:10 +0000 (19:08 -0400)]
5.28.0 release notes: added boilerplate
Andrew Hunt [Sat, 11 Jul 2020 22:32:46 +0000 (18:32 -0400)]
5.28.0 release notes: raw from script
Seamus Lee [Thu, 9 Jul 2020 21:08:15 +0000 (07:08 +1000)]
Merge pull request #17779 from seamuslee001/nfc_php74_flexmailer
[NFC] Update flexmailer to be PHP7.4 compatible
Seamus Lee [Thu, 9 Jul 2020 03:12:56 +0000 (13:12 +1000)]
[NFC] Update flexmailer to be PHP7.4 compatible
Seamus Lee [Wed, 8 Jul 2020 23:19:13 +0000 (09:19 +1000)]
Merge pull request #17772 from seamuslee001/dev_core_1860
dev/core#1860 Fix installing on PHP7.3 Ubuntu 20.04 and MariaDB 10.3
Seamus Lee [Wed, 8 Jul 2020 22:08:35 +0000 (08:08 +1000)]
Merge pull request #17760 from seamuslee001/joomla_track_url
Ensure that when normal routing trackable urls and opens in Joomla go…
Seamus Lee [Wed, 8 Jul 2020 22:04:30 +0000 (08:04 +1000)]
dev/core#1860 Fix installing on PHP7.3 Ubuntu 20.04 and MariaDB 10.3
Eileen McNaughton [Wed, 8 Jul 2020 06:59:25 +0000 (18:59 +1200)]
Merge pull request #17768 from seamuslee001/flexmailer_distmaker
[NFC] Include flexmailer in distmaker
Seamus Lee [Wed, 8 Jul 2020 05:33:43 +0000 (15:33 +1000)]
[NFC] Include flexmailer in distmaker
Seamus Lee [Tue, 7 Jul 2020 02:17:51 +0000 (12:17 +1000)]
Only encode url if it is the front end in unit tests
Seamus Lee [Mon, 6 Jul 2020 02:39:15 +0000 (12:39 +1000)]
Fix function declaration to ensure that passing in frontend variable doesn't cause htmlizing by accident in unit tests
Seamus Lee [Mon, 6 Jul 2020 00:08:15 +0000 (10:08 +1000)]
Ensure that when normal routing trackable urls and opens in Joomla go to the frontend not administrator site
colemanw [Sat, 4 Jul 2020 19:45:47 +0000 (15:45 -0400)]
Merge pull request #17748 from demeritcowboy/double-vision
Pre-upgrade message for php-intl shows twice
demeritcowboy [Fri, 3 Jul 2020 23:27:57 +0000 (19:27 -0400)]
only show message once
CiviCRM [Fri, 3 Jul 2020 05:22:47 +0000 (05:22 +0000)]
Set version to 5.28.beta1
Eileen McNaughton [Fri, 3 Jul 2020 04:04:08 +0000 (16:04 +1200)]
Merge pull request #17733 from eileenmcnaughton/pvv
Set locales for all domains when enabling multilingual
Eileen McNaughton [Fri, 3 Jul 2020 02:48:03 +0000 (14:48 +1200)]
Merge pull request #17721 from colemanw/isDeletedPerm
Add permission metadata to contact is_deleted field
Tim Otten [Fri, 3 Jul 2020 02:01:34 +0000 (19:01 -0700)]
Merge pull request #17738 from colemanw/upgradeLocales
dev/core#1852 Ensure all domains have the same value for locales
Seamus Lee [Fri, 3 Jul 2020 01:57:58 +0000 (11:57 +1000)]
Ensure that we are testing on multiple domains
Co-authored-by: colemanw <coleman@civicrm.org>
Seamus Lee [Thu, 2 Jul 2020 21:58:55 +0000 (07:58 +1000)]
Merge pull request #17739 from colemanw/byeByeWiki
[NFC] Fix some outdated wiki links
Coleman Watts [Thu, 2 Jul 2020 20:42:07 +0000 (16:42 -0400)]
Fix some outdated wiki links
Coleman Watts [Wed, 1 Jul 2020 02:16:49 +0000 (22:16 -0400)]
Add permission metadata to contact is_deleted field
colemanw [Thu, 2 Jul 2020 17:20:49 +0000 (13:20 -0400)]
Merge pull request #17737 from christianwach/lab-core-1851
Fix saving of State/Province Multi-select values
Coleman Watts [Thu, 2 Jul 2020 17:09:20 +0000 (13:09 -0400)]
Ensure all domains have the same value for locales
Christian Wach [Thu, 2 Jul 2020 14:39:24 +0000 (15:39 +0100)]
Fix saving of State/Province Multi-select values
Seamus Lee [Thu, 2 Jul 2020 04:02:24 +0000 (14:02 +1000)]
Merge pull request #17736 from civicrm/5.27
5.27
Seamus Lee [Thu, 2 Jul 2020 03:14:57 +0000 (13:14 +1000)]
Merge pull request #17731 from agh1/5.27.0-releasenotes-final
5.27.0 release notes: final edits
Eileen McNaughton [Thu, 2 Jul 2020 02:52:32 +0000 (14:52 +1200)]
Merge pull request #17735 from totten/master-field-ver
API/DAO Metadata - Retain versioning metadata for possible usage in runtime+tooling
Tim Otten [Thu, 2 Jul 2020 02:17:21 +0000 (19:17 -0700)]
Update 5.27.0.md
Tim Otten [Thu, 2 Jul 2020 02:02:36 +0000 (19:02 -0700)]
Update 5.27.0.md
eileen [Thu, 2 Jul 2020 00:36:13 +0000 (12:36 +1200)]
Set locales for all domains when enabling multilingual
In the process of trying to test a possible wordpress regression I found that enabling
mutlilingual on a domain other than domain 1 breaks the site. The reason is that without
only domain 1 is being updated with the new language and locales. Since I'm on domain
2 when I do this I can no longer load any page as the locales value has not been set
and the queries look for option_value.label not option_value.label_us.
Since 'no locale' is no longer valid the locale needs to be set on all sites. Note the
code change is primarily an extraction inn order to only run the table update part once