manual merge of fixes for CRM-13981
authorkurund <kurund@civicrm.org>
Thu, 23 Jan 2014 08:44:42 +0000 (00:44 -0800)
committerkurund <kurund@civicrm.org>
Thu, 23 Jan 2014 08:44:42 +0000 (00:44 -0800)
commit8381af809c027065ceb28f18b5530ffb3a51ada3
tree40dda48260b584754081dd72b32971d74c773545
parent5199546d3cd4bc40c0f08b079a1477979e033ac3
manual merge of fixes for CRM-13981

----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
  http://issues.civicrm.org/jira/browse/CRM-13981
22 files changed:
CRM/Contact/Form/ProfileContact.php
CRM/Contribute/BAO/Contribution.php
CRM/Contribute/Form/AbstractEditPayment.php
CRM/Contribute/Form/AdditionalInfo.php
CRM/Contribute/Form/ContributionPage/Settings.php
CRM/Contribute/Form/ContributionView.php
CRM/Contribute/Page/Tab.php
CRM/Core/Payment/AuthorizeNetIPN.php
CRM/Core/Payment/BaseIPN.php
CRM/Core/Payment/GoogleIPN.php
CRM/Core/Payment/PayPalIPN.php
CRM/Core/Payment/PayPalProIPN.php
CRM/Member/Form/MembershipRenewal.php
CRM/Pledge/BAO/Pledge.php
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
sql/civicrm_generated.mysql
templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
templates/CRM/Contribute/Form/ContributionView.tpl
templates/CRM/Contribute/Page/UserDashboard.tpl
templates/CRM/Pledge/Page/UserDashboard.tpl
tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
xml/templates/civicrm_data.tpl