civicrm-core.git
9 years agoCRM-15908 - update data so it matches new format.
Jamie McClelland [Fri, 6 Mar 2015 19:34:32 +0000 (14:34 -0500)]
CRM-15908 - update data so it matches new format.

----------------------------------------
* CRM-15908: saved searches that use multi-select custom groups break during 4.4 -> 4.5 upgrade
  https://issues.civicrm.org/jira/browse/CRM-15908

9 years agooptimiation changes
monishdeb [Sun, 1 Mar 2015 22:19:55 +0000 (03:49 +0530)]
optimiation changes

9 years agoQA changes
monishdeb [Sun, 1 Mar 2015 22:03:28 +0000 (03:33 +0530)]
QA changes

9 years agoCRM-15908 fix - saved searches that use multi-select custom groups break during 4...
monishdeb [Thu, 12 Feb 2015 14:51:21 +0000 (20:21 +0530)]
CRM-15908 fix - saved searches that use multi-select custom groups break during 4.4 -> 4.5 upgrade

https://issues.civicrm.org/jira/browse/CRM-15908

9 years agoUpdate version to 4.5.9
CiviCRM [Fri, 6 Mar 2015 05:40:51 +0000 (21:40 -0800)]
Update version to 4.5.9

9 years agoMerge pull request #5318 from totten/4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 02:14:42 +0000 (18:14 -0800)]
Merge pull request #5318 from totten/4.5-missing-prs

Restore missing PRs

9 years agoMerge commit '7aa3a631943cb' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:25:54 +0000 (16:25 -0800)]
Merge commit '7aa3a631943cb' into 4.5-missing-prs

9 years agoMerge commit '9974506a13375' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:25:42 +0000 (16:25 -0800)]
Merge commit '9974506a13375' into 4.5-missing-prs

9 years agoMerge commit 'e2d85c92c3232' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:25:28 +0000 (16:25 -0800)]
Merge commit 'e2d85c92c3232' into 4.5-missing-prs

Conflicts:
xml/version.xml

9 years agoMerge commit '013198e90942d' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:25:11 +0000 (16:25 -0800)]
Merge commit '013198e90942d' into 4.5-missing-prs

9 years agoMerge commit '227e59a6a8437' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:25:06 +0000 (16:25 -0800)]
Merge commit '227e59a6a8437' into 4.5-missing-prs

9 years agoMerge commit 'd8f34a6e5245e' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:25:01 +0000 (16:25 -0800)]
Merge commit 'd8f34a6e5245e' into 4.5-missing-prs

9 years agoMerge commit '8939b4b21c001' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:24:51 +0000 (16:24 -0800)]
Merge commit '8939b4b21c001' into 4.5-missing-prs

9 years agoMerge commit '1ebbf8bfc16f4' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:24:46 +0000 (16:24 -0800)]
Merge commit '1ebbf8bfc16f4' into 4.5-missing-prs

9 years agoMerge commit '1ad799fac8340' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:24:42 +0000 (16:24 -0800)]
Merge commit '1ad799fac8340' into 4.5-missing-prs

9 years agoMerge commit 'c940014dce8bd' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:24:37 +0000 (16:24 -0800)]
Merge commit 'c940014dce8bd' into 4.5-missing-prs

9 years agoMerge commit '762fe6d92bc' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:24:33 +0000 (16:24 -0800)]
Merge commit '762fe6d92bc' into 4.5-missing-prs

9 years agoMerge commit '9942d1dc86' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:24:27 +0000 (16:24 -0800)]
Merge commit '9942d1dc86' into 4.5-missing-prs

9 years agoMerge commit 'b02664034bd2' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:24:15 +0000 (16:24 -0800)]
Merge commit 'b02664034bd2' into 4.5-missing-prs

9 years agoMerge pull request #5313 from compucorp/4.5
Dave Greenberg [Thu, 5 Mar 2015 21:18:19 +0000 (13:18 -0800)]
Merge pull request #5313 from compucorp/4.5

Add job ID to mailParams for external email delivery service to utilise

9 years agoAdd job ID to mailParams for external email delivery service to utilise
Guanhuan Chen [Thu, 5 Mar 2015 11:44:20 +0000 (11:44 +0000)]
Add job ID to mailParams for external email delivery service to utilise

9 years agoUpdate version to 4.5.8
CiviCRM [Wed, 4 Mar 2015 14:16:49 +0000 (06:16 -0800)]
Update version to 4.5.8

9 years agoMerge pull request #5306 from kurund/PR-5111
Kurund Jalmi [Wed, 4 Mar 2015 12:16:47 +0000 (17:46 +0530)]
Merge pull request #5306 from kurund/PR-5111

re-adding changes done in #5111

9 years agoalso update generated data
kurund [Wed, 4 Mar 2015 10:15:52 +0000 (15:45 +0530)]
also update generated data

9 years agore-adding PR-5111
kurund [Wed, 4 Mar 2015 10:14:14 +0000 (15:44 +0530)]
re-adding PR-5111

9 years agoMerge pull request #5300 from totten/4.5-setupsh-hostport
Tim Otten [Tue, 3 Mar 2015 23:29:27 +0000 (15:29 -0800)]
Merge pull request #5300 from totten/4.5-setupsh-hostport

setup.conf.txt - Add DBHOST and DBPORT

9 years agosetup.conf.txt - Add DBHOST and DBPORT
Tim Otten [Tue, 3 Mar 2015 22:38:36 +0000 (14:38 -0800)]
setup.conf.txt - Add DBHOST and DBPORT

9 years agoMerge pull request #5296 from monishdeb/CRM-16042
colemanw [Tue, 3 Mar 2015 17:50:57 +0000 (12:50 -0500)]
Merge pull request #5296 from monishdeb/CRM-16042

CRM-16042 fix - Unable to Create Personal Campaign Pages from Contact Da...

9 years agoCRM-16042 fix - Unable to Create Personal Campaign Pages from Contact Dashboard
monishdeb [Tue, 3 Mar 2015 13:49:47 +0000 (19:19 +0530)]
CRM-16042 fix - Unable to Create Personal Campaign Pages from Contact Dashboard

https://issues.civicrm.org/jira/browse/CRM-16042

9 years agoMerge pull request #5290 from totten/4.5-watchdog
Tim Otten [Tue, 3 Mar 2015 00:59:50 +0000 (16:59 -0800)]
Merge pull request #5290 from totten/4.5-watchdog

CRM-15929 - Drupal watchdog

9 years agoCRM-15929 - Drupal watchdog
Tim Otten [Mon, 2 Mar 2015 23:31:54 +0000 (15:31 -0800)]
CRM-15929 - Drupal watchdog

9 years agoMerge pull request #5205 from rohankatkar/CRM_15860
Dave Greenberg [Mon, 2 Mar 2015 22:01:19 +0000 (14:01 -0800)]
Merge pull request #5205 from rohankatkar/CRM_15860

Fix for CRM-15860

9 years agoMerge pull request #5281 from totten/4.5-email-test
Tim Otten [Mon, 2 Mar 2015 21:09:16 +0000 (13:09 -0800)]
Merge pull request #5281 from totten/4.5-email-test

CRM_Mailing_Form_Test - Email formatting

9 years agoCRM_Mailing_Form_Test - Email formatting
Tim Otten [Mon, 2 Mar 2015 01:18:05 +0000 (17:18 -0800)]
CRM_Mailing_Form_Test - Email formatting

9 years agoMerge pull request #5157 from GinkgoFJG/CRM-15965
Tim Otten [Mon, 2 Mar 2015 00:01:29 +0000 (17:01 -0700)]
Merge pull request #5157 from GinkgoFJG/CRM-15965

CRM-15965: Custom searches cannot specify custom task menu

9 years agoCRM-15965: Until the search interface is updated, guard calls the new method.
Frank J. Gómez [Sun, 1 Mar 2015 22:06:06 +0000 (17:06 -0500)]
CRM-15965: Until the search interface is updated, guard calls the new method.

9 years agoRemoved unused custom search (see thread in CRM-15965).
Frank J. Gómez [Sun, 1 Mar 2015 21:38:26 +0000 (16:38 -0500)]
Removed unused custom search (see thread in CRM-15965).

9 years agoCRM-15965: Postpone interface update until 4.6.
Frank J. Gómez [Sun, 1 Mar 2015 20:59:17 +0000 (15:59 -0500)]
CRM-15965: Postpone interface update until 4.6.

9 years agoCRM-15965: Resolved strict warning re compatibility of declaration of contactIDs...
Frank J. Gómez [Sun, 1 Mar 2015 20:44:29 +0000 (15:44 -0500)]
CRM-15965: Resolved strict warning re compatibility of declaration of contactIDs with parent method.

9 years agoCRM-15965: Updated built-in custom reports to be consistent with changes to CRM_Conta...
Frank J. Gómez [Sun, 1 Mar 2015 20:13:08 +0000 (15:13 -0500)]
CRM-15965: Updated built-in custom reports to be consistent with changes to CRM_Contact_Form_Search_Interface (namely the addition of the buildTaskList method).

9 years agoMerge pull request #5253 from totten/4.5-dompdf-alert
colemanw [Sat, 28 Feb 2015 20:41:51 +0000 (15:41 -0500)]
Merge pull request #5253 from totten/4.5-dompdf-alert

Verify dompdf upgrade

9 years agoMerge pull request #5269 from agh1/grant-date-search
Dave Greenberg [Sat, 28 Feb 2015 00:26:15 +0000 (16:26 -0800)]
Merge pull request #5269 from agh1/grant-date-search

CRM-16024 - CiviGrant / Report: money transfer date filter wasn't working

9 years agoCRM-16024 - CiviGrant / Report: money transfer date filter wasn't working
Andrew Hunt [Fri, 27 Feb 2015 05:06:03 +0000 (00:06 -0500)]
CRM-16024 - CiviGrant / Report: money transfer date filter wasn't working

9 years agoMerge pull request #5260 from totten/4.5-test-tz2
Tim Otten [Thu, 26 Feb 2015 04:28:15 +0000 (21:28 -0700)]
Merge pull request #5260 from totten/4.5-test-tz2

CRM-14423 - CiviUnitTestCase - UnitTest UF should set MySQL TZ (like Drupal/WP)

9 years agoCRM-14423 - CiviUnitTestCase - UnitTest UF should set MySQL TZ (like Drupal/WP)
Tim Otten [Thu, 26 Feb 2015 02:11:45 +0000 (19:11 -0700)]
CRM-14423 - CiviUnitTestCase - UnitTest UF should set MySQL TZ (like Drupal/WP)

9 years agoCRM-16005 - Check for dompdf using more file patterns
Tim Otten [Wed, 25 Feb 2015 18:58:46 +0000 (10:58 -0800)]
CRM-16005 - Check for dompdf using more file patterns

9 years agoCRM-16005 verification
Nicolas Ganivet [Wed, 25 Feb 2015 03:12:56 +0000 (20:12 -0700)]
CRM-16005 verification

9 years agoMerge pull request #5236 from kurund/CRM-15993
Dave Greenberg [Wed, 25 Feb 2015 02:09:47 +0000 (18:09 -0800)]
Merge pull request #5236 from kurund/CRM-15993

CRM-15993, added CiviCRM BN code support for PayPal Standard

9 years agoMerge pull request #5243 from totten/4.5-dompdf
Tim Otten [Wed, 25 Feb 2015 01:09:15 +0000 (17:09 -0800)]
Merge pull request #5243 from totten/4.5-dompdf

Use and configure the dompdf provided by composer.

9 years agoCRM-16005 - Use and configure the dompdf provided by composer.
Tim Otten [Tue, 24 Feb 2015 21:52:03 +0000 (13:52 -0800)]
CRM-16005 - Use and configure the dompdf provided by composer.

9 years agoCRM-15993, also handle recurring paypal express
kurund [Tue, 24 Feb 2015 19:09:43 +0000 (00:39 +0530)]
CRM-15993, also handle recurring paypal express

----------------------------------------
* CRM-15993: Add CiviCRM BN code to all PayPal methods for partner program tracking
  https://issues.civicrm.org/jira/browse/CRM-15993

9 years agoCRM-15993, added CiviCRM BN code support for PayPal Standard
kurund [Tue, 24 Feb 2015 18:36:36 +0000 (00:06 +0530)]
CRM-15993, added CiviCRM BN code support for PayPal Standard

----------------------------------------
* CRM-15993: Add CiviCRM BN code to all PayPal methods for partner program tracking
  https://issues.civicrm.org/jira/browse/CRM-15993

9 years agoCRM-15993, added CiviCRM BN code and notice fixes
kurund [Tue, 24 Feb 2015 14:59:57 +0000 (20:29 +0530)]
CRM-15993, added CiviCRM BN code and notice fixes

----------------------------------------
* CRM-15993: Add CiviCRM BN code to all PayPal methods for partner program tracking
  https://issues.civicrm.org/jira/browse/CRM-15993

9 years agoMerge pull request #5215 from pratikshad/CRM15916-4.5
Monish Deb [Tue, 24 Feb 2015 09:49:43 +0000 (15:19 +0530)]
Merge pull request #5215 from pratikshad/CRM15916-4.5

CRM-15916 Fixed issue of membership renewal on batch data entry

9 years agoCRM-15916 Fixed issue of membership renewal on batch data entry
pratikshad [Mon, 23 Feb 2015 09:03:25 +0000 (19:03 +1000)]
CRM-15916 Fixed issue of membership renewal on batch data entry

----------------------------------------
* CRM-15916: Batch Data Entry - membership renewal issues
  https://issues.civicrm.org/jira/browse/CRM-15916

9 years agoFix for CRM-15860
Web Access [Fri, 20 Feb 2015 15:20:57 +0000 (20:50 +0530)]
Fix for CRM-15860

9 years agoMerge pull request #5181 from monishdeb/CRM-15964
colemanw [Mon, 16 Feb 2015 18:19:05 +0000 (13:19 -0500)]
Merge pull request #5181 from monishdeb/CRM-15964

CRM-15964 fix - Tabbed custom data for contact subtypes don't save

9 years agoCRM-15964 fix - Tabbed custom data for contact subtypes don't save
monishdeb [Mon, 16 Feb 2015 14:41:43 +0000 (20:11 +0530)]
CRM-15964 fix - Tabbed custom data for contact subtypes don't save

https://issues.civicrm.org/jira/browse/CRM-15964

9 years agoMerge pull request #5159 from atif-shaikh/CRM-15897
Kurund Jalmi [Sun, 15 Feb 2015 13:24:55 +0000 (18:54 +0530)]
Merge pull request #5159 from atif-shaikh/CRM-15897

Crm 15897

9 years agoTypo Fix
atif-shaikh [Mon, 9 Feb 2015 08:20:02 +0000 (13:50 +0530)]
Typo Fix

9 years agoCRM-15897 - Fix for Joomla Image Url's not upgraded
atif-shaikh [Mon, 9 Feb 2015 07:47:02 +0000 (13:17 +0530)]
CRM-15897 - Fix for Joomla Image Url's not upgraded

----------------------------------------
* CRM-15897: Contact ImagesUnviewable - Issue Persisting through 4.5.5
  https://issues.civicrm.org/jira/browse/CRM-15897

9 years agoCRM-15965: Refactored for a more object-oriented approach, and moved the task list...
Frank J. Gómez [Thu, 12 Feb 2015 22:01:13 +0000 (17:01 -0500)]
CRM-15965: Refactored for a more object-oriented approach, and moved the task list members and methods further up the inheritance tree to promote consistency and code reuse.

9 years agoCRM-15965: Allow custom search classes to run their buildTaskList method instead...
Frank J. Gómez [Thu, 12 Feb 2015 16:07:57 +0000 (11:07 -0500)]
CRM-15965: Allow custom search classes to run their buildTaskList method instead of the core method.

9 years agoCRM-15965: Extracted task list building logic from buildQuickForm method.
Frank J. Gómez [Thu, 12 Feb 2015 15:47:34 +0000 (10:47 -0500)]
CRM-15965: Extracted task list building logic from buildQuickForm method.

9 years agoCRM-15939 - Fix richTextEditor in contact inline-edit
Coleman Watts [Tue, 10 Feb 2015 19:15:03 +0000 (14:15 -0500)]
CRM-15939 - Fix richTextEditor in contact inline-edit

9 years agoCRM-15926 - CRM_Contact_Page_AJAX::getContactList - Remove old, unused helper
Tim Otten [Mon, 9 Feb 2015 23:21:06 +0000 (15:21 -0800)]
CRM-15926 - CRM_Contact_Page_AJAX::getContactList - Remove old, unused helper

9 years agoCRM-15926 - CRM_Contact_Page_AJAX::search - Remove old, unused helper
Tim Otten [Tue, 10 Feb 2015 13:05:49 +0000 (05:05 -0800)]
CRM-15926 - CRM_Contact_Page_AJAX::search - Remove old, unused helper

9 years agoCRM-15926 - CRM_Pledge_Page_AJAX - Output JSON headers
Tim Otten [Tue, 10 Feb 2015 13:20:32 +0000 (05:20 -0800)]
CRM-15926 - CRM_Pledge_Page_AJAX - Output JSON headers

9 years agoCRM-15926 - encodeDataTableSelector - Output JSON header
Tim Otten [Mon, 9 Feb 2015 23:46:39 +0000 (15:46 -0800)]
CRM-15926 - encodeDataTableSelector - Output JSON header

9 years agoCRM-15926 - CRM_Contact_Page_AJAX - Output text headers
Tim Otten [Tue, 10 Feb 2015 13:20:53 +0000 (05:20 -0800)]
CRM-15926 - CRM_Contact_Page_AJAX - Output text headers

9 years agoCRM-15926 - CRM_Contact_Page_AJAX - Output JSON headers
Tim Otten [Mon, 9 Feb 2015 23:40:57 +0000 (15:40 -0800)]
CRM-15926 - CRM_Contact_Page_AJAX - Output JSON headers

9 years agoCRM-15931, CRM-15733 - civicrm_mailing_group.group_type - Restore uppercase values
Tim Otten [Sat, 7 Feb 2015 13:58:23 +0000 (05:58 -0800)]
CRM-15931, CRM-15733 - civicrm_mailing_group.group_type - Restore uppercase values

In 4.5.x, the schema for group_type changed from
enum('Include','Exclude','Base') to varchar, which made it more sensitive to
variations in case.  New mailings would be created with lowercase 'include',
but old mailings still had 'Include'.  UI's would display correctly for old
mailings but not for new mailings.

CRM-15733 and CRM-15931 both report peculiar symptoms of the change.

This patch aims to consistently use the 4.4.x data-model (for both old and
new mailings).

9 years agoMerge pull request #5039 from pratikshad/CRM-15470
Kurund Jalmi [Thu, 5 Feb 2015 16:07:56 +0000 (21:37 +0530)]
Merge pull request #5039 from pratikshad/CRM-15470

Fixed issue of deadlock CRM-15470

9 years agoMerge pull request #5061 from civicrm/CRM-15895
Yashodha Chaku [Thu, 5 Feb 2015 04:04:45 +0000 (09:34 +0530)]
Merge pull request #5061 from civicrm/CRM-15895

CRM-15895: fix copy contribution page which links PCP to original contri...

9 years agoMerge pull request #5092 from davecivicrm/CRM-15750_backport
Dave Greenberg [Thu, 5 Feb 2015 00:06:37 +0000 (16:06 -0800)]
Merge pull request #5092 from davecivicrm/CRM-15750_backport

CRM-15750 - backporting fix to 4.5

9 years agoCRM-15750 - backporting fix to 4.5
Dave Greenberg [Wed, 4 Feb 2015 22:57:19 +0000 (14:57 -0800)]
CRM-15750 - backporting fix to 4.5

----------------------------------------
* CRM-15750: advanced search using relationship and smart group produces backtrace
  https://issues.civicrm.org/jira/browse/CRM-15750

9 years agoMerge pull request #5071 from colemanw/CRM-15906
colemanw [Tue, 3 Feb 2015 13:44:06 +0000 (08:44 -0500)]
Merge pull request #5071 from colemanw/CRM-15906

CRM-15906 - Fix js error on pledge payment form

9 years agoMerge pull request #5068 from colemanw/CRM-13624
Dave Greenberg [Tue, 3 Feb 2015 03:16:26 +0000 (19:16 -0800)]
Merge pull request #5068 from colemanw/CRM-13624

CRM-13624 - Fix api regression - format link in display layer instead of data layer

9 years agoCRM-15906 - Related tpl cleanup
Coleman Watts [Mon, 2 Feb 2015 22:55:16 +0000 (17:55 -0500)]
CRM-15906 - Related tpl cleanup

9 years agoCRM-15906 - Related js cleanup
Coleman Watts [Mon, 2 Feb 2015 22:52:13 +0000 (17:52 -0500)]
CRM-15906 - Related js cleanup

9 years agoCRM-15906 - Remove call to non-existant function
Coleman Watts [Mon, 2 Feb 2015 22:49:19 +0000 (17:49 -0500)]
CRM-15906 - Remove call to non-existant function

9 years agoCRM-13624 - Fix api regression - format link in display layer instead of data layer
Coleman Watts [Mon, 2 Feb 2015 20:35:35 +0000 (15:35 -0500)]
CRM-13624 - Fix api regression - format link in display layer instead of data layer

9 years agoMerge pull request #5057 from cividesk/CRM-15901-4.5
colemanw [Mon, 2 Feb 2015 17:46:58 +0000 (12:46 -0500)]
Merge pull request #5057 from cividesk/CRM-15901-4.5

CRM-15901: Turn off PHP errors display for all ajax calls

9 years agoCRM-15895: fix copy contribution page which links PCP to original contrib page
yashodha [Mon, 2 Feb 2015 08:50:06 +0000 (14:20 +0530)]
CRM-15895: fix copy contribution page which links PCP to original contrib page

----------------------------------------
* CRM-15895: Copying contribution page still links PCP to original contrib page
  https://issues.civicrm.org/jira/browse/CRM-15895

9 years agoCRM-15901: Turn off PHP errors display for all ajax calls
Nicolas Ganivet [Sun, 1 Feb 2015 18:24:17 +0000 (11:24 -0700)]
CRM-15901: Turn off PHP errors display for all ajax calls

9 years agoFixed issue of deadlock CRM-15470
pratikshad [Fri, 30 Jan 2015 07:54:25 +0000 (17:54 +1000)]
Fixed issue of deadlock CRM-15470

----------------------------------------
* CRM-15470: MySQL transaction deadlocks with multiple simultaneous recurring contribution updates
  https://issues.civicrm.org/jira/browse/CRM-15470

9 years agoMerge pull request #5028 from jmcclelland/merge-address-overwrite
Yashodha Chaku [Thu, 29 Jan 2015 12:03:29 +0000 (17:33 +0530)]
Merge pull request #5028 from jmcclelland/merge-address-overwrite

Merge address overwrite

9 years agoCRM-15882 - fixing silly typo that should have no impact on
Jamie McClelland [Wed, 28 Jan 2015 20:21:08 +0000 (15:21 -0500)]
CRM-15882 - fixing silly typo that should have no impact on
functionality.

----------------------------------------
* CRM-15882: batch merge overwrites addresses rather than try to preserve them
  https://issues.civicrm.org/jira/browse/CRM-15882

9 years agoCRM-15882 - avoid PHP complaint about references
Jamie McClelland [Wed, 28 Jan 2015 20:20:19 +0000 (15:20 -0500)]
CRM-15882 - avoid PHP complaint about references

You have to include the & in the function too, and I don't think it's
really needed here.

----------------------------------------
* CRM-15882: batch merge overwrites addresses rather than try to preserve them
  https://issues.civicrm.org/jira/browse/CRM-15882

9 years agoCRM-15882 - ensure duplicate addresses are merged not overwritten
Jamie McClelland [Wed, 28 Jan 2015 20:16:20 +0000 (15:16 -0500)]
CRM-15882 - ensure duplicate addresses are merged not overwritten

when doing batch merge - different addresses should be preserved or
a conflict should be generated.

----------------------------------------
* CRM-15882: batch merge overwrites addresses rather than try to preserve them
  https://issues.civicrm.org/jira/browse/CRM-15882

9 years agoMerge pull request #5005 from colemanw/CRM-15872
colemanw [Mon, 26 Jan 2015 14:01:38 +0000 (09:01 -0500)]
Merge pull request #5005 from colemanw/CRM-15872

CRM-15872 - Fix change activity status on contact case tab

9 years agoCRM-15872 - Fix change activity status on contact case tab
Coleman Watts [Mon, 26 Jan 2015 14:01:12 +0000 (09:01 -0500)]
CRM-15872 - Fix change activity status on contact case tab

9 years agoMerge pull request #4985 from colemanw/CRM-15845
Kurund Jalmi [Mon, 26 Jan 2015 12:21:12 +0000 (17:51 +0530)]
Merge pull request #4985 from colemanw/CRM-15845

CRM-15845 - Fix relationship datatables permission check

9 years agoMerge pull request #4991 from totten/4.5-imgcache
Tim Otten [Fri, 23 Jan 2015 00:49:33 +0000 (16:49 -0800)]
Merge pull request #4991 from totten/4.5-imgcache

Allow caching of profile images

9 years agoAllow caching of profile images
Tim Otten [Wed, 21 Jan 2015 08:38:09 +0000 (00:38 -0800)]
Allow caching of profile images

I considered refactoring CRM_Utils_System::download() to work with this, but
there are just so many things that need to be done differently or explained
-- it's just not worth it.  Calling header() directly winds up being
clearer/simpler.

9 years agoCRM-15845 - Fix relationship datatables permission check
Coleman Watts [Tue, 20 Jan 2015 18:09:22 +0000 (13:09 -0500)]
CRM-15845 - Fix relationship datatables permission check

9 years agoMerge pull request #4982 from monishdeb/4.5
Monish Deb [Tue, 20 Jan 2015 09:55:34 +0000 (15:25 +0530)]
Merge pull request #4982 from monishdeb/4.5

CRM-15839 fix - Honoree profile doesn't show on Test contribution page

9 years agoCRM-15839 fix - Honoree profile doesn't show on Test contribution page
monishdeb [Tue, 20 Jan 2015 06:34:51 +0000 (12:04 +0530)]
CRM-15839 fix - Honoree profile doesn't show on Test contribution page

https://issues.civicrm.org/jira/browse/CRM-15839

9 years agoMerge pull request #4978 from ginkgomzd/make-static-can-dedupe
Tim Otten [Tue, 20 Jan 2015 01:11:14 +0000 (17:11 -0800)]
Merge pull request #4978 from ginkgomzd/make-static-can-dedupe

make function static to stop strict warnings and reflect how it is actua...

9 years agomake function static to stop strict warnings and reflect how it is actually used;
ginkgoMZD [Mon, 19 Jan 2015 21:02:37 +0000 (16:02 -0500)]
make function static to stop strict warnings and reflect how it is actually used;