civicrm-core.git
8 years agoMerge pull request #8883 from colemanw/CRM-19227
colemanw [Mon, 15 Aug 2016 13:41:21 +0000 (09:41 -0400)]
Merge pull request #8883 from colemanw/CRM-19227

CRM-19227 - Add entityRefFilters hook and support different widget types

8 years agoMerge pull request #8864 from seamuslee001/CRM-19034
Eileen McNaughton [Sat, 13 Aug 2016 20:32:49 +0000 (08:32 +1200)]
Merge pull request #8864 from seamuslee001/CRM-19034

CRM-19034 revert the capitlisation of country names

8 years agoCRM-19227 - Add entityRefFilters hook and support different widget types
Coleman Watts [Sat, 13 Aug 2016 04:17:48 +0000 (00:17 -0400)]
CRM-19227 - Add entityRefFilters hook and support different widget types

8 years agoCRM-19034 fix tests failing due to expecting country names to be all caps
Seamus Lee [Sat, 13 Aug 2016 12:07:59 +0000 (22:07 +1000)]
CRM-19034 fix tests failing due to expecting country names to be all caps

8 years agoFix civicrm_country template file
Seamus Lee [Sat, 13 Aug 2016 11:08:32 +0000 (21:08 +1000)]
Fix civicrm_country template file

E remove unneded line

8 years agoCRM-19034 further country fixes
Seamus Lee [Sat, 13 Aug 2016 10:15:17 +0000 (20:15 +1000)]
CRM-19034 further country fixes

8 years agoCRM-19034 revert the capitlisation of country names
Seamus Lee [Thu, 11 Aug 2016 21:43:12 +0000 (21:43 +0000)]
CRM-19034 revert the capitlisation of country names

8 years agoCRM-17663 - fullscreen_url should be optional
Coleman Watts [Fri, 12 Aug 2016 17:46:25 +0000 (13:46 -0400)]
CRM-17663 - fullscreen_url should be optional

8 years agoMerge pull request #8860 from rocxa/CRM-19200_Merging_prefix_suffix_only_fix
Monish Deb [Fri, 12 Aug 2016 10:53:47 +0000 (16:23 +0530)]
Merge pull request #8860 from rocxa/CRM-19200_Merging_prefix_suffix_only_fix

CRM-19200 Merging just the title (prefix) field doesn't update properly

8 years agoMerge pull request #8878 from jitendrapurohit/CRM-19202
Monish Deb [Fri, 12 Aug 2016 10:00:26 +0000 (15:30 +0530)]
Merge pull request #8878 from jitendrapurohit/CRM-19202

CRM-19202 - Exporting an OR search exports with selected fields

8 years agoMerge pull request #8879 from monishdeb/CRM-19220
Monish Deb [Fri, 12 Aug 2016 08:41:19 +0000 (14:11 +0530)]
Merge pull request #8879 from monishdeb/CRM-19220

CRM-19220: iAmAnIntentionalENoticeThatWarnsOfAProblemYouShouldReport in Find Participants

8 years agoCRM-19220: iAmAnIntentionalENoticeThatWarnsOfAProblemYouShouldReport in Find Participants
deb.monish [Fri, 12 Aug 2016 07:26:22 +0000 (12:56 +0530)]
CRM-19220: iAmAnIntentionalENoticeThatWarnsOfAProblemYouShouldReport in Find Participants

8 years agoCRM-19202 - Exporting an OR search exports with selected fields
jitendrapurohit [Fri, 12 Aug 2016 06:00:52 +0000 (11:30 +0530)]
CRM-19202 - Exporting an OR search exports with selected fields

8 years agoMerge pull request #8851 from colemanw/dashboard
colemanw [Fri, 12 Aug 2016 04:31:59 +0000 (00:31 -0400)]
Merge pull request #8851 from colemanw/dashboard

CRM-17663 - Major dashboard improvements

8 years agoCRM-17663 - Fix missing dashboard names
Coleman Watts [Fri, 12 Aug 2016 03:55:40 +0000 (23:55 -0400)]
CRM-17663 - Fix missing dashboard names

8 years agoCRM-17663 - More tolerant url parsing
Coleman Watts [Fri, 12 Aug 2016 03:29:03 +0000 (23:29 -0400)]
CRM-17663 - More tolerant url parsing

8 years agoRemove unnecessary scrollbars from dashboard graphs
Coleman Watts [Wed, 10 Aug 2016 16:00:22 +0000 (12:00 -0400)]
Remove unnecessary scrollbars from dashboard graphs

8 years agoCRM-17663 - Fix race condition when loading OFC charts on dashboard
Coleman Watts [Wed, 10 Aug 2016 15:55:18 +0000 (11:55 -0400)]
CRM-17663 - Fix race condition when loading OFC charts on dashboard

8 years agoCRM-17663 - Regenerate SQL & DAOs
Coleman Watts [Tue, 9 Aug 2016 23:07:35 +0000 (19:07 -0400)]
CRM-17663 - Regenerate SQL & DAOs

8 years agoCRM-17663 - Configurable cache time per dashlet & auto-refresh
Coleman Watts [Tue, 9 Aug 2016 22:42:56 +0000 (18:42 -0400)]
CRM-17663 - Configurable cache time per dashlet & auto-refresh

8 years agoCRM-17663 - Add tests
Coleman Watts [Tue, 9 Aug 2016 02:35:18 +0000 (22:35 -0400)]
CRM-17663 - Add tests

8 years agoCRM-17663 - Cruft removal
Coleman Watts [Mon, 8 Aug 2016 18:36:55 +0000 (14:36 -0400)]
CRM-17663 - Cruft removal

Remove functions and db columns no longer needed by the streamlined dashboard.

8 years agoCRM-17663 - Implement localStorage cache
Coleman Watts [Sat, 6 Aug 2016 05:30:49 +0000 (01:30 -0400)]
CRM-17663 - Implement localStorage cache

8 years agoCRM-17663 - Load dashlets directly
Coleman Watts [Fri, 5 Aug 2016 07:06:46 +0000 (03:06 -0400)]
CRM-17663 - Load dashlets directly

8 years agoCRM-17663 - Refactor contact dashlet retrieval
Coleman Watts [Thu, 4 Aug 2016 19:52:58 +0000 (15:52 -0400)]
CRM-17663 - Refactor contact dashlet retrieval

8 years agoCRM-17663 - Add unique index to civicrm_dashboard_contact
Coleman Watts [Thu, 4 Aug 2016 19:03:55 +0000 (15:03 -0400)]
CRM-17663 - Add unique index to civicrm_dashboard_contact

8 years agoCRM-17663 - Dashboard cleanup
Coleman Watts [Thu, 4 Aug 2016 02:40:46 +0000 (22:40 -0400)]
CRM-17663 - Dashboard cleanup

8 years agoBlog dashlet improvements
Coleman Watts [Wed, 3 Aug 2016 19:07:01 +0000 (15:07 -0400)]
Blog dashlet improvements

8 years agoCRM-17663 - Dashboard style improvements
Coleman Watts [Tue, 2 Aug 2016 21:24:54 +0000 (17:24 -0400)]
CRM-17663 - Dashboard style improvements

8 years agoLoad home dashboard faster
Coleman Watts [Tue, 2 Aug 2016 17:34:25 +0000 (13:34 -0400)]
Load home dashboard faster

Eliminate unnecessary ajax call should speed up load times significantly.

8 years agoMerge pull request #8769 from totten/master-gencode-test
Tim Otten [Thu, 11 Aug 2016 21:25:21 +0000 (14:25 -0700)]
Merge pull request #8769 from totten/master-gencode-test

CRM-14885 - Commit DAO's. Add freshness test.

8 years agoFix caching bug in DAO commit PR
eileen [Thu, 11 Aug 2016 05:07:00 +0000 (17:07 +1200)]
Fix caching bug in DAO commit PR

8 years agoCRM-19130 - Add test for regression in CRM_Core_BAO_Cache
Tim Otten [Thu, 11 Aug 2016 20:20:56 +0000 (13:20 -0700)]
CRM-19130 - Add test for regression in CRM_Core_BAO_Cache

The earlier patch for CRM-19130 broke support for reading individual items
from the SQL cache.  Although the test-suite hits the cache layer a lot
(e.g.  CRM_Utils_Cache_SqlGroupTest), the bug wasn't exposed by other tests
because (a) caches are replicated in-memory and in SQL (b) caches are often
read in batch mode.

This explicitly flushes the in-memory cache and reads the SQL cache.

8 years agoMerge pull request #8873 from francescbassas/patch-5
Monish Deb [Thu, 11 Aug 2016 14:08:34 +0000 (19:38 +0530)]
Merge pull request #8873 from francescbassas/patch-5

CRM-19219 Parent child groups arrow mis-aligned

8 years agoMerge pull request #8871 from yashodha/CRM-18508
Yashodha Chaku [Thu, 11 Aug 2016 13:35:45 +0000 (19:05 +0530)]
Merge pull request #8871 from yashodha/CRM-18508

CRM-18508: Display State/Province in event address in registration em…

8 years agoMerge pull request #8874 from tschuettler/patch-3
Monish Deb [Thu, 11 Aug 2016 12:38:33 +0000 (18:08 +0530)]
Merge pull request #8874 from tschuettler/patch-3

CRM-19207: Update description to require views

8 years agoCRM-19207: Update description
tschuettler [Thu, 11 Aug 2016 11:25:26 +0000 (13:25 +0200)]
CRM-19207: Update description

8 years agoMerge pull request #8854 from tschuettler/patch-2
Monish Deb [Thu, 11 Aug 2016 10:56:57 +0000 (16:26 +0530)]
Merge pull request #8854 from tschuettler/patch-2

CRM-19207

8 years agoCRM-19219 Parent child groups arrow mis-aligned
francescbassas [Thu, 11 Aug 2016 10:19:12 +0000 (12:19 +0200)]
CRM-19219 Parent child groups arrow mis-aligned

Replicating changes made in this PR https://github.com/civicrm/civicrm-core/pull/8716/files

8 years agoCRM-18508: Display State/Province in event address in registration emails (handled...
yashodha [Thu, 11 Aug 2016 09:27:22 +0000 (14:57 +0530)]
CRM-18508: Display State/Province in event address in registration emails (handled upgrade as well)

----------------------------------------
* CRM-18508: State/Province not shown in Event Confirmation Emails
  https://issues.civicrm.org/jira/browse/CRM-18508

8 years agoMerge pull request #8607 from twomice/CRM-18508
Yashodha Chaku [Thu, 11 Aug 2016 08:31:26 +0000 (14:01 +0530)]
Merge pull request #8607 from twomice/CRM-18508

CRM-18508: Display State/Province in event address in registration emails

8 years agoMerge pull request #8868 from jitendrapurohit/CRM-19214
Monish Deb [Thu, 11 Aug 2016 07:44:28 +0000 (13:14 +0530)]
Merge pull request #8868 from jitendrapurohit/CRM-19214

CRM-19214 - Loop on parent row instead of first td element

8 years agoMerge pull request #8866 from seamuslee001/CRM-19217
Eileen McNaughton [Thu, 11 Aug 2016 07:07:57 +0000 (19:07 +1200)]
Merge pull request #8866 from seamuslee001/CRM-19217

CRM-19217 Ensure that is_active is set to 1 by default when creating …

8 years agoCRM-19214 - Loop on parent row instead of first td element
jitendrapurohit [Thu, 11 Aug 2016 06:16:57 +0000 (11:46 +0530)]
CRM-19214 - Loop on parent row instead of first td element

8 years agoremove version param as unneded as callAPISucess doesn't need it
Seamus Lee [Thu, 11 Aug 2016 04:58:57 +0000 (14:58 +1000)]
remove version param as unneded as callAPISucess doesn't need it

8 years agoCRM-19217 Ensure that is_active is set to 1 by default when creating dashboards via api
Seamus Lee [Thu, 11 Aug 2016 04:50:32 +0000 (14:50 +1000)]
CRM-19217 Ensure that is_active is set to 1 by default when creating dashboards via api

8 years agoMerge pull request #7990 from fuzionnz/CRM-16900
Eileen McNaughton [Thu, 11 Aug 2016 02:32:52 +0000 (14:32 +1200)]
Merge pull request #7990 from fuzionnz/CRM-16900

CRM-16900. Set secure flag to restrict cookies to SSL where appropriate.

8 years agoMerge pull request #8664 from eileenmcnaughton/country_names
Eileen McNaughton [Thu, 11 Aug 2016 00:21:13 +0000 (12:21 +1200)]
Merge pull request #8664 from eileenmcnaughton/country_names

CRM-19034 Remove line that makes all countries upper case

8 years agoMerge pull request #8859 from jitendrapurohit/CRM-19209
Eileen McNaughton [Wed, 10 Aug 2016 20:42:54 +0000 (08:42 +1200)]
Merge pull request #8859 from jitendrapurohit/CRM-19209

CRM-19209 - Fix create group without selecting parent

8 years agoCRM-19200 Merging just the title (prefix) field doesn't update the record properly
RocXa [Wed, 10 Aug 2016 15:55:23 +0000 (16:55 +0100)]
CRM-19200 Merging just the title (prefix) field doesn't update the record properly

8 years agoCRM-19209 - Fix create group without selecting parent
jitendrapurohit [Wed, 10 Aug 2016 13:19:24 +0000 (18:49 +0530)]
CRM-19209 - Fix create group without selecting parent

8 years agoMerge pull request #8856 from jitendrapurohit/CRM-19205
Monish Deb [Wed, 10 Aug 2016 11:49:33 +0000 (17:19 +0530)]
Merge pull request #8856 from jitendrapurohit/CRM-19205

CRM-19205 - Fix delete report task

8 years agoCRM-19205 - Fix delete report task
jitendrapurohit [Wed, 10 Aug 2016 11:12:39 +0000 (16:42 +0530)]
CRM-19205 - Fix delete report task

8 years agoMerge pull request #8846 from yashodha/CRM-18972
Yashodha Chaku [Wed, 10 Aug 2016 11:05:01 +0000 (16:35 +0530)]
Merge pull request #8846 from yashodha/CRM-18972

CRM-18972: List of strings that cannot be localized cause the absence…

8 years agoMerge pull request #8855 from yashodha/CRM-18472.fix
Monish Deb [Wed, 10 Aug 2016 10:44:24 +0000 (16:14 +0530)]
Merge pull request #8855 from yashodha/CRM-18472.fix

CRM-18472: Notice fixes

8 years agoMerge pull request #8853 from monishdeb/CRM-19204
Monish Deb [Wed, 10 Aug 2016 10:23:35 +0000 (15:53 +0530)]
Merge pull request #8853 from monishdeb/CRM-19204

CRM-19204: Contact-to-contact email attachments not working

8 years agoclean up
yashodha [Wed, 10 Aug 2016 10:11:16 +0000 (15:41 +0530)]
clean up

8 years agoCRM-18472: Notice fixes
yashodha [Wed, 10 Aug 2016 09:47:44 +0000 (15:17 +0530)]
CRM-18472: Notice fixes

----------------------------------------
* CRM-18472: Notice fixes
  https://issues.civicrm.org/jira/browse/CRM-18472

8 years agoCRM-19207
tschuettler [Wed, 10 Aug 2016 09:46:40 +0000 (11:46 +0200)]
CRM-19207

Fix succeeding of checkTriggerViewPermission while have no CREATE VIEW permission

8 years agoMerge pull request #8841 from liedekef/patch-1
Monish Deb [Wed, 10 Aug 2016 09:27:55 +0000 (14:57 +0530)]
Merge pull request #8841 from liedekef/patch-1

CRM-19194: printing labels for members with missing address

8 years agoCRM-19204: Contact-to-contact email attachments not working
deb.monish [Wed, 10 Aug 2016 09:12:24 +0000 (14:42 +0530)]
CRM-19204: Contact-to-contact email attachments not working

8 years agoCRM-18972: more fixes
yashodha [Wed, 10 Aug 2016 09:11:50 +0000 (14:41 +0530)]
CRM-18972: more fixes

----------------------------------------
* CRM-18972: List of strings that cannot be localized cause the absence of ts() function
  https://issues.civicrm.org/jira/browse/CRM-18972

8 years agoCorrect styling
Franky Van Liedekerke [Wed, 10 Aug 2016 08:01:53 +0000 (10:01 +0200)]
Correct styling

8 years agoMerge pull request #8845 from monishdeb/CRM-19189
Yashodha Chaku [Wed, 10 Aug 2016 06:19:41 +0000 (11:49 +0530)]
Merge pull request #8845 from monishdeb/CRM-19189

CRM-19189: Soft Credit and Soft Credit Type Fields Switched in Contribution Bulk Entry Form

8 years agoMerge pull request #8849 from jitendrapurohit/CRM-19171additional
Monish Deb [Wed, 10 Aug 2016 05:41:08 +0000 (11:11 +0530)]
Merge pull request #8849 from jitendrapurohit/CRM-19171additional

CRM-19171 - handle checkbox and radio when validation fails

8 years agoMerge pull request #8838 from tschuettler/patch-1
Monish Deb [Wed, 10 Aug 2016 05:32:01 +0000 (11:02 +0530)]
Merge pull request #8838 from tschuettler/patch-1

 CRM-19193: Report header and footer not included for print- and pdf-output

8 years agoMerge pull request #8647 from PalanteJon/CRM-19037
colemanw [Wed, 10 Aug 2016 00:14:32 +0000 (20:14 -0400)]
Merge pull request #8647 from PalanteJon/CRM-19037

CRM-19037 - API - use CRM_Core_Config instead of config_backend to fi…

8 years agoCRM-19171 - handle checkbox and radio when validation fails
jitendrapurohit [Tue, 9 Aug 2016 13:00:48 +0000 (18:30 +0530)]
CRM-19171 - handle checkbox and radio when validation fails

8 years agoCRM-18972: more translation fixes
yashodha [Tue, 9 Aug 2016 11:09:10 +0000 (16:39 +0530)]
CRM-18972: more translation fixes

----------------------------------------
* CRM-18972: List of strings that cannot be localized cause the absence of ts() function
  https://issues.civicrm.org/jira/browse/CRM-18972

8 years agoCRM-19189: Soft Credit and Soft Credit Type Fields Switched in Contribution Bulk...
deb.monish [Tue, 9 Aug 2016 10:24:26 +0000 (15:54 +0530)]
CRM-19189: Soft Credit and Soft Credit Type Fields Switched in Contribution Bulk Entry Form

8 years agoMerge remote-tracking branch 'upstream/4.7.10-rc' into 4.7.10-rc-master-2016-08-09...
Kurund Jalmi [Tue, 9 Aug 2016 09:17:14 +0000 (14:47 +0530)]
Merge remote-tracking branch 'upstream/4.7.10-rc' into 4.7.10-rc-master-2016-08-09-14-44-17

8 years agoCRM-18972: List of strings that cannot be localized cause the absence of ts() function
yashodha [Tue, 9 Aug 2016 08:44:09 +0000 (14:14 +0530)]
CRM-18972: List of strings that cannot be localized cause the absence of ts() function

----------------------------------------
* CRM-18972: List of strings that cannot be localized cause the absence of ts() function
  https://issues.civicrm.org/jira/browse/CRM-18972

8 years agoMerge pull request #8839 from monishdeb/CRM-19190
Monish Deb [Tue, 9 Aug 2016 08:43:13 +0000 (14:13 +0530)]
Merge pull request #8839 from monishdeb/CRM-19190

CRM-19190: Notices on using barchart

8 years agomore changes for additional intervals and mailing summary report
jitendrapurohit [Tue, 9 Aug 2016 07:24:41 +0000 (12:54 +0530)]
more changes for additional intervals and mailing summary report

8 years agoMerge pull request #8836 from jitendrapurohit/CRM-19184
Monish Deb [Tue, 9 Aug 2016 06:33:11 +0000 (12:03 +0530)]
Merge pull request #8836 from jitendrapurohit/CRM-19184

CRM-19184 - Activities target contact list does not truncate

8 years agoMerge pull request #8842 from joseltorres/crm-19150-2
Eileen McNaughton [Tue, 9 Aug 2016 05:34:37 +0000 (17:34 +1200)]
Merge pull request #8842 from joseltorres/crm-19150-2

CRM-19150 Changed API create_error to throw new exception per https://github.com/civicrm/civicrm-core/pull/8825

8 years agoCRM-19190: Notices on using barchart
deb.monish [Mon, 8 Aug 2016 15:07:12 +0000 (20:37 +0530)]
CRM-19190: Notices on using barchart

8 years agoMerge pull request #8840 from ejegg/CRM-17655
Eileen McNaughton [Mon, 8 Aug 2016 23:51:11 +0000 (11:51 +1200)]
Merge pull request #8840 from ejegg/CRM-17655

Don't clobber contributionRecur currency on edit

8 years agoCorrected throw new exception
Jose Torres [Mon, 8 Aug 2016 22:42:40 +0000 (15:42 -0700)]
Corrected throw new exception

8 years agoprinting labels for members with missing address
Franky Van Liedekerke [Mon, 8 Aug 2016 22:03:18 +0000 (00:03 +0200)]
printing labels for members with missing address

If trying to print address labels for a group of members (via the Search menu), if there's 1 member without address no PDF is generated.
The $rows variable only contains entries for members that actually have an address, so we need to check that.

8 years agoChanged API create_error to throw new exception per https://github.com/civicrm/civicr...
Jose Torres [Mon, 8 Aug 2016 21:21:16 +0000 (14:21 -0700)]
Changed API create_error to throw new exception per https://github.com/civicrm/civicrm-core/pull/8825"

8 years agoTest for contribution recur edit clobbering currency
Elliott Eggleston [Mon, 8 Aug 2016 18:45:24 +0000 (14:45 -0400)]
Test for contribution recur edit clobbering currency

8 years agoCheck the right next_sched dates for update
Elliott Eggleston [Mon, 8 Aug 2016 18:27:48 +0000 (14:27 -0400)]
Check the right next_sched dates for update

Need to look at $existing, not $params.

8 years agoDon't clobber contributionRecur currency on edit
Elliott Eggleston [Mon, 8 Aug 2016 18:20:48 +0000 (14:20 -0400)]
Don't clobber contributionRecur currency on edit

When editing an existing contribution_recur without specifying a
currency, do not change the record to the default currency.

8 years agoCRM-19193: Report header and footer not included for print- and pdf-output
tschuettler [Mon, 8 Aug 2016 12:00:46 +0000 (14:00 +0200)]
CRM-19193: Report header and footer not included for print- and pdf-output

Restored assignment from 4.5.4 to fix issue locally.

8 years agoUpdate Form.php
tschuettler [Mon, 8 Aug 2016 11:43:31 +0000 (13:43 +0200)]
Update Form.php

Duplicate assginment

8 years agoCRM-19184 - Activities target contact list does not truncate
jitendrapurohit [Mon, 8 Aug 2016 10:21:24 +0000 (15:51 +0530)]
CRM-19184 - Activities target contact list does not truncate

8 years agoMerge pull request #8835 from eileenmcnaughton/tax_amount
Eileen McNaughton [Mon, 8 Aug 2016 07:48:28 +0000 (19:48 +1200)]
Merge pull request #8835 from eileenmcnaughton/tax_amount

CRM-19126 Tax amount fix

8 years agoMerge pull request #8693 from seamuslee001/CRM-19068
Eileen McNaughton [Mon, 8 Aug 2016 07:47:00 +0000 (19:47 +1200)]
Merge pull request #8693 from seamuslee001/CRM-19068

CRM-19068 Fix SQLI in parents in group.create api call

8 years agoremove redundant second check given that we are now throwing errors
Seamus Lee [Mon, 8 Aug 2016 06:55:36 +0000 (16:55 +1000)]
remove redundant second check given that we are now throwing errors

8 years agoFix up Failing test due to empty parents array. Parents is assumed to be empty unless...
Seamus Lee [Thu, 14 Jul 2016 00:54:57 +0000 (10:54 +1000)]
Fix up Failing test due to empty parents array. Parents is assumed to be empty unless specified

8 years agoSwitch to throwing errrors rather than soft validation
Seamus Lee [Wed, 13 Jul 2016 07:18:14 +0000 (17:18 +1000)]
Switch to throwing errrors rather than soft validation

8 years agoAdd in Test to sort sqli
Seamus Lee [Wed, 13 Jul 2016 04:42:48 +0000 (04:42 +0000)]
Add in Test to sort sqli

8 years agoCRM-19068 Fix SQLI in parents in group.create api call
Seamus Lee [Wed, 13 Jul 2016 04:28:58 +0000 (04:28 +0000)]
CRM-19068 Fix SQLI in parents in group.create api call

8 years agoMerge pull request #8832 from eileenmcnaughton/mail_link
Eileen McNaughton [Mon, 8 Aug 2016 06:39:24 +0000 (18:39 +1200)]
Merge pull request #8832 from eileenmcnaughton/mail_link

CRM-19187 Add link to public mailing

8 years agoCRM-19126 further fix - less aggressive return
eileenmcnaugton [Mon, 8 Aug 2016 06:06:43 +0000 (18:06 +1200)]
CRM-19126 further fix - less aggressive return

8 years agoFix new test
Seamus Lee [Mon, 8 Aug 2016 06:02:10 +0000 (16:02 +1000)]
Fix new test

8 years agoMerge pull request #8834 from seamuslee001/CRM-19191
Eileen McNaughton [Mon, 8 Aug 2016 04:01:10 +0000 (16:01 +1200)]
Merge pull request #8834 from seamuslee001/CRM-19191

CRM-19191 Allow for searching by either contact on Dedupe Exceptions page

8 years agoMerge pull request #8833 from eileenmcnaughton/group_iterator
Eileen McNaughton [Mon, 8 Aug 2016 03:41:06 +0000 (15:41 +1200)]
Merge pull request #8833 from eileenmcnaughton/group_iterator

[NFC] CRM-19068 clean up GroupNesting class

8 years agoEnsure that picks up the updated values following setting tax amount
Seamus Lee [Mon, 8 Aug 2016 03:18:32 +0000 (13:18 +1000)]
Ensure that  picks up the updated values following setting tax amount