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.
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
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
Seamus Lee [Thu, 26 Jul 2018 06:34:42 +0000 (16:34 +1000)]
Add 5.3.2 release notes (#12570)
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
Eileen McNaughton [Tue, 24 Jul 2018 21:58:28 +0000 (09:58 +1200)]
Merge pull request #12552 from colemanw/dedupe54
Handle 'Check for Matching Contact(s)' button with ajax
Coleman Watts [Tue, 24 Jul 2018 18:42:06 +0000 (14:42 -0400)]
Exclude current contact from dupe check
Coleman Watts [Tue, 24 Jul 2018 04:15:32 +0000 (00:15 -0400)]
Handle 'Check for Matching Contact(s)' button with ajax
Eileen McNaughton [Tue, 24 Jul 2018 11:34:13 +0000 (23:34 +1200)]
Merge pull request #12551 from seamuslee001/missed_54_commits
Included missed 5.3 commits
Seamus Lee [Mon, 23 Apr 2018 04:52:46 +0000 (14:52 +1000)]
Resolve Securty/Core#13 Fix Security/Core SQLi in getTree function of CustomGroup Class
Seamus Lee [Tue, 24 Jul 2018 10:26:34 +0000 (20:26 +1000)]
Merge pull request #12538 from JKingsnorth/patch-8
dev/core#131 Stop Monmouthshire from breaking upgrades
John Kingsnorth [Mon, 23 Jul 2018 16:01:22 +0000 (17:01 +0100)]
dev/core#131 Stop Monmouthshire from breaking upgrades
Eileen McNaughton [Mon, 23 Jul 2018 04:03:15 +0000 (16:03 +1200)]
Merge pull request #12531 from seamuslee001/fix_line_endings
(NFC) Convert files to use linux line endings not windows
Eileen McNaughton [Mon, 23 Jul 2018 03:52:16 +0000 (15:52 +1200)]
Merge pull request #12533 from JMAConsulting/dev-core-272-54
dev/core#272 : Fatal Error (Regression) on PCP pages associated with Events
deb.monish [Sun, 22 Jul 2018 06:20:43 +0000 (11:50 +0530)]
dev/core#272 : Fatal Error (Regression) on PCP pages associated with Events
Seamus Lee [Sat, 21 Jul 2018 22:02:27 +0000 (08:02 +1000)]
(NFC) Convert files to use linux line endings not windows
Seamus Lee [Fri, 20 Jul 2018 02:58:14 +0000 (12:58 +1000)]
Merge pull request #12519 from totten/5.4-purify
(Forward port) Add Smarty modifier to purify HTML
Sean Madsen [Sun, 22 Apr 2018 13:29:03 +0000 (09:29 -0400)]
Add Smarty modifier to purify HTML
With this modifier, we can write Smarty code like:
<div>{$untrustedHTML|purify}</div>
By using the purify modifier, we've protected against XSS, even if the
output variable contains HTML.
Eileen McNaughton [Thu, 19 Jul 2018 21:14:26 +0000 (09:14 +1200)]
Merge pull request #12514 from seamuslee001/5-3-1-update-notes
Update 5.3.1 Release Notes to include final SA
Seamus Lee [Thu, 19 Jul 2018 21:02:03 +0000 (07:02 +1000)]
Update 5.3.1 Release Notes to include final SA
Eileen McNaughton [Wed, 18 Jul 2018 22:34:36 +0000 (10:34 +1200)]
Merge pull request #12504 from eileenmcnaughton/yashi
Fix misformatted start_date default on new contribution page
Seamus Lee [Mon, 16 Jul 2018 05:27:14 +0000 (15:27 +1000)]
Add in 5.3.1 Release notes
eileen [Tue, 12 Jun 2018 22:22:44 +0000 (10:22 +1200)]
Add escape to various lines in merge.tpl
Coleman Watts [Wed, 25 Apr 2018 14:53:36 +0000 (10:53 -0400)]
Escape js strings in smarty templates
Sean Madsen [Sun, 22 Apr 2018 13:53:29 +0000 (09:53 -0400)]
security/core#3 Improve output escaping for errors
- In the template, use either `escape` or `purify` for all outputs.
- Remove `htmlspecialchars()` call in PHP since it's now happening in
Smarty via `escape`.
Sean Madsen [Sun, 22 Apr 2018 00:25:55 +0000 (20:25 -0400)]
security/core#2 Harden some of the "mode" inputs
Sean Madsen [Sun, 22 Apr 2018 15:07:56 +0000 (11:07 -0400)]
security/core#1 Escape outputs in report stats
Seamus Lee [Thu, 26 Apr 2018 21:55:56 +0000 (07:55 +1000)]
Resolve #19 Fix regression following upgrade to latest CKEditor by getting uploaded file response back in json
Seamus Lee [Tue, 24 Apr 2018 22:48:36 +0000 (08:48 +1000)]
Update to latest CKEdtior
Sean Madsen [Sun, 22 Apr 2018 02:11:56 +0000 (22:11 -0400)]
Add HTML purification to status messages
This is a security protection measure that protects us just a little bit
more against XSS.
Sean Madsen [Sun, 22 Apr 2018 23:06:46 +0000 (19:06 -0400)]
security/core#14 Add output encoding within js
Sean Madsen [Sun, 22 Apr 2018 21:50:47 +0000 (17:50 -0400)]
security/core#14 Validate "context" inputs
When "context" is passed as a GET parameter, ensure that its values is
a valid "Alphanumeric" type. This helps prevent XSS when the "context"
value finds its way into templates that lack HTML output encoding.
Replace...
CRM_Utils_Request::retrieve\((['"])context\1,(\s*)(['"])String\3
...with...
CRM_Utils_Request::retrieve\($1context$1,$3Alphanumeric$3
Also search for the following and manually fix:
\$_GET\[(['"])context\1\]
\$_POST\[(['"])context\1\]
\$_REQUEST\[(['"])context\1\]
Eileen McNaughton [Wed, 18 Jul 2018 21:54:15 +0000 (09:54 +1200)]
Merge pull request #12492 from eileenmcnaughton/msg_fix
dev/core/#/258 Fix message update routine.
Eileen McNaughton [Wed, 18 Jul 2018 12:57:58 +0000 (00:57 +1200)]
Merge pull request #12502 from eileenmcnaughton/no_pay
Prevent financial transactions from being saved with no payment instr…
eileen [Wed, 18 Jul 2018 01:19:56 +0000 (13:19 +1200)]
Fix misformatted start_date default on new contribution page
Unreleased regression from https://github.com/civicrm/civicrm-core/pull/11881
see https://lab.civicrm.org/dev/core/issues/263
eileen [Tue, 17 Jul 2018 21:33:42 +0000 (09:33 +1200)]
Prevent financial transactions from being saved with no payment instrument
eileen [Tue, 17 Jul 2018 07:59:27 +0000 (19:59 +1200)]
Fix message update routine.
Turns out this was seeming to pass but not because the test wasn't running.
Seamus Lee [Tue, 10 Jul 2018 20:36:35 +0000 (06:36 +1000)]
Merge pull request #12447 from mattwire/allcontactexport_regression
dev/core#249 Fix crash when performing export all contacts from search
Matthew Wire [Mon, 9 Jul 2018 22:38:10 +0000 (23:38 +0100)]
Fix crash when performing export all contacts from search
Seamus Lee [Fri, 6 Jul 2018 05:46:41 +0000 (15:46 +1000)]
Merge pull request #12417 from aydun/core_124_template_upgrade
Follow up to PR 12160 to update the DB version of the templates
Seamus Lee [Fri, 6 Jul 2018 05:46:13 +0000 (15:46 +1000)]
Merge pull request #12426 from totten/master-container-cache
Change default for CIVICRM_CONTAINER_CACHE to simplify admin/developer experience
Seamus Lee [Fri, 6 Jul 2018 01:13:05 +0000 (11:13 +1000)]
Merge pull request #12425 from seamuslee001/5_3_alpha1_fix
Ensure db updates are run for 5.3.alpha1
Tim Otten [Thu, 5 Jul 2018 21:12:39 +0000 (14:12 -0700)]
Change default for CIVICRM_CONTAINER_CACHE to simplify admin/developer experience
In discussion of cache-related PRs for Civi 5.3, there were a few
reports/issues from developers observing `ServiceNotFoundException`. This
is because there's not much awareness about how service-definitions are
cached. It shouldn't be a significant issue for production systems running
vanilla code, but for admins and developers (who juggle patches/branches),
it can cause confusion/support-issues/false-failures. This PR aims to
reduce those.
(This is a follow-up/substitute for #12401.)
Before
------
* The default value of `CIVICRM_CONTAINER_CACHE` is `always`.
After
-----
* The default value of `CIVICRM_CONTAINER_CACHE` is `auto`.
Technical Details
-----------------
The Symfony container essentially stores a list of "services". In some
Symfony-based apps, building the list of services can be time consuming, so
it's common to cache this.
In Civi, this cache physically appears as
`files/civicrm/templates_c/CachedCiviContainer.*.php`. The constant
`CIVICRM_CONTAINER_CACHE` determines how Civi manages the cache. There are
three available policies:
* `never`: This means we never use the cache. You never have to worry about
staleness. But it means we have to fire `hook_civicrm_container` on every
page-request, and we go through any container-compilation tasks.
This would have the fewest support-issues for devs and advanced admins.
* `always`: This means we always use whatever is in the cache. It never
(automatically) rebuilds the cache or checks freshness... if you make
change, then you must flush the cache explicitly. This should be the
fastest in production.
* `auto`: This means we typically use the cache (avoiding
hooks/recompilation), but it has to `stat()` a half-dozen files to check
the modification time. (To wit: if the timestamp on
`Civi/Core/Container.php` changes, then we discard the cache.)
Since performance is a consideration, I did some light benchmarking on my
laptop (fetching a basic public Civi page 100 times across 3 threads).
https://gist.github.com/totten/
ec4bffd723afb7967aec56a3040b9ca3
In these results, the `never` policy appears to be ~15-20ms slower than
`auto` or `always`. `auto` is only ~2ms slower than `always`.
The other consideration is accuracy -- `auto` will usually re-compile if you
make a change, but there are some edge-cases where you must still flush
manually. (In particular -- when you first implement
`hook_civicrm_container` in a new extension, it might not be aware of the
new extension. And extensions need to call `$container->addResource()`.)
However, overall, `auto` is a pretty good compromise that's almost as fast
you can get and works out-of-the-box for many dev/admin scenarios.
Seamus Lee [Thu, 5 Jul 2018 21:24:27 +0000 (07:24 +1000)]
Ensure db updates are run for 5.3.alpha1
Aidan Saunders [Wed, 4 Jul 2018 14:06:17 +0000 (15:06 +0100)]
Follow up to PR 12160 to update the DB version of the templates
CiviCRM [Wed, 4 Jul 2018 19:53:35 +0000 (19:53 +0000)]
Set version to 5.4.beta1
colemanw [Wed, 4 Jul 2018 14:35:37 +0000 (10:35 -0400)]
Merge pull request #11998 from compucorp/PCHR-3410-add-default-assignee-when-creating-cases
dev/core#107: Add default assignee when creating cases
René Olivo [Tue, 22 May 2018 20:51:23 +0000 (16:51 -0400)]
dev/core#107 Refactor selection of default assignee by relationship type
René Olivo [Thu, 15 Mar 2018 16:00:05 +0000 (12:00 -0400)]
dev/core#107 Automatically add default assignees when creating new cases
This feature allows users to define default assignees for each activity in a case type.
When creating a new case contacts are assigned to activities automatically by following
one of these rules:
* By relationship to case client
* The user creating the case
* A specific contact
* None (default)
Eileen McNaughton [Wed, 4 Jul 2018 07:52:01 +0000 (19:52 +1200)]
Merge pull request #12411 from eileenmcnaughton/matt_opt
Fix sample custom data is_reserved=0
Eileen McNaughton [Wed, 4 Jul 2018 06:11:11 +0000 (18:11 +1200)]
Merge pull request #12403 from civicrm/5.3
5.3
Eileen McNaughton [Wed, 4 Jul 2018 06:10:52 +0000 (18:10 +1200)]
Merge pull request #12409 from eileenmcnaughton/paydata
dev/core/issues/211 Fix mis-allocation of financial transactions when editing payment method on a completed payment
Eileen McNaughton [Wed, 4 Jul 2018 06:10:35 +0000 (18:10 +1200)]
Add late changes
eileen [Tue, 3 Jul 2018 23:52:22 +0000 (11:52 +1200)]
Fix mis-allocation of financial transactions
Per
https://lab.civicrm.org/dev/core/issues/211 there seems to be an issue with assigning entity_financial_trxn
entries the wrong financial_trxn_id - I cannot find any recent change that would have caused this
(unless it's simply the greater use of the payment edit block) - it has been reported as working in
5.0.2.
Matthew Wire [Tue, 29 May 2018 21:00:39 +0000 (22:00 +0100)]
Fix sample custom data is_reserved=0
Eileen McNaughton [Wed, 4 Jul 2018 04:38:18 +0000 (16:38 +1200)]
Merge pull request #12233 from mattwire/optiongroup_form
dev/core#155 Improve Option Groups form
Seamus Lee [Wed, 4 Jul 2018 02:22:45 +0000 (12:22 +1000)]
Merge pull request #12296 from eileenmcnaughton/greeting
Use email_greeting where possible in receipts
Eileen McNaughton [Wed, 4 Jul 2018 02:14:08 +0000 (14:14 +1200)]
Merge pull request #12408 from eileenmcnaughton/location_id
Add location_id if missing CRM-20711.
Seamus Lee [Tue, 3 Jul 2018 23:15:04 +0000 (09:15 +1000)]
Merge pull request #12399 from eileenmcnaughton/jamie
dev/core/#/229 Fix fatal error on send test mail
eileen [Tue, 3 Jul 2018 22:29:40 +0000 (10:29 +1200)]
Add location_id if missing CRM-20711.
On a small number of installs it seems location_id is missing from the group_contact table. This adds if missing
Eileen McNaughton [Tue, 3 Jul 2018 22:24:06 +0000 (10:24 +1200)]
Merge pull request #12398 from agh1/5.3.0-releasenotes
5.3.0 release notes
Eileen McNaughton [Tue, 3 Jul 2018 22:20:13 +0000 (10:20 +1200)]
Merge pull request #12362 from totten/master-cache-session
(dev/core#174) Forms/Sessions - Store state via Civi::cache('session')
Eileen McNaughton [Tue, 3 Jul 2018 22:02:58 +0000 (10:02 +1200)]
Merge pull request #12391 from eileenmcnaughton/matt
Revert change to BillingBlock to support hidden fields.
eileen [Tue, 3 Jul 2018 02:21:30 +0000 (14:21 +1200)]
Fix fatal error on send test mail
Seamus Lee [Tue, 3 Jul 2018 07:53:27 +0000 (17:53 +1000)]
Merge pull request #12400 from seamuslee001/dev_core_227
dev/core#227 Fix issue where on some extened groups the multiple reco…
Eileen McNaughton [Tue, 3 Jul 2018 04:11:53 +0000 (16:11 +1200)]
Merge pull request #12394 from yashodha/dev-223
(dev/core#223) Expose prefix and suffix in reports
CiviCRM [Wed, 20 Jun 2018 06:00:44 +0000 (06:00 +0000)]
Add release notes for 5.2.2
Tim Otten [Fri, 8 Jun 2018 23:39:40 +0000 (23:39 +0000)]
Add release notes for 5.2.1
Andrew Hunt [Tue, 3 Jul 2018 02:15:20 +0000 (22:15 -0400)]
5.3.0 release notes: combined, organized, added contributors, boilerplate
Also removed redundant issues from 5.2.1 and 5.2.2
Andrew Hunt [Tue, 3 Jul 2018 01:50:06 +0000 (21:50 -0400)]
5.3.0 release notes: my half of the issues
Alice Frumin [Mon, 2 Jul 2018 20:37:32 +0000 (16:37 -0400)]
5.3.0 release notes: Alice part of release notes
Seamus Lee [Tue, 3 Jul 2018 02:24:09 +0000 (12:24 +1000)]
dev/core#227 Fix issue where on some extened groups the multiple records checkbox doesn't show this causes empty string to be passed in which was causing problems when working out if we needed to make changes to the custom value table
Eileen McNaughton [Mon, 2 Jul 2018 20:26:01 +0000 (08:26 +1200)]
Merge pull request #12393 from scardinius/core-222
dev/core#222 - Fix importing contacts with dedupe rule
Tim Otten [Mon, 2 Jul 2018 18:58:36 +0000 (11:58 -0700)]
Merge pull request #12389 from totten/master-psr16-xtest
(dev/core#174) Add test to prevent hidden interactions among caches
Andrew Hunt [Mon, 2 Jul 2018 17:37:55 +0000 (13:37 -0400)]
5.3.0 release notes: raw from script
yashodha [Mon, 2 Jul 2018 10:47:38 +0000 (16:17 +0530)]
(dev/core#223) Expose prefix and suffix in reports
Eileen McNaughton [Mon, 2 Jul 2018 09:33:41 +0000 (21:33 +1200)]
Merge pull request #12340 from eileenmcnaughton/merge_cleanup
Move DAO function to DAO class, call it from Merge class
scardinius [Mon, 2 Jul 2018 08:55:41 +0000 (10:55 +0200)]
dev/core#222 - Fix importing contacts with dedupe rule
Eileen McNaughton [Mon, 2 Jul 2018 08:36:49 +0000 (20:36 +1200)]
Merge pull request #12390 from yashodha/dev-220
(dev/core#220) State province/country doesn't show properly in the…
eileen [Mon, 2 Jul 2018 05:50:01 +0000 (17:50 +1200)]
Revert change to BillingBlock to support hidden fields.
Per discussion with Matt Wire this is actually unnecessary, if we define 'id' in the payment fields
metadata. This is a bit too much like spooky magic but it ... erm .. works
yashodha [Mon, 2 Jul 2018 05:32:51 +0000 (11:02 +0530)]
core/issues#220 - State province/country doesn't show properly in the history report
Tim Otten [Thu, 28 Jun 2018 03:19:58 +0000 (20:19 -0700)]
(dev/core#174) Forms/Sessions - Clear in roughly the same ways as before
In the past, if one clears the `civicrm_cache` table (i.e. by calling
`CRM_Core_Config::clearDBCache()` ==> `TRUNCATE TABLE civicrm_cache`), then it
has the effect of destroying any active sessions/forms.
Now, in allowing sessions to be stored elsewhere, we lose that side-effect.
If we want strictly equivalent behavior (from a business-logic perspective),
then we'd want the patch to go a bit further -- calling
Civi::cache('session')->clear() at the same time that it does
`clearDBCache()`.
This revision adds `clear()` calls to various spots discussed here:
* https://docs.google.com/spreadsheets/d/1FxuIvr2noelBvhu5eja9_ps3YUWnkmGhqijBO3gH8Po/edit?usp=sharing
* https://github.com/civicrm/civicrm-core/pull/12362#issuecomment-
400897782
Tim Otten [Thu, 29 Mar 2018 01:52:57 +0000 (18:52 -0700)]
(dev/core#174) Forms/Sessions - Store state via Civi::cache('session')
Overview
----------------------------------------
When using forms based on CiviQuickForm (specifically `CRM_Core_Controller`), `CRM_Core_Session`
stores form-state via `CRM_Core_BAO_Cache::storeSessionToCache` and `::restoreSessionFromCache`,
which in turn calls `CRM_Core_BAO_Cache::setItem()` and `::getItem()`.
However, using `CRM_Core_BAO_Cache::setItem()` and `::getItem()` means that all session state
**must** be written to MySQL. For dev/core#174, we seek the **option** to store via
Redis/Memcache.
Before
----------------------------------------
* (a) Form/session state is always stored via `CRM_Core_BAO_Cache::setItem()` and `civicrm_cache` table.
* (b) To ensure that old sessions are periodically purged, there is special purpose logic that accesses `civicrm_cache`
(roughly `delete where group_name=Sessions and created_date < now()-ttl`).
* (c) On Memcache/Redis-enabled systems, the cache server functions as an extra tier. The DB provides canonical storage for form/session state.
After
----------------------------------------
* (a) Form/session state is stored via `CRM_Utils_CacheInterface`.
* On a typical server, this defaults to `CRM_Utils_Cache_SqlGroup` and `civicrm_cache` table.
* (b) To ensure that old sessions are periodically purged, the call to `CRM_Utils_CacheInterface::set()` specifies a TTL.
* It is the responsibility of the cache driver to handle TTLs. With #12360, TTL's are supported in `ArrayCache`, `SqlGroup`, and `Redis`.
* (c) On Memcache/Redis-enabled systems, the cache server provides canonical storage for form/session state.
Tim Otten [Thu, 28 Jun 2018 17:35:55 +0000 (10:35 -0700)]
(dev/core#174) Add test to prevent hidden interactions among caches
Eileen McNaughton [Mon, 2 Jul 2018 03:13:27 +0000 (15:13 +1200)]
Merge pull request #12379 from totten/master-psr16-sqlgroup
(dev/core#174) Full PSR-16 compliance for SqlGroup
Eileen McNaughton [Mon, 2 Jul 2018 00:11:58 +0000 (12:11 +1200)]
Merge pull request #12386 from mattwire/IPN_NFC
NFC code cleanup for AuthNet, Paypal, PaypalPro IPNs
Monish Deb [Sun, 1 Jul 2018 18:56:54 +0000 (00:26 +0530)]
Merge pull request #12305 from eileenmcnaughton/dedupe_limit
Re-instate Dedupe limit functionality & fix select toggle functionality
Matthew Wire [Sun, 1 Jul 2018 18:53:27 +0000 (19:53 +0100)]
NFC code cleanup for AuthNet, Paypal, PaypalPro IPNs
Eileen McNaughton [Sun, 1 Jul 2018 07:39:31 +0000 (00:39 -0700)]
Merge pull request #12345 from MiyaNoctem/CRM-195-add-counts-to-contribution-sub-tabs
dev/core#195 Add Contribution Counts to Sub-tabs
Eileen McNaughton [Sun, 1 Jul 2018 07:19:01 +0000 (00:19 -0700)]
Merge pull request #12383 from civicrm/5.3
5.3 to master
Eileen McNaughton [Sun, 1 Jul 2018 07:17:47 +0000 (00:17 -0700)]
Merge pull request #12382 from eileenmcnaughton/jaap
Fix mis-reporting of false booleans in reports
eileen [Sun, 1 Jul 2018 07:10:12 +0000 (19:10 +1200)]
Fix mis-reporting of false booleans in reports
Pradeep Nayak [Sun, 1 Jul 2018 06:48:30 +0000 (12:18 +0530)]
dev/financial/issues/24, Add unit test for Link payment method to financial account when created using api (#12365)
* Added api test to create new payment method
* updated api test
Eileen McNaughton [Sun, 1 Jul 2018 06:39:59 +0000 (23:39 -0700)]
Merge pull request #12356 from pradpnayak/issue-202
dev/core/issues/202, check if default currency is set
Eileen McNaughton [Sun, 1 Jul 2018 05:07:25 +0000 (22:07 -0700)]
Merge pull request #12381 from totten/master-psr16-apc
(dev/core#174) APCcache - Updates to comply with PSR-16