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
Tim Otten [Fri, 6 Mar 2015 00:25:54 +0000 (16:25 -0800)]
Merge commit '
7aa3a631943cb' 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
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
Tim Otten [Fri, 6 Mar 2015 00:25:11 +0000 (16:25 -0800)]
Merge commit '
013198e90942d' 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
Tim Otten [Fri, 6 Mar 2015 00:25:01 +0000 (16:25 -0800)]
Merge commit '
d8f34a6e5245e' 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
Tim Otten [Fri, 6 Mar 2015 00:24:46 +0000 (16:24 -0800)]
Merge commit '
1ebbf8bfc16f4' 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
Tim Otten [Fri, 6 Mar 2015 00:24:37 +0000 (16:24 -0800)]
Merge commit '
c940014dce8bd' 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
Tim Otten [Fri, 6 Mar 2015 00:24:27 +0000 (16:24 -0800)]
Merge commit '
9942d1dc86' 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
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
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
CiviCRM [Wed, 4 Mar 2015 14:16:49 +0000 (06:16 -0800)]
Update version to 4.5.8
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
kurund [Wed, 4 Mar 2015 10:15:52 +0000 (15:45 +0530)]
also update generated data
kurund [Wed, 4 Mar 2015 10:14:14 +0000 (15:44 +0530)]
re-adding PR-5111
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
Tim Otten [Tue, 3 Mar 2015 22:38:36 +0000 (14:38 -0800)]
setup.conf.txt - Add DBHOST and DBPORT
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...
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
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
Tim Otten [Mon, 2 Mar 2015 23:31:54 +0000 (15:31 -0800)]
CRM-15929 - Drupal watchdog
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
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
Tim Otten [Mon, 2 Mar 2015 01:18:05 +0000 (17:18 -0800)]
CRM_Mailing_Form_Test - Email formatting
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
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.
Frank J. Gómez [Sun, 1 Mar 2015 21:38:26 +0000 (16:38 -0500)]
Removed unused custom search (see thread in CRM-15965).
Frank J. Gómez [Sun, 1 Mar 2015 20:59:17 +0000 (15:59 -0500)]
CRM-15965: Postpone interface update until 4.6.
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.
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).
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
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
Andrew Hunt [Fri, 27 Feb 2015 05:06:03 +0000 (00:06 -0500)]
CRM-16024 - CiviGrant / Report: money transfer date filter wasn't working
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)
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)
Tim Otten [Wed, 25 Feb 2015 18:58:46 +0000 (10:58 -0800)]
CRM-16005 - Check for dompdf using more file patterns
Nicolas Ganivet [Wed, 25 Feb 2015 03:12:56 +0000 (20:12 -0700)]
CRM-16005 verification
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
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.
Tim Otten [Tue, 24 Feb 2015 21:52:03 +0000 (13:52 -0800)]
CRM-16005 - Use and configure the dompdf provided by composer.
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
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
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
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
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
Web Access [Fri, 20 Feb 2015 15:20:57 +0000 (20:50 +0530)]
Fix for CRM-15860
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
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
Kurund Jalmi [Sun, 15 Feb 2015 13:24:55 +0000 (18:54 +0530)]
Merge pull request #5159 from atif-shaikh/CRM-15897
Crm 15897
atif-shaikh [Mon, 9 Feb 2015 08:20:02 +0000 (13:50 +0530)]
Typo Fix
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
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.
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.
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.
Coleman Watts [Tue, 10 Feb 2015 19:15:03 +0000 (14:15 -0500)]
CRM-15939 - Fix richTextEditor in contact inline-edit
Tim Otten [Mon, 9 Feb 2015 23:21:06 +0000 (15:21 -0800)]
CRM-15926 - CRM_Contact_Page_AJAX::getContactList - 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
Tim Otten [Tue, 10 Feb 2015 13:20:32 +0000 (05:20 -0800)]
CRM-15926 - CRM_Pledge_Page_AJAX - Output JSON headers
Tim Otten [Mon, 9 Feb 2015 23:46:39 +0000 (15:46 -0800)]
CRM-15926 - encodeDataTableSelector - Output JSON header
Tim Otten [Tue, 10 Feb 2015 13:20:53 +0000 (05:20 -0800)]
CRM-15926 - CRM_Contact_Page_AJAX - Output text headers
Tim Otten [Mon, 9 Feb 2015 23:40:57 +0000 (15:40 -0800)]
CRM-15926 - CRM_Contact_Page_AJAX - Output JSON headers
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).
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
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...
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
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
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
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
Coleman Watts [Mon, 2 Feb 2015 22:55:16 +0000 (17:55 -0500)]
CRM-15906 - Related tpl cleanup
Coleman Watts [Mon, 2 Feb 2015 22:52:13 +0000 (17:52 -0500)]
CRM-15906 - Related js cleanup
Coleman Watts [Mon, 2 Feb 2015 22:49:19 +0000 (17:49 -0500)]
CRM-15906 - Remove call to non-existant function
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
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
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
Nicolas Ganivet [Sun, 1 Feb 2015 18:24:17 +0000 (11:24 -0700)]
CRM-15901: Turn off PHP errors display for all ajax calls
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
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
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
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
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
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
Coleman Watts [Mon, 26 Jan 2015 14:01:12 +0000 (09:01 -0500)]
CRM-15872 - Fix change activity status on contact case tab
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
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
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.
Coleman Watts [Tue, 20 Jan 2015 18:09:22 +0000 (13:09 -0500)]
CRM-15845 - Fix relationship datatables permission check
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
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
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...
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;
Yashodha Chaku [Fri, 16 Jan 2015 10:10:34 +0000 (15:40 +0530)]
Merge pull request #4953 from monishdeb/4.5
CRM-15813 fix - Honoree Information profile overwrites contributor infor...
monishdeb [Mon, 2 Feb 2015 13:03:20 +0000 (18:33 +0530)]
CRM-15813 fix - Honoree Information profile overwrites contributor information
https://issues.civicrm.org/jira/browse/CRM-15813
colemanw [Wed, 14 Jan 2015 02:28:27 +0000 (21:28 -0500)]
Merge pull request #4930 from colemanw/CRM-15817
CRM-15817 - Fix merge error
Coleman Watts [Wed, 14 Jan 2015 01:25:45 +0000 (20:25 -0500)]
CRM-15817 - Fix merge error
Monish Deb [Tue, 13 Jan 2015 18:45:24 +0000 (00:15 +0530)]
Merge pull request #4919 from rohankatkar/webtests-4.5
Webtests fix-4.5
projects / civicrm-core.git / log