scardinius [Thu, 30 Jan 2020 09:10:04 +0000 (10:10 +0100)]
dev/core#1564 Fix category name for a/b test temporary table
Eileen McNaughton [Wed, 29 Jan 2020 19:54:18 +0000 (08:54 +1300)]
Merge pull request #16417 from jmcclelland/1555b
avoid undefined offset and uninitialized key errors on upgrade - dev/core#1555
Seamus Lee [Wed, 29 Jan 2020 14:37:45 +0000 (01:37 +1100)]
Merge pull request #16418 from seamuslee001/5.22
Add release-notes/5.21.2.md
Tim Otten [Thu, 23 Jan 2020 23:58:31 +0000 (15:58 -0800)]
Add release-notes/5.21.2.md
Jamie McClelland [Tue, 28 Jan 2020 16:48:38 +0000 (11:48 -0500)]
avoid undefined offset and uninitialized key errors on upgrade
https://lab.civicrm.org/dev/core/issues/1555
Eileen McNaughton [Wed, 29 Jan 2020 00:41:45 +0000 (13:41 +1300)]
Merge pull request #16393 from demeritcowboy/activity-report-pager-crash
dev/core#1552 Fatal error using pager on Activity Detail Report when Include Case Activities is Yes
demeritcowboy [Tue, 28 Jan 2020 19:14:31 +0000 (14:14 -0500)]
fatal error when using pager
Seamus Lee [Sun, 26 Jan 2020 03:24:15 +0000 (14:24 +1100)]
Merge pull request #16377 from ejegg/serviceFileFinder-5.22
loadServices: tighten up file match regex
Seamus Lee [Sun, 26 Jan 2020 02:53:40 +0000 (13:53 +1100)]
Merge pull request #16384 from totten/5.22-nfc
(NFC) Civi, CRM, tests - Update for Drupal.Commenting.VariableComment.IncorrectVarType
Seamus Lee [Sun, 26 Jan 2020 00:13:38 +0000 (11:13 +1100)]
[NFC] Fix var declarations in the test folder
Seamus Lee [Sat, 25 Jan 2020 20:39:27 +0000 (07:39 +1100)]
Update Var delcartion to be standard in CRM folder
Tim Otten [Sat, 25 Jan 2020 00:17:30 +0000 (16:17 -0800)]
(NFC) Civi/API - Update for Drupal.Commenting.VariableComment.IncorrectVarType
Tim Otten [Sat, 25 Jan 2020 00:17:21 +0000 (16:17 -0800)]
(NFC) Civi/CCase - Update for Drupal.Commenting.VariableComment.IncorrectVarType
Tim Otten [Sat, 25 Jan 2020 00:17:14 +0000 (16:17 -0800)]
(NFC) Civi/Core - Update for Drupal.Commenting.VariableComment.IncorrectVarType
Tim Otten [Sat, 25 Jan 2020 00:17:04 +0000 (16:17 -0800)]
(NFC) Civi/Payment - Update for Drupal.Commenting.VariableComment.IncorrectVarType
Tim Otten [Sat, 25 Jan 2020 00:16:56 +0000 (16:16 -0800)]
(NFC) Civi/Test - Update for Drupal.Commenting.VariableComment.IncorrectVarType
Elliott Eggleston [Fri, 24 Jan 2020 21:28:57 +0000 (16:28 -0500)]
loadServices: tighten up file match regex
Before: Civi code living under a path containing the characters php
(such as ~/src/php/civicrm) will crash trying to load services with
a message like the following:
ReflectionException: Class Civi\Api4\Service\Spec\Provider\src
does not exist in ReflectionClass->__construct()
After: Civi loads services normally no matter what the enclosing path
Tim Otten [Thu, 23 Jan 2020 23:05:11 +0000 (15:05 -0800)]
Merge pull request #16356 from totten/5.22-gencode-ts
(dev/core#1546) Fix translation of seed data
Tim Otten [Thu, 23 Jan 2020 05:36:14 +0000 (21:36 -0800)]
(NFC) LocalizedDataTest - Add tips on running
Tim Otten [Thu, 23 Jan 2020 03:31:17 +0000 (19:31 -0800)]
(dev/core#1546) Fix translation of seed data
Overview
--------
This fixes a regression in which seed data is not translated.
Before
------
The `civicrm_data.*.mysql` files are not translated.
After
-----
The `civicrm_data.*.mysql` files are translated.
There's a unit-test to check this.
Comments
--------
This regression stems from #15411, which aimed to allow extensions to define
custom variants of `ts()`. The crux of the issue is "What happens if you
try to translate a string before the system is bootstrapped - before the
extension is loaded? What's your fallback behavior?"
In #15411, it used a fallback behavior of "do no translation". In theory,
you shouldn't really get into this scenario since UIs are pretty much always
generated post-boot.
However, it turns out that there is a situation where you have an un-booted
system and need to translate strings -- i.e. when generating the localized
`civicrm_data.*.mysql` data. Hence the bug.
This patch preserves most of the changes from #15411, but it changes the
fallback behavior from "do no translation" to "use the built-in/default
translator".
Seamus Lee [Fri, 17 Jan 2020 06:20:12 +0000 (17:20 +1100)]
Merge pull request #16313 from eileenmcnaughton/522
dev/core#1217 Fix for failure to respect event_id (or any?) criteria in smart groups
eileen [Fri, 17 Jan 2020 03:52:11 +0000 (16:52 +1300)]
dev/core#1217 Fix for failure to respect event_id (or any?) criteria in smart groups
From what I can tell it's possible to create smart groups from Advanced search & other contact searchs & Membership Search & Event search.
Membership search actually just leverages advanced search but Event Search smart group has it's own code & reloads into Event search.
This has been flawed for months but the current iteration is the criteria are not respected. On digging I found the decision was made in
contact search to store the parsed QueryParams (in [field_name, 'IN', [1,2]] format not the formValues. I think this was probably a mistake.
However, by adjusting the event code to do the same & ensuring the defaults are set it starts working again
Seamus Lee [Wed, 15 Jan 2020 04:48:16 +0000 (15:48 +1100)]
Merge pull request #16292 from eileenmcnaughton/522
dev/user-interface#13 fix regression where option to email is not longer displayed
eileen [Tue, 14 Jan 2020 20:57:49 +0000 (09:57 +1300)]
dev/user-interface#13 fix regression where option to email is not longer displayed.
The api parameter here was removed, seemingly unintentionally. It is picked up on by the script when it checks for email so
needs re-instating
Eileen McNaughton [Tue, 14 Jan 2020 04:37:16 +0000 (17:37 +1300)]
Merge pull request #16287 from MegaphoneJon/core-1524-rc
fix created_date/modified_date relative date filter searches
Jon Goldberg [Mon, 13 Jan 2020 22:52:22 +0000 (17:52 -0500)]
fix created_date/modified_date relative date filter searches
Tim Otten [Sat, 11 Jan 2020 00:56:02 +0000 (16:56 -0800)]
Merge pull request #16277 from seamuslee001/5.22
Add release notes for 5.21.1
Tim Otten [Sat, 11 Jan 2020 00:34:03 +0000 (16:34 -0800)]
Add release notes for 5.21.1
Eileen McNaughton [Thu, 9 Jan 2020 01:19:52 +0000 (14:19 +1300)]
Merge pull request #16239 from MegaphoneJon/mailing-60-522
mailing#60: Fix regression where `is_bulkmail` flag isn't respected
Jon Goldberg [Tue, 7 Jan 2020 18:53:52 +0000 (13:53 -0500)]
mailing#60: Fix regression where multiple bulk recipient option isn't respected
test fixes
Eileen McNaughton [Tue, 7 Jan 2020 23:06:35 +0000 (12:06 +1300)]
Merge pull request #16225 from demeritcowboy/contribution-view-missing-status
dev/core#1508 Regression/E_NOTICE - Missing table on contribution view
demeritcowboy [Tue, 7 Jan 2020 21:07:25 +0000 (16:07 -0500)]
put back mistakenly removed variable
Seamus Lee [Thu, 2 Jan 2020 23:02:39 +0000 (10:02 +1100)]
Merge pull request #16190 from alifrumin/rn5.22
5.22 Release Notes Annotating and Sorting
Alice Frumin [Thu, 2 Jan 2020 20:30:38 +0000 (15:30 -0500)]
5.22 Release Notes Annotating and Sorting
Seamus Lee [Thu, 2 Jan 2020 19:58:43 +0000 (06:58 +1100)]
Merge pull request #16187 from agh1/5.22.0-releasenotes
5.22.0 release notes - initial run
Andrew Hunt [Thu, 2 Jan 2020 16:38:44 +0000 (11:38 -0500)]
5.22.0 release notes: added boilerplate
Andrew Hunt [Thu, 2 Jan 2020 16:32:46 +0000 (11:32 -0500)]
5.22.0 release notes: raw from script
CiviCRM [Thu, 2 Jan 2020 04:42:58 +0000 (04:42 +0000)]
Set version to 5.22.beta1
Seamus Lee [Thu, 2 Jan 2020 04:09:58 +0000 (15:09 +1100)]
Merge pull request #16182 from seamuslee001/dev_core_1144
dev/core#1144 (NFC) Handle fact that MySQL 8 always returns the colum…
Seamus Lee [Thu, 2 Jan 2020 02:34:44 +0000 (02:34 +0000)]
dev/core#1144 (NFC) Handle fact that MySQL 8 always returns the column name as it is in the DB not as it is in the query
Seamus Lee [Thu, 2 Jan 2020 02:18:11 +0000 (13:18 +1100)]
Merge pull request #16180 from eileenmcnaughton/act2
[REF] remove unused from getACLRoles
Eileen McNaughton [Thu, 2 Jan 2020 01:25:53 +0000 (14:25 +1300)]
Merge pull request #16181 from civicrm/5.21
5.21 to master
Eileen McNaughton [Thu, 2 Jan 2020 01:25:17 +0000 (14:25 +1300)]
Merge pull request #16176 from eileenmcnaughton/mem_fix
dev/membership#21 fix regression on membership handling
eileen [Thu, 2 Jan 2020 00:34:10 +0000 (13:34 +1300)]
[REF] remove unused from getACLRoles
Following on from https://github.com/civicrm/civicrm-core/pull/16175 we now know that group_id is not
passed into this function as the only place that calls this no longer passes group id, eliminate.
Seamus Lee [Thu, 2 Jan 2020 00:10:48 +0000 (11:10 +1100)]
Merge pull request #16167 from eileenmcnaughton/mem2
[NFC] Add test on buildMembershipTypeValues & cleanup class
Seamus Lee [Thu, 2 Jan 2020 00:09:52 +0000 (11:09 +1100)]
Merge pull request #16175 from eileenmcnaughton/get_acls
[REF] Remove unused params from function signature for getACLs
Tim Otten [Wed, 1 Jan 2020 23:54:09 +0000 (15:54 -0800)]
Merge pull request #16179 from seamuslee001/dev_core_1143
dev/core#1143 dev/core#1480 Permit CiviCRM installation and running o…
eileen [Wed, 1 Jan 2020 03:22:32 +0000 (16:22 +1300)]
New year (2020) test fixes. (Backport #16172)
We have 8 tests failing that seem to be due to 2020 starting. This fixes 2
Seamus Lee [Wed, 1 Jan 2020 23:12:27 +0000 (10:12 +1100)]
Merge pull request #16178 from seamuslee001/regen_dao
[NFC] Re-generate DAOs
Seamus Lee [Wed, 1 Jan 2020 22:17:16 +0000 (22:17 +0000)]
dev/core#1143 dev/core#1480 Permit CiviCRM installation and running on MySQL 8 by adding backticks around grouping
Seamus Lee [Wed, 1 Jan 2020 22:06:42 +0000 (22:06 +0000)]
[NFC] Re-generate DAOs
eileen [Wed, 1 Jan 2020 21:44:22 +0000 (10:44 +1300)]
dev/membership#21 fix regression on membership handling
This turns https://lab.civicrm.org/dev/membership/issues/21#note_29439 into a patch. As new code it seems to
have triggered an underlying issue. I also have https://github.com/civicrm/civicrm-core/pull/16139 open but
would be happy to see this hit the rc & the other have a full rc cycle.
The logic for this change makes sense as described & it is trivial. This has been a very hard bug
to reproduce so I'm unable to give full steps
eileen [Mon, 9 Dec 2019 08:59:27 +0000 (21:59 +1300)]
Add test on buildMembershipTypeValues & cleanup class
I found the class wasn't running reliably in isolation so had to strip out some invalid things
eileen [Wed, 1 Jan 2020 21:25:57 +0000 (10:25 +1300)]
[REF] Remove unused params from function signature for getACLs
It turns out this function is only called once & the second 2 acls are hard-coded so we don't need them
Eileen McNaughton [Wed, 1 Jan 2020 20:01:38 +0000 (09:01 +1300)]
Merge pull request #16172 from eileenmcnaughton/happy_new_year
2020 test fixes.
Yashodha Chaku [Wed, 1 Jan 2020 04:55:22 +0000 (10:25 +0530)]
Merge pull request #16100 from jitendrapurohit/dev-1473
dev/core#1473 - Missing address on /user when location type label dif…
Eileen McNaughton [Wed, 1 Jan 2020 03:37:25 +0000 (16:37 +1300)]
Merge pull request #16162 from colemanw/contactFields
Add contact type to schema to allow GetFields filtering
eileen [Wed, 1 Jan 2020 03:22:32 +0000 (16:22 +1300)]
2020 test fixes.
We have 8 tests failing that seem to be due to 2020 starting. This fixes 2
Eileen McNaughton [Wed, 1 Jan 2020 01:14:16 +0000 (14:14 +1300)]
Merge pull request #16168 from colemanw/options
Pass api4 getFields values through to getOptions
Seamus Lee [Tue, 31 Dec 2019 23:14:40 +0000 (10:14 +1100)]
Merge pull request #16171 from civicrm/5.21
Merge pull request #16170 from agh1/5.21.0-releasenotes-final
Seamus Lee [Tue, 31 Dec 2019 23:14:18 +0000 (10:14 +1100)]
Merge pull request #16170 from agh1/5.21.0-releasenotes-final
5.21.0 releasenotes final
Seamus Lee [Tue, 31 Dec 2019 23:13:01 +0000 (10:13 +1100)]
Merge pull request #16169 from agh1/5.21.0-releasenotes-final
Final 5.21.0 release notes
Andrew Hunt [Tue, 31 Dec 2019 23:07:30 +0000 (18:07 -0500)]
5.21.0 release notes: last batch of edits
Andrew Hunt [Tue, 31 Dec 2019 21:40:15 +0000 (16:40 -0500)]
5.21.0 release notes - updated big contributors list for 2019
Andrew Hunt [Tue, 31 Dec 2019 20:20:21 +0000 (15:20 -0500)]
5.21.0 release notes: added late changes
Coleman Watts [Tue, 31 Dec 2019 04:35:43 +0000 (23:35 -0500)]
Pass api4 getFields values through to getOptions
Seamus Lee [Tue, 31 Dec 2019 02:17:53 +0000 (13:17 +1100)]
Merge pull request #16165 from eileenmcnaughton/mod_member_api
[NFC] Extract duplicated code lines in test
eileen [Mon, 30 Dec 2019 04:48:47 +0000 (17:48 +1300)]
[NFC] Extract duplicated code lines in test
Seamus Lee [Mon, 30 Dec 2019 22:28:49 +0000 (09:28 +1100)]
Merge pull request #16164 from colemanw/controlField
Add controlField metadata for ChainSelect fields
Coleman Watts [Mon, 30 Dec 2019 20:32:22 +0000 (15:32 -0500)]
Add controlField metadata for ChainSelect fields
Seamus Lee [Mon, 30 Dec 2019 05:34:57 +0000 (16:34 +1100)]
Merge pull request #16163 from eileenmcnaughton/mod_member
[NFC] Clean up unit test
eileen [Mon, 30 Dec 2019 03:46:22 +0000 (16:46 +1300)]
[NFC] Clean up unit test
Removes duplication (indluding one test entirely covered by other tests. Switches to using api create
and removes passing in of as part of goal to eliminate this
Eileen McNaughton [Mon, 30 Dec 2019 03:08:39 +0000 (16:08 +1300)]
Merge pull request #16149 from seamuslee001/dev_core_1489
dev/core#1489 do not reconcile managed entities whilst in upgrade mod…
Eileen McNaughton [Mon, 30 Dec 2019 03:03:31 +0000 (16:03 +1300)]
Merge pull request #16117 from seamuslee001/dev_core_1424
dev/core#1424 Support MS Excel for Diacritic Characters when exporting a report to CSV
Coleman Watts [Sun, 29 Dec 2019 02:17:12 +0000 (21:17 -0500)]
Add contact type to schema to allow GetFields filtering
Eileen McNaughton [Mon, 30 Dec 2019 02:17:57 +0000 (15:17 +1300)]
Merge pull request #16154 from colemanw/getFields
Allow values to be passed to api4 GetFields
Seamus Lee [Sun, 29 Dec 2019 06:45:08 +0000 (17:45 +1100)]
Merge pull request #16161 from civicrm/5.21
5.21
Seamus Lee [Sun, 29 Dec 2019 06:43:43 +0000 (17:43 +1100)]
Merge pull request #16160 from seamuslee001/5.21
5.20.3 Release Notes
Tim Otten [Sun, 29 Dec 2019 04:30:22 +0000 (20:30 -0800)]
Update 5.20.3.md
Tim Otten [Sun, 29 Dec 2019 03:30:23 +0000 (19:30 -0800)]
Add release-notes/5.20.3.md
Seamus Lee [Sat, 28 Dec 2019 23:58:50 +0000 (10:58 +1100)]
Merge pull request #16157 from seamuslee001/dev_drupal_99
dev/drupal#99 Fix E-notice on undefined property id of non object
Seamus Lee [Sat, 28 Dec 2019 23:58:00 +0000 (10:58 +1100)]
Merge pull request #16156 from civicrm/5.21
5.21
Coleman Watts [Sat, 28 Dec 2019 14:31:40 +0000 (09:31 -0500)]
Allow values to be passed to api4 GetFields
So far this only filters custom fields by contact type,
but values is now being passed to allow more filtering.
Seamus Lee [Sat, 28 Dec 2019 21:49:25 +0000 (08:49 +1100)]
dev/drupal#99 Fix E-notice on undefined property id of non object
Seamus Lee [Sat, 28 Dec 2019 21:38:03 +0000 (08:38 +1100)]
Merge pull request #16155 from seamuslee001/5.21
dev/core#183 Ensure that having a rule where each field is the same w…
Seamus Lee [Sat, 28 Dec 2019 20:22:34 +0000 (07:22 +1100)]
dev/core#183 Ensure that having a rule where each field is the same weight with the threshold being the total sum of the weights does not cause a fatal error when searching for dupes
Seamus Lee [Sat, 28 Dec 2019 03:10:21 +0000 (14:10 +1100)]
Merge pull request #16152 from colemanw/multi
Api4 - Fix auto serialize array input for CheckBox/MultiSelect fields
colemanw [Fri, 27 Dec 2019 21:43:55 +0000 (16:43 -0500)]
Merge pull request #15135 from mattwire/case_links_refactor_report
Add case activity action links to activity report
colemanw [Thu, 26 Dec 2019 18:45:49 +0000 (13:45 -0500)]
Merge pull request #16079 from eileenmcnaughton/email
Remove unnecessary, and possibly incorrect query from email update
colemanw [Thu, 26 Dec 2019 18:41:18 +0000 (13:41 -0500)]
Merge pull request #16135 from eileenmcnaughton/pay_total
[REF] simplify recordAdjustedAmt function
Coleman Watts [Thu, 26 Dec 2019 15:54:33 +0000 (10:54 -0500)]
Api4 - Fix auto serialize array input for CheckBox/MultiSelect fields
colemanw [Thu, 26 Dec 2019 16:03:21 +0000 (11:03 -0500)]
Merge pull request #16151 from eileenmcnaughton/seamus
[REF] extract member form batch update & add test
Yashodha Chaku [Thu, 26 Dec 2019 07:53:59 +0000 (13:23 +0530)]
Merge pull request #16131 from eileenmcnaughton/acl
[Ref] improve readability of acl code
eileen [Thu, 26 Dec 2019 04:02:27 +0000 (17:02 +1300)]
[REF] extract member form batch update & add test
Eileen McNaughton [Thu, 26 Dec 2019 03:02:31 +0000 (16:02 +1300)]
Merge pull request #16112 from seamuslee001/remove_zend_validator
Remove unneeded zendframwork/zend-validator and zendframwork/zend-stdlib packages as not required by …
Seamus Lee [Mon, 23 Dec 2019 23:41:08 +0000 (10:41 +1100)]
dev/core#1489 do not reconcile managed entities whilst in upgrade mode and add in a step at the end of the upgrade process to reconcile managed entiies and add in civicrm_permissions hook to the whitelist of upgrade friendly hooks
Matthew Wire [Mon, 23 Dec 2019 13:11:44 +0000 (13:11 +0000)]
Merge pull request #16140 from eileenmcnaughton/part_name
dev/event#25 Fix regression on billing name overwrite
Seamus Lee [Mon, 23 Dec 2019 05:02:40 +0000 (16:02 +1100)]
Merge pull request #16136 from eileenmcnaughton/member_test
[REF] remove CRM_Core_Error check
Eileen McNaughton [Mon, 23 Dec 2019 04:41:10 +0000 (17:41 +1300)]
Merge pull request #16145 from eileenmcnaughton/index_api
Add api to check for missing indices
Seamus Lee [Mon, 23 Dec 2019 00:55:03 +0000 (11:55 +1100)]
Merge pull request #16144 from eileenmcnaughton/acl_index
dev/core#1486 Add index to civicrm_acl_cache.modified_date