Lisa Marie Maginnis [Thu, 1 May 2014 21:04:18 +0000 (17:04 -0400)]
Our changes
Tim Otten [Thu, 12 Jan 2023 10:24:36 +0000 (02:24 -0800)]
Merge pull request #25335 from totten/5.57-bump1
5.57.1 - Add notes. Bump version.
Tim Otten [Thu, 12 Jan 2023 06:21:12 +0000 (22:21 -0800)]
Add release-notes/5.57.1.md
Tim Otten [Thu, 12 Jan 2023 06:11:13 +0000 (22:11 -0800)]
Set version to 5.57.1
Eileen McNaughton [Thu, 12 Jan 2023 02:49:00 +0000 (15:49 +1300)]
Merge pull request #25331 from totten/5.57-assetbuilder
AssetBuilder / JWT / Status (Backports)
Tim Otten [Thu, 5 Jan 2023 22:28:08 +0000 (14:28 -0800)]
Status Check - Raise severity of the check for signing keys. Tweak prose.
Tim Otten [Tue, 10 Jan 2023 01:07:57 +0000 (17:07 -0800)]
AssetBuilder - Define a fallback key (WEAK_SIGN) for sites that have not been configured
Tim Otten [Mon, 9 Jan 2023 22:45:49 +0000 (14:45 -0800)]
AssetBuilder - Switch to JWT
demeritcowboy [Wed, 11 Jan 2023 13:51:52 +0000 (08:51 -0500)]
Merge pull request #25306 from aydun/j3_cv_fix_557
Fix `cv` failure on J3.
Aidan Saunders [Fri, 6 Jan 2023 10:48:14 +0000 (10:48 +0000)]
Fix `cv` failure on J3.
Seamus Lee [Tue, 10 Jan 2023 02:11:32 +0000 (13:11 +1100)]
Merge pull request #25303 from eileenmcnaughton/5.57
Fix Contributions listing crash due to `CRM_Financial_BAO_Order::getLineItemTitle`
Rich Lott / Artful Robot [Mon, 9 Jan 2023 19:36:39 +0000 (19:36 +0000)]
Fix Contributions listing crash due to CRM_Financial_BAO_Order::getLineItemTitle
demeritcowboy [Fri, 6 Jan 2023 21:41:18 +0000 (16:41 -0500)]
Merge pull request #25291 from demeritcowboy/sk-update-57
searchkit - fix broken update task - 5.57 backport
demeritcowboy [Fri, 6 Jan 2023 17:56:14 +0000 (12:56 -0500)]
fix broken update task
Tim Otten [Thu, 5 Jan 2023 03:52:27 +0000 (19:52 -0800)]
Update 5.57.0.md
Tim Otten [Thu, 5 Jan 2023 03:19:52 +0000 (19:19 -0800)]
Update 5.57.0.md
Tim Otten [Thu, 5 Jan 2023 01:05:04 +0000 (17:05 -0800)]
Set version to 5.57.0
Tim Otten [Thu, 5 Jan 2023 01:02:15 +0000 (17:02 -0800)]
FiveFiftySeven - Switch upgrade step from #25170 (5.57.beta1 => 5.57.0)
This was split apart from 25170 to simplify to some other aspects of the concurrent merges
required for the security-update. Those are done, and now we can proceed.
This will ensure that anyone who ran 5.57 RC will also run the step. The
step was merged in very, very recently (like 10-20 min ago). For all other
purposes, it's the same as before.
Tim Otten [Wed, 4 Jan 2023 02:32:08 +0000 (18:32 -0800)]
release-notes/5.57.0.md - Add security advisories
Tim Otten [Wed, 29 Jun 2022 05:06:05 +0000 (22:06 -0700)]
AssetBuilder - Validate checksum for requested parameters
Seamus Lee [Tue, 3 Jan 2023 01:54:11 +0000 (12:54 +1100)]
CiviEvent - Escape parameters in help text
Seamus Lee [Fri, 16 Dec 2022 00:55:57 +0000 (11:55 +1100)]
security/core#120 Use Rich's patch (ArtfulRobot) with minor variation to try to resolve the issue and add unit tests
Fix Regex and include test cases as per Rich's comments
Tim Otten [Thu, 5 Jan 2023 00:35:26 +0000 (16:35 -0800)]
Merge pull request #25170 from demeritcowboy/sortable
dev/core#4013 dev/core#4022 - Broken quicksearch options setting
Tim Otten [Wed, 4 Jan 2023 20:59:26 +0000 (12:59 -0800)]
Merge pull request #25278 from totten/5.57-rn
release-notes/5.57.0.md - Add recent update
Tim Otten [Wed, 4 Jan 2023 20:58:20 +0000 (12:58 -0800)]
release-notes/5.57.0.md - Add recent update
Eileen McNaughton [Tue, 3 Jan 2023 20:50:19 +0000 (09:50 +1300)]
Merge pull request #25273 from gellweiler/5.57
Add gellweiler to contributor-key.yml
Eileen McNaughton [Tue, 3 Jan 2023 20:49:42 +0000 (09:49 +1300)]
Merge pull request #25272 from eileenmcnaughton/557
dev/core#4049 Nested tags are not showing under some circumstances.
Sebastian Gellweiler [Tue, 3 Jan 2023 20:18:07 +0000 (21:18 +0100)]
Add gellweiler to contributor-key.yml
gellweiler [Sat, 24 Dec 2022 13:51:00 +0000 (14:51 +0100)]
Fix #4049
This commit fixes #4049: Nested tags are not showing under some circumstances.
Eileen McNaughton [Thu, 29 Dec 2022 21:58:27 +0000 (10:58 +1300)]
Merge pull request #25231 from alifrumin/rn5.57
[NFC] first pass at 5.57 release notes
Alice Frumin [Wed, 28 Dec 2022 03:24:38 +0000 (22:24 -0500)]
[NFC] first pass 5.57 release notes
Eileen McNaughton [Wed, 28 Dec 2022 07:01:22 +0000 (20:01 +1300)]
Merge pull request #25225 from agh1/5.57.0-releasenotes-initial
5.57.0 release notes initial run
Andie Hunt [Tue, 27 Dec 2022 21:23:49 +0000 (16:23 -0500)]
5.57.0 release notes: added boilerplate
Andie Hunt [Tue, 27 Dec 2022 14:57:39 +0000 (09:57 -0500)]
5.57.0 release notes: raw from script
Yashodha Chaku [Fri, 23 Dec 2022 08:06:03 +0000 (13:36 +0530)]
Merge pull request #25213 from demeritcowboy/fract-qty
dev/core#4039 - Restore ability to have fractional quantity for text price fields
demeritcowboy [Fri, 23 Dec 2022 00:15:22 +0000 (19:15 -0500)]
restore ability to have fractional quantity
Eileen McNaughton [Tue, 20 Dec 2022 22:18:25 +0000 (11:18 +1300)]
Merge pull request #25204 from kurund/contribution-import-fix
dev/core#4038 import contribution fixes in update mode
Kurund Jalmi [Tue, 20 Dec 2022 10:06:25 +0000 (10:06 +0000)]
import contribution fixes in update mode
Eileen McNaughton [Mon, 19 Dec 2022 00:31:44 +0000 (13:31 +1300)]
Merge pull request #25197 from colemanw/fixOptions
SearchKit - Fix option loading & rendering for in-place edit
Coleman Watts [Sat, 17 Dec 2022 23:02:15 +0000 (18:02 -0500)]
SearchKit - Fix option loading & rendering for in-place edit
Fixes dev/core#4037
demeritcowboy [Fri, 16 Dec 2022 17:19:33 +0000 (12:19 -0500)]
Merge pull request #25189 from MegaphoneJon/batch-form-entity
Fix 'cannot determine default entity' error on New Batch page
Jon Goldberg [Fri, 16 Dec 2022 15:24:30 +0000 (10:24 -0500)]
Fix 'cannot determine default entity' error on New Batch page
demeritcowboy [Fri, 16 Dec 2022 03:08:57 +0000 (22:08 -0500)]
Merge pull request #25177 from totten/5.57-testing
Fix miscoordination between CiviUnitTestCase/CiviEnvBuilder. Fix flaky ConformanceTest.
Tim Otten [Fri, 16 Dec 2022 00:54:36 +0000 (16:54 -0800)]
AutocompleteTest - Use SK as part of the baseline environment
Tim Otten [Tue, 13 Dec 2022 06:39:04 +0000 (22:39 -0800)]
ConformanceTest - Remove override, which causes failures in `ConformanceTest`
Tim Otten [Thu, 15 Dec 2022 04:13:08 +0000 (20:13 -0800)]
CiviUnitTestCase - Fix miscoordination with CiviEnvBuilder
Background
----------
Recall that `CiviUnitTestCase` and `CiviEnvBuilder` are two different
implementations of a similar concept.
* `Concept`: If two tests use the same baseline DB/environment, and if they
preserve the baseline, then you don't need to reset everything in between
tests. But if they change, then you need to reset.
* `CiviUnitTestCase`: The older rendition. Tightly coupled. Only allows
one specific baseline. Mingled with a lot of unrelated functionality in
`CiviUnitTestCase`.
* `CiviEnvBuilder`: The newer rendition. Loosely coupled. Allows different
baselines. Can be mixed into any plain-old `TestCase`. Used by
`Civi\Test::headless()` and `Civi\Test::e2e()`.
Problem Scenario
----------------
Suppose you have a mix of different tests running with the same DB -- e.g.
1. Run some tests based on `CiviEnvBuilder`
2. Run some tests based on `CiviUnitTestCase`
3. Run some tests based on `CiviEnvBuilder`
This wasn't originally anticipated, but it can happen -- either because
the test-suite is large+mixed, or because a developer is manually
running specific tests (which happen to be written differently).
The problem goes like this:
1. Run some tests based on `CiviEnvBuilder`
* This resets the DB and also stores a DB signature. ("Here is how
we setup the DB...")
2. Run some tests based on `CiviUnitTestCase`
* This resets the DB, but leaves the old DB signature in place.
3. Run some tests based on `CiviEnvBuilder`
* This sees the old DB signature and wrongly concludes that we
still have the DB from step (1).
Solution
--------
Whenever one resets the DB, it should update the DB signature.
Tim Otten [Thu, 15 Dec 2022 04:11:13 +0000 (20:11 -0800)]
(REF) CiviEnvBuilder - Simplify `$name` calculation
Tweaking the `$name` is theoretically useful if you have entirely
independent data-sets that happen to live in the same DB. In practice, we
only use CiviEnvBuilder to manage Civi-related data-sets.
demeritcowboy [Wed, 14 Dec 2022 14:36:15 +0000 (09:36 -0500)]
fix borked quicksearch setting
demeritcowboy [Tue, 13 Dec 2022 22:34:26 +0000 (17:34 -0500)]
Merge pull request #25160 from totten/5.57-file-test
CRM_Utils_FileTest - Fix compatibility with private data folders
Eileen McNaughton [Tue, 13 Dec 2022 21:41:10 +0000 (10:41 +1300)]
Merge pull request #25145 from MegaphoneJon/core-4027-rc
fixes core#4027 - don't crash when a contribution has no line items
demeritcowboy [Tue, 13 Dec 2022 15:52:27 +0000 (10:52 -0500)]
Merge pull request #25158 from totten/5.57-entity-stat
getSiteStats - Use consistent report format
Tim Otten [Tue, 13 Dec 2022 08:16:07 +0000 (00:16 -0800)]
CRM_Utils_FileTest - Fix compatibility with private data folders
For example, on my local, the `templates_c` folder lands at:
$BUILDKIT/build/dmaster/.civibuild/private/default/civicrm/templates_c
which is not a descendent of
$BUILDKIT/build/dmaster/web
Tim Otten [Tue, 13 Dec 2022 05:35:52 +0000 (21:35 -0800)]
getSiteStats - Use consistent report format
When general usage stats are enabled, the format should be consistent across
versions.
Before (4.7 - 5.56): Report stat as 'Delivered'
Before (5.57.beta1): Report stat as 'MailingEventDelivered'
After (5.57.beta1): Report stat as 'Delivered'
Yashodha Chaku [Tue, 13 Dec 2022 04:55:39 +0000 (10:25 +0530)]
Merge pull request #25149 from larssandergreen/allow-dashes-in-tracked-URLs-for-text-in-flexmailer
Flexmailer: Prevent broken urls containing hyphens when click tracking is enabled for plain text mailings
larssandergreen [Tue, 13 Dec 2022 02:36:48 +0000 (19:36 -0700)]
allow hyphens in tracked URLs in text emails
Seamus Lee [Sun, 11 Dec 2022 00:03:05 +0000 (11:03 +1100)]
Merge pull request #25150 from demeritcowboy/sitestats
[NFC] Update testGetSiteStats to match earlier name change
demeritcowboy [Sat, 10 Dec 2022 16:12:25 +0000 (11:12 -0500)]
update to match earlier name change
Jon Goldberg [Fri, 9 Dec 2022 17:50:57 +0000 (12:50 -0500)]
fixes core#4027 - don't crash when a contribution has no line items
Tim Otten [Fri, 9 Dec 2022 09:04:58 +0000 (01:04 -0800)]
Set version to 5.57.beta1
Yashodha Chaku [Fri, 9 Dec 2022 04:31:33 +0000 (10:01 +0530)]
Merge pull request #25108 from eileenmcnaughton/pdf_depp
Remove noisly deprecated function PDFLetterCommon::postProcess
Seamus Lee [Fri, 9 Dec 2022 01:46:03 +0000 (12:46 +1100)]
Merge pull request #25140 from eileenmcnaughton/class
Fix enotice on user dash - when user has membership/s & debugging enabled
Seamus Lee [Thu, 8 Dec 2022 22:48:12 +0000 (09:48 +1100)]
Merge pull request #25137 from eileenmcnaughton/import_loc
Stop using single hard-coded value array (clean up from previous refactors)
Eileen McNaughton [Thu, 8 Dec 2022 22:41:47 +0000 (11:41 +1300)]
Fix enotice on user dash
demeritcowboy [Thu, 8 Dec 2022 19:41:18 +0000 (14:41 -0500)]
Merge pull request #24798 from jmcclelland/currency-additional-payment
ensure currency is included to avoid translation problems
Eileen McNaughton [Thu, 8 Dec 2022 19:28:23 +0000 (08:28 +1300)]
Merge pull request #25139 from christopher-yu/master
Cast membership object as array before passing to getMembershipStatusByDate()
Eileen McNaughton [Thu, 8 Dec 2022 19:26:22 +0000 (08:26 +1300)]
Merge pull request #25138 from demeritcowboy/regen
[NFC] Update instructions for running regen online
cyu [Thu, 8 Dec 2022 18:00:32 +0000 (10:00 -0800)]
Cast membership object as array before passing to getMembershipStatusByDate()
demeritcowboy [Thu, 8 Dec 2022 16:32:24 +0000 (11:32 -0500)]
update instructions
Mathieu Lu [Thu, 8 Dec 2022 15:49:26 +0000 (10:49 -0500)]
Merge pull request #25126 from colemanw/stripTags
SearchKit - Include html columns in spreadsheet download
Jamie McClelland [Thu, 8 Dec 2022 15:30:54 +0000 (10:30 -0500)]
re-generated sql file.
demeritcowboy [Thu, 8 Dec 2022 15:15:52 +0000 (10:15 -0500)]
Merge pull request #25136 from eileenmcnaughton/import_count
Remove always-true ifs
colemanw [Thu, 8 Dec 2022 11:47:33 +0000 (06:47 -0500)]
Merge pull request #24925 from eileenmcnaughton/token_dep
Fold `processGreetingTemplate` function only called from one place into caller, deprecate
Eileen McNaughton [Thu, 8 Dec 2022 06:46:18 +0000 (19:46 +1300)]
Stop using single hard-coded value array
Eileen McNaughton [Thu, 8 Dec 2022 06:35:56 +0000 (19:35 +1300)]
Remove always-true ifs
Eileen McNaughton [Thu, 8 Dec 2022 05:25:44 +0000 (18:25 +1300)]
Merge pull request #25129 from MegaphoneJon/oauth-accounting-batches-cont
Fix core#7016 in a second location
colemanw [Thu, 8 Dec 2022 02:39:00 +0000 (21:39 -0500)]
Merge pull request #25110 from eileenmcnaughton/mandatory_flex
Make flexmailer mandatory
Seamus Lee [Thu, 8 Dec 2022 02:36:55 +0000 (13:36 +1100)]
Merge pull request #25134 from seamuslee001/master
#24911 Forward port to master / 5.57
colemanw [Thu, 8 Dec 2022 02:36:19 +0000 (21:36 -0500)]
Merge pull request #25125 from MegaphoneJon/cmsuser-profile-cleanup
always define showCMS
colemanw [Thu, 8 Dec 2022 02:36:02 +0000 (21:36 -0500)]
Merge pull request #25131 from totten/master-symbols-test
(NFC) dev/core#4008 - Afform - More coverage for symbol-scanner
Seamus Lee [Thu, 8 Dec 2022 01:06:51 +0000 (12:06 +1100)]
Merge branch 'php81_null_string'
Seamus Lee [Thu, 8 Dec 2022 00:16:36 +0000 (11:16 +1100)]
Merge pull request #25132 from totten/master-wp-baseurl
CRM_Utils_System_WordPress - Drop unused variable
Seamus Lee [Thu, 8 Dec 2022 00:01:51 +0000 (11:01 +1100)]
Merge pull request #25130 from civicrm/5.56
5.56
Seamus Lee [Thu, 8 Dec 2022 00:01:19 +0000 (11:01 +1100)]
Merge pull request #25133 from colemanw/searchSortTest
SearchKit - Fix unit test so sort param actually does something
Seamus Lee [Sun, 6 Nov 2022 22:09:42 +0000 (09:09 +1100)]
[REF][PHP8.1] Fix a couple of issues where passing in NULL in string functions is deprecated in PHP8.1
Coleman Watts [Wed, 7 Dec 2022 22:51:36 +0000 (17:51 -0500)]
SearchKit - Fix unit test so sort param actually does something
Tim Otten [Wed, 7 Dec 2022 22:39:42 +0000 (14:39 -0800)]
CRM_Utils_System_WordPress - Drop unused variable
This is an off-shoot from #24911.
Before
------
`WordPress` implements the method `mapConfigToSSL()`, but ti doesn't do anything.
To see this, you can search for 'base_url' across the entire-source of a Civi-WP installation.
Specifically, I used
```
grep -lri 'global.*base_url'
```
The references appeared unrelated -- some references to Drupal/Backdrop adapters, and
some references to minified JS files. But I couldn't see anything that would in PHP on WP.
After
-----
Don't bother implementing the method. Might as well inherit the base method (which is empty).
Seamus Lee [Wed, 7 Dec 2022 22:20:36 +0000 (09:20 +1100)]
Merge pull request #25128 from seamuslee001/5.56
Output of npm audit fix
Tim Otten [Wed, 7 Dec 2022 22:08:14 +0000 (14:08 -0800)]
Merge pull request #24998 from demeritcowboy/oauth-name
Avoid symbol scan errors in oauth-client help text
Tim Otten [Wed, 7 Dec 2022 21:45:49 +0000 (13:45 -0800)]
(NFC) dev/core#4008 - Afform - More coverage for symbol-scanner
Add more test-coverage. This reproduces the failure-scenario that was
addressed by #25067. (When combined with 25067, it passes. But before
25067, it fails.)
Tim Otten [Wed, 7 Dec 2022 21:44:39 +0000 (13:44 -0800)]
Merge pull request #25067 from demeritcowboy/invalid-html
dev/core#4008 - alternate to 24998 - Avoid symbol scan errors
Jon Goldberg [Wed, 7 Dec 2022 21:07:50 +0000 (16:07 -0500)]
Fix core#7016 in a second location
Seamus Lee [Wed, 7 Dec 2022 20:49:41 +0000 (07:49 +1100)]
Output of npm audit fix
colemanw [Wed, 7 Dec 2022 19:04:33 +0000 (14:04 -0500)]
Merge pull request #25124 from MegaphoneJon/profile-cleanup-1
remove unused template vars from Profile Form
Jamie McClelland [Mon, 24 Oct 2022 15:00:18 +0000 (11:00 -0400)]
ensure currency is included to avoid translation problems
See https://lab.civicrm.org/dev/core/-/issues/411
demeritcowboy [Wed, 7 Dec 2022 02:42:06 +0000 (21:42 -0500)]
Merge pull request #25119 from demeritcowboy/current-revision
dev/core#1532 - Upgrade message about old civicase activity revisions
Coleman Watts [Wed, 7 Dec 2022 01:16:24 +0000 (20:16 -0500)]
SearchKit - Include html columns in spreadsheet download
This adds html-type columns to the spreadsheet download, by formatting them as plain text.
demeritcowboy [Wed, 7 Dec 2022 00:43:33 +0000 (19:43 -0500)]
Merge pull request #25122 from MegaphoneJon/no-perl
remove civimail-spooler script
Jon Goldberg [Tue, 6 Dec 2022 23:43:09 +0000 (18:43 -0500)]
always define showCMS
Jon Goldberg [Tue, 6 Dec 2022 23:36:37 +0000 (18:36 -0500)]
remove unused template vars from Profile Form
Seamus Lee [Tue, 6 Dec 2022 23:36:09 +0000 (10:36 +1100)]
Merge pull request #25121 from MegaphoneJon/no-drupalCms
remove unused code in Profile template