Eileen McNaughton [Mon, 6 Aug 2018 20:49:17 +0000 (08:49 +1200)]
Merge pull request #12444 from mattwire/fixduplicatecaseactivities
dev/core#245 Fix duplicate activities showing on case activities tab when they have multiple target/assignee contacts
Eileen McNaughton [Mon, 6 Aug 2018 19:48:02 +0000 (07:48 +1200)]
Merge pull request #12625 from colemanw/recVer
Bump recommended php version to 7.1 and min recommended to 7.0
colemanw [Mon, 6 Aug 2018 01:50:14 +0000 (21:50 -0400)]
Merge pull request #12620 from mattwire/fileoncase_activityparams
Don't duplicate activity when filing on case
Seamus Lee [Sun, 5 Aug 2018 22:18:36 +0000 (08:18 +1000)]
Merge pull request #12609 from mattwire/joomla_cron_timezone
Make sure Joomla timezone is set for cron jobs
Eileen McNaughton [Sun, 5 Aug 2018 21:15:38 +0000 (09:15 +1200)]
Merge pull request #12611 from KarinG/FinancialAudit
[PHPUnit test only] Adding in assertions re: Line Item and Contribution data-integrity.
Coleman Watts [Sat, 4 Aug 2018 22:30:38 +0000 (18:30 -0400)]
Bump recommended php version to 7.1 and min recommended to 7.0
KarinG [Sat, 4 Aug 2018 15:19:59 +0000 (09:19 -0600)]
Add comments
colemanw [Sat, 4 Aug 2018 13:02:13 +0000 (09:02 -0400)]
Merge pull request #12612 from eileenmcnaughton/more_lower
Further removal of instance of using LOWER() rather than relying on mysql non-case-sensitivity.
colemanw [Sat, 4 Aug 2018 01:35:20 +0000 (21:35 -0400)]
Merge pull request #12621 from JKingsnorth/remove-unused-vars-process-parti
Remove unused variables from process_participants job
colemanw [Sat, 4 Aug 2018 00:28:16 +0000 (20:28 -0400)]
Merge pull request #12608 from eileenmcnaughton/export_sigs
Stop passing imProviders & phoneTypes - use CRM_Core_PseudoConstant:getLabel
Eileen McNaughton [Fri, 3 Aug 2018 23:09:28 +0000 (11:09 +1200)]
Merge pull request #12026 from michaelmcandrew/pass-mailingJobId-to-hookTokenValues
pass mailingJobId to hook_tokenValues
JKingsnorth [Fri, 3 Aug 2018 22:25:23 +0000 (23:25 +0100)]
Remove unused variables
Matthew Wire (MJW Consulting) [Fri, 3 Aug 2018 16:31:17 +0000 (17:31 +0100)]
Set activity params correctly when filing an activity on case
eileen [Thu, 2 Aug 2018 02:02:06 +0000 (14:02 +1200)]
Further removal of instance of using LOWER() rather than relying on mysql non-case-sensitivity.
Note I could not find any way to call this so I added deprecation notices
Per #12494 the use of LOWER
hurts performance
fails to return results on some char sets
messes with REGEX
This is part of a continued (we removed from contribution search fields last year)
staggered approach to removing this old mechanism
Eileen McNaughton [Fri, 3 Aug 2018 08:33:52 +0000 (20:33 +1200)]
Merge pull request #12618 from colemanw/teenly
Fix teeny typo
Coleman Watts [Fri, 3 Aug 2018 04:28:34 +0000 (00:28 -0400)]
Fix teeny typo
Eileen McNaughton [Fri, 3 Aug 2018 03:36:53 +0000 (15:36 +1200)]
Merge pull request #12617 from civicrm/5.5
5.5
Seamus Lee [Fri, 3 Aug 2018 03:28:23 +0000 (13:28 +1000)]
Merge pull request #12616 from eileenmcnaughton/report_date
Test fix, update activity report adds a this.month filter by default, accomodate
eileen [Thu, 2 Aug 2018 23:33:44 +0000 (11:33 +1200)]
Test fix, update activity report adds a this.month fiter by default so make dates movable.
I also put time at the end of the day to avoid bounciness on status being overdue
colemanw [Thu, 2 Aug 2018 09:08:16 +0000 (05:08 -0400)]
Merge pull request #12595 from eileenmcnaughton/payment_processor_domain
API : Set current domain as a sensible default for payment processor
Tim Otten [Thu, 2 Aug 2018 01:26:48 +0000 (18:26 -0700)]
Merge remote-tracking branch 'origin/5.5'
Tim Otten [Wed, 1 Aug 2018 21:03:16 +0000 (14:03 -0700)]
5.4.0.md - Tweak cache notes
Andrew Hunt [Wed, 1 Aug 2018 03:38:58 +0000 (23:38 -0400)]
5.4.0 release notes (#12605)
* 5.4.0 release notes: raw from script
* 5.4.0 release notes: added boilerplate
* 5.4.0 release notes: finished documenting changes
* 5.4.0 release notes: updated contributors
CiviCRM [Thu, 2 Aug 2018 01:18:07 +0000 (01:18 +0000)]
Set version to 5.6.alpha1
CiviCRM [Thu, 2 Aug 2018 01:06:54 +0000 (01:06 +0000)]
Set version to 5.5.beta1
Eileen McNaughton [Wed, 1 Aug 2018 21:16:31 +0000 (09:16 +1200)]
Merge pull request #12607 from colemanw/caseDetails
dev/core#289 - Fix links on case dashboard
Eileen McNaughton [Wed, 1 Aug 2018 21:15:03 +0000 (09:15 +1200)]
Merge pull request #12610 from mattwire/recurtab_sort_desc
dev/core/issues/277 Sort recurring contributions by newest first
colemanw [Wed, 1 Aug 2018 16:36:39 +0000 (12:36 -0400)]
Merge pull request #12606 from JMAConsulting/custom-value-update
Customvalue ID is ignored
KarinG [Wed, 1 Aug 2018 16:11:17 +0000 (10:11 -0600)]
for Jenkins.
KarinG [Wed, 1 Aug 2018 14:34:07 +0000 (08:34 -0600)]
remove Initials.
KarinG [Wed, 1 Aug 2018 14:22:22 +0000 (08:22 -0600)]
Adding in assertions re: lineItem and Contribution data-integrity.
Matthew Wire [Sun, 8 Jul 2018 17:20:30 +0000 (18:20 +0100)]
Fix duplicate activities showing on case activities tab when they have multiple target/assignee contacts
Matthew Wire (MJW Consulting) [Wed, 1 Aug 2018 09:58:56 +0000 (10:58 +0100)]
Sort recurring contributions by newest first
Matthew Wire (MJW Consulting) [Wed, 1 Aug 2018 09:39:18 +0000 (10:39 +0100)]
Make sure Joomla timezone is set for cron jobs
Eileen McNaughton [Wed, 1 Aug 2018 07:43:39 +0000 (19:43 +1200)]
Merge pull request #12558 from totten/master-prevnext-misc
(dev/core#217) PrevNext - Allow swapping getPositions (etal) for contact-search
eileen [Wed, 1 Aug 2018 04:48:14 +0000 (16:48 +1200)]
Stop passing imProviders & phoneTypes - use CRM_Core_PseudoConstant::getLabel(
Note this function is called once per export - not per row
colemanw [Wed, 1 Aug 2018 04:25:23 +0000 (00:25 -0400)]
Merge pull request #12587 from eileenmcnaughton/header_test
Export - add tests out header output, move phone_type_id to metadata
colemanw [Wed, 1 Aug 2018 04:17:26 +0000 (00:17 -0400)]
Merge pull request #12585 from eileenmcnaughton/param_passing
Stdise references to BAO_Query->_fields [nfc]
Coleman Watts [Wed, 1 Aug 2018 04:12:17 +0000 (00:12 -0400)]
Fix activity edit link
Coleman Watts [Wed, 1 Aug 2018 02:37:16 +0000 (22:37 -0400)]
dev/core#289 - Fix caseId url param
Eileen McNaughton [Tue, 31 Jul 2018 22:11:56 +0000 (10:11 +1200)]
Merge pull request #12553 from pradpnayak/77
dev/core/issues/277, Fixed count to include only live recurring contr…
Eileen McNaughton [Tue, 31 Jul 2018 21:56:04 +0000 (09:56 +1200)]
Merge pull request #12602 from colemanw/checkIfFieldExists
NFC - Deprecate duplicate function
colemanw [Tue, 31 Jul 2018 20:01:05 +0000 (16:01 -0400)]
Merge pull request #12604 from tschuettler/296-custom-value-return-field
api - CustomValue::get - add handling for comma separated return fields
deb.monish [Tue, 31 Jul 2018 19:47:10 +0000 (01:17 +0530)]
Customvalue ID is ignored
Thomas [Tue, 31 Jul 2018 14:13:01 +0000 (16:13 +0200)]
Explode return values if it is not already an array.
Thomas [Tue, 31 Jul 2018 14:10:51 +0000 (16:10 +0200)]
Add unit tests for CustomValueGet return fields
eileen [Mon, 30 Jul 2018 10:46:59 +0000 (22:46 +1200)]
Stop passing relationQuery object now it is not required
eileen [Sat, 28 Jul 2018 04:29:16 +0000 (16:29 +1200)]
Stdise references to BAO_Query->_fields [nfc]
Eileen McNaughton [Mon, 30 Jul 2018 20:14:48 +0000 (08:14 +1200)]
Merge pull request #12596 from eileenmcnaughton/export_ref
[NFC] Export - don't pass arrays as reference when they are not changed
Eileen McNaughton [Mon, 30 Jul 2018 20:03:00 +0000 (08:03 +1200)]
Merge pull request #12591 from eileenmcnaughton/membership_type
Towards using EntityForm.tpl for Membership type & enabling custom data
Eileen McNaughton [Mon, 30 Jul 2018 19:55:26 +0000 (07:55 +1200)]
Merge pull request #12600 from tschuettler/293-geocoding
Skip check for format method when there is no valid geocoding provider
Coleman Watts [Mon, 30 Jul 2018 15:58:03 +0000 (11:58 -0400)]
Stricter validation for checkIfFieldExists
Coleman Watts [Mon, 30 Jul 2018 15:52:05 +0000 (11:52 -0400)]
NFC - Deprecate duplicate function
Thomas [Mon, 30 Jul 2018 14:52:14 +0000 (16:52 +0200)]
Skip check for format method when there is no valid geocoding provider
eileen [Mon, 30 Jul 2018 11:11:48 +0000 (23:11 +1200)]
Export - don't pass arrays as reference when they are not changed
eileen [Sat, 28 Jul 2018 05:35:42 +0000 (17:35 +1200)]
Move definition of phone_type_id to the xml.
This has the side effect of making it such that it only gets 16 char rather than 255. I thnk this is 'ok' here but there is a separate issue open to increase the varchar for all fields on export
eileen [Sat, 28 Jul 2018 05:00:42 +0000 (17:00 +1200)]
Add tests for header output
Seamus Lee [Mon, 30 Jul 2018 10:15:04 +0000 (20:15 +1000)]
Merge pull request #12535 from eileenmcnaughton/export_participant_test
Export Add unit test + minor refactor covering specifiable payment output fields for participant export.
eileen [Mon, 30 Jul 2018 05:51:40 +0000 (17:51 +1200)]
Set current domain as a sensible default for payment processor domain
Eileen McNaughton [Sun, 29 Jul 2018 22:17:17 +0000 (10:17 +1200)]
Merge pull request #12592 from civicrm/5.4
5.4 to master
Eileen McNaughton [Sun, 29 Jul 2018 22:16:23 +0000 (10:16 +1200)]
Merge pull request #12590 from totten/5.4-flushcache
(dev/core#284) System::flushCache - Reproduce legacy cache behavior. Improve test performance.
eileen [Sun, 29 Jul 2018 04:30:52 +0000 (16:30 +1200)]
Remove some fields from the form to rely on EntityTrait
eileen [Sun, 29 Jul 2018 04:25:36 +0000 (16:25 +1200)]
Convert 'name' & 'description' to use the entity Fields format.
Note that doing a partial conversion in the template is just a stepping stone to using the
EntityField template, when lots of fields need conversion / review it allows us to break it up
Simplify converstion of fields, convert 2 more
eileen [Sun, 29 Jul 2018 04:12:42 +0000 (16:12 +1200)]
Define entity data for membership type form
Eileen McNaughton [Sun, 29 Jul 2018 02:43:20 +0000 (14:43 +1200)]
Merge pull request #12589 from seamuslee001/password_size
dev/core#291 Allow for field size to be set for password fields
Tim Otten [Sat, 28 Jul 2018 22:31:20 +0000 (15:31 -0700)]
Overview
----------------------------------------
`CRM_Utils_System::flushCache()` calls `CRM_Utils_Cache::singleton()->flush()`.
In `5.3`, this triggered a cascading effect; in development of `5.4.alpha`,
some of the cascades were overzealous and we revised to get tighter control
over cascading.
With an aim to being conservative and reproducing old behavior, I previously
patched `5.4.alpha` to add several extra flushes and simulate the old cascades.
However, it wasn't really as conservative as hoped -- because the "old
behavior" depended on the environment. This patch brings us closer the "old
behavior".
See also: https://lab.civicrm.org/dev/core/issues/284
Before (Behavior in version <=`5.3`)
----------------------------------------
On systems with memory-backed caches, `flushCache()` had an aggressive
cascading side-effect where several named caches (`settings`, etc) were also
flushed.
On systems with a default configuration (SQL+ArrayCache), `flushCache()` had a
very limited cascading effect -- it *only cleared the in-process ArrayCache*.
The bulk of the cache content was preserved in SQL.
Before (Behavior in version ~= `5.4.alpha`)
----------------------------------------
To simulate the cascading effect, `flushCache()` explicitly flushes a
half-dozen individual caches. (These half-dozen are chosen to match the old
cascade list and exclude some new things which would problematic.)
On systems with memory-backed caches, this reproduces the aggressive cascading
effect.
On systems with a default configuration (SQL+ArrayCache), this amplifies the
flushing -- because it also destroys the underlying SQL caches.
This has the side-effect of significantly degrading performance of the test
suite.
After (Behavior with patch)
----------------------------------------
`CRM_Utils_System::flushCache` calls `CRM_Utils_Cache::singleton()->flush()`.
To simulate the cascading effect, `flushCache()` explicitly flushes a
half-dozen individual caches... *but only on memory-backed* systems.
On systems with memory-backed caches, this reproduces the aggressive cascading
effect.
On systems with a default configuration (SQL+ArrayCache), this is closer to the
old behavior. The bulk of the cache remains available in SQL.
Based on local spot-checking, this restores performance of the test suite.
Comments
----------------------------------------
Deep down, I don't really believe the cascading effect is a good thing. At
some point, I'd rather just remove these bits. But in absence of a crystal
ball to predict the side-effects of that, I think it's good to find a better
approximation of the old behavior.
Eileen McNaughton [Sat, 28 Jul 2018 23:05:41 +0000 (11:05 +1200)]
Merge pull request #12588 from mattwire/5.4_backportcasefixes
Backport "Fix regression on case export" to 5.4
Seamus Lee [Sat, 28 Jul 2018 22:22:52 +0000 (08:22 +1000)]
dev/core#291 Allow for field size to be set for password fields
eileen [Thu, 19 Jul 2018 22:47:44 +0000 (10:47 +1200)]
Fix regression on case export from recent export fix
https://github.com/civicrm/civicrm-core/commit/
3b4adc92793dccfa446cf66f0740edb543f110d7 changed the way componentmode is defined
It now seems inconsistent
Matthew Wire [Fri, 15 Jun 2018 09:23:33 +0000 (10:23 +0100)]
Non functional changes towards shared functions in Core_Form_Task
Eileen McNaughton [Fri, 27 Jul 2018 07:05:56 +0000 (19:05 +1200)]
Merge pull request #12578 from JKingsnorth/patch-10
(NFC) Update readme to link to GitLab instead of JIRA
Seamus Lee [Fri, 27 Jul 2018 03:44:23 +0000 (13:44 +1000)]
Merge pull request #12577 from eileenmcnaughton/export_sql_columns
Export clean up sql columns
Eileen McNaughton [Fri, 27 Jul 2018 01:37:22 +0000 (13:37 +1200)]
Merge pull request #12530 from colemanw/plainObject
crmRouteBinder - Don't convert arrays to objects
Eileen McNaughton [Fri, 27 Jul 2018 00:17:01 +0000 (12:17 +1200)]
Merge pull request #12573 from pradpnayak/ThrowExceptionOnGetValue
Added code to throw exception on getvalue api call
eileen [Thu, 26 Jul 2018 13:48:53 +0000 (01:48 +1200)]
Extract getMungedFieldName
eileen [Thu, 26 Jul 2018 13:40:30 +0000 (01:40 +1200)]
Extract getSqlColumnDefinition off to processor class.
Note that I wrote test coverage that was pretty extensive on the output of this function earlier
John Kingsnorth [Thu, 26 Jul 2018 22:19:03 +0000 (23:19 +0100)]
Update readme to link to GitLab instead of JIRA
Coleman Watts [Sat, 21 Jul 2018 21:18:41 +0000 (17:18 -0400)]
crmRouteBinder - Don't convert arrays to objects
Eileen McNaughton [Thu, 26 Jul 2018 20:51:36 +0000 (08:51 +1200)]
Merge pull request #12388 from pradpnayak/optionValuePaymentMethod-b
dev/financial/issues/24, Moved code from form layer to BAO and used api instead of BAO function
colemanw [Thu, 26 Jul 2018 14:55:56 +0000 (10:55 -0400)]
Merge pull request #12416 from pradpnayak/232
dev/core/issues/232, Some smart groups and some searches not returning any contacts
Pradeep Nayak [Thu, 26 Jul 2018 11:05:45 +0000 (12:05 +0100)]
Added code to throw exception on getvalue api call
Pradeep Nayak [Tue, 26 Jun 2018 23:31:34 +0000 (05:01 +0530)]
Moved code from form layer to BAO and used api instead of BAO function
Pradeep Nayak [Thu, 26 Jul 2018 09:57:46 +0000 (10:57 +0100)]
updated explode function in custom search
Pradeep Nayak [Thu, 26 Jul 2018 09:57:14 +0000 (10:57 +0100)]
dev/core/issues/232, fixed how contact sub type is using separator
Eileen McNaughton [Thu, 26 Jul 2018 09:55:34 +0000 (21:55 +1200)]
Merge pull request #12556 from totten/master-prevnext-selection
(dev/core#217) PrevNext - Migrate selection methods
Pradeep Nayak [Fri, 13 Jul 2018 13:26:56 +0000 (14:26 +0100)]
added unit test to search contact based on contact sub type
Eileen McNaughton [Thu, 26 Jul 2018 06:35:16 +0000 (18:35 +1200)]
Merge pull request #12571 from civicrm/5.4
Add 5.3.2 release notes (#12570)
Seamus Lee [Thu, 26 Jul 2018 06:34:42 +0000 (16:34 +1000)]
Add 5.3.2 release notes (#12570)
Yashodha Chaku [Thu, 26 Jul 2018 03:12:44 +0000 (08:42 +0530)]
[reviewed, pending rebase] CRM-20703 - Event Contribution Created When No Payment Option Provided (#12367)
* CRM-20703 - Event Contribution Created When No Payment Option Provided
* throw form rule when amount block is active
Eileen McNaughton [Thu, 26 Jul 2018 03:04:28 +0000 (15:04 +1200)]
Merge pull request #12569 from civicrm/5.4
5.4
Eileen McNaughton [Thu, 26 Jul 2018 02:27:36 +0000 (14:27 +1200)]
Merge pull request #12568 from kcristiano/5.4
dev/279 - When Merging two contacts flip, prev, next not working
Seamus Lee [Thu, 26 Jul 2018 00:29:35 +0000 (10:29 +1000)]
Merge pull request #12563 from eileenmcnaughton/enotice54
dev/core#276 enotice fix
Kevin Cristiano [Wed, 25 Jul 2018 22:36:50 +0000 (18:36 -0400)]
dev/279 - When Merging two contacts flip, prev, next not working
Affects Joomla and WordPress
Signed-off-by: Kevin Cristiano <kcristiano@tadpole.cc>
eileen [Wed, 25 Jul 2018 21:35:32 +0000 (09:35 +1200)]
dev/core#276 enotice fix
colemanw [Wed, 25 Jul 2018 13:38:31 +0000 (09:38 -0400)]
Merge pull request #12185 from eileenmcnaughton/entity_form_url_defaults
Entity form : Establish methodology to allow default values to be passed in on the url
colemanw [Wed, 25 Jul 2018 12:38:27 +0000 (08:38 -0400)]
Merge pull request #12561 from eileenmcnaughton/mailing
CRM-21768_NOFOLLOW_links_in_public_online_view_of_mailings
colemanw [Wed, 25 Jul 2018 12:24:12 +0000 (08:24 -0400)]
Merge pull request #12560 from scardinius/core-278
dev/core#278 Fix DB syntax error when try to search deleted cases
Richard van Oosterhout [Thu, 15 Feb 2018 13:43:43 +0000 (14:43 +0100)]
CRM-21768_NOFOLLOW_links_in_public_online_view_of_mailings
scardinius [Wed, 25 Jul 2018 08:41:34 +0000 (10:41 +0200)]
dev/core#278 Fix DB syntax error when try to search deleted cases
Tim Otten [Mon, 2 Jul 2018 23:57:51 +0000 (16:57 -0700)]
(dev/core#217) PrevNext - Allow swapping `getCount()` for purposes of contact-search
The `getCount()` function is used by both contact-search and dedupe-merge use-cases.
* Contact-search
* `CRM/Contact/Selector.php: $countRow = CRM_Core_BAO_PrevNextCache::getCount($cacheKey, NULL, "entity_table = 'civicrm_contact'");`
* Dedupe-merge
* `CRM/Contact/Page/AJAX.php: $iTotal = CRM_Core_BAO_PrevNextCache::getCount($cacheKeyString, $join, $whereClause, '=', $queryParams);`
* `CRM/Contact/Page/DedupeMerge.php: $total = CRM_Core_BAO_PrevNextCache::getCount($cacheKeyString, NULL, ($onlyProcessSelected ? "pn.is_selected = 1" : NULL));`
Our aim in developing `CRM_Core_PrevNextCache_Interface` is to allow contact-search to swap a MySQL
backend with a Redis backend -- and dedupe-merge should continue as-is (whether or not Redis is
available). This basically means:
* Contact-search switches to using `Civi::service('prevnext')->getCount()`
* Dedupe-merge continues using `CRM_Core_BAO_PrevNextCache::getCount()`
Note that the `Interface::getCount()` is simpler than the BAO's variant. This is good because:
* Contact-search doesn't need as many parameters.
* Dedupe-merge still needs all the parameters.
* Adding all parameters would make it hard to implement on other backends. (This is esp true of SQL-style options `$join` and `$where`.)