colemanw [Fri, 22 Nov 2013 23:14:31 +0000 (15:14 -0800)]
Merge pull request #1976 from eileenmcnaughton/CRM-13737
CRM-13737 drupal integration allow drupal folder to be at the same level as the civicrm folder
dlobo [Fri, 22 Nov 2013 18:54:20 +0000 (10:54 -0800)]
Merge pull request #2073 from dlobo/CRM-13816
CRM-13816 - Undefined index notice due to disabled memberships in CRM_Member_BAO_Membership::updateAllMembershipStatus()
Donald A. Lobo [Fri, 22 Nov 2013 18:53:13 +0000 (10:53 -0800)]
CRM-13816 - Undefined index notice due to disabled memberships in CRM_Member_BAO_Membership::updateAllMembershipStatus()
http://issues.civicrm.org/jira/browse/CRM-13816
dlobo [Fri, 22 Nov 2013 14:55:31 +0000 (06:55 -0800)]
Merge pull request #2070 from dlobo/CRM-13799
CRM-13799 - group contacts list doesn't reflect correct status
dlobo [Thu, 21 Nov 2013 14:39:29 +0000 (06:39 -0800)]
Merge pull request #2066 from totten/4.4-ufgroup-warning
CRM_Core_BAO_UFGroup - Fix warning with unknown provider
Donald A. Lobo [Thu, 21 Nov 2013 00:30:55 +0000 (16:30 -0800)]
CRM-13799 - group contacts list doesn't reflect correct status
http://issues.civicrm.org/jira/browse/CRM-13799
Tim Otten [Thu, 21 Nov 2013 06:14:03 +0000 (11:44 +0530)]
CRM_Core_BAO_UFGroup - Fix warning with unknown provider
CiviCRM [Thu, 21 Nov 2013 05:17:12 +0000 (21:17 -0800)]
Update version to 4.4.3
Coleman Watts [Thu, 21 Nov 2013 04:33:17 +0000 (20:33 -0800)]
CRM-13807 - Add comments and null test
colemanw [Thu, 21 Nov 2013 04:26:21 +0000 (20:26 -0800)]
Merge pull request #2064 from colemanw/4.4
CRM-13807 - Fix last to commit to getBAO and add unit test
Coleman Watts [Thu, 21 Nov 2013 04:25:15 +0000 (20:25 -0800)]
CRM-13807 - Fix last to commit to getBAO and add unit test
dlobo [Thu, 21 Nov 2013 02:44:43 +0000 (18:44 -0800)]
Merge pull request #2063 from colemanw/4.4
CRM-13807 - Verify BAO exists in api getBAO
Coleman Watts [Thu, 21 Nov 2013 02:26:23 +0000 (18:26 -0800)]
CRM-13807 - Verify BAO exists in api getBAO
colemanw [Thu, 21 Nov 2013 01:02:07 +0000 (17:02 -0800)]
Merge pull request #2061 from civicrm/4.3
4.3
colemanw [Thu, 21 Nov 2013 00:46:00 +0000 (16:46 -0800)]
Merge pull request #2059 from davecivicrm/CRM-13786b
CRM-13786 Applying updated patch from Karin which fixes the calculation ...
dlobo [Thu, 21 Nov 2013 00:34:04 +0000 (16:34 -0800)]
Merge pull request #2060 from davecivicrm/CRM-13876c
CRM-13786 - Fix calc of membership end date when join date is in the pas...
Dave Greenberg [Thu, 21 Nov 2013 00:00:13 +0000 (16:00 -0800)]
CRM-13786 - Fix calc of membership end date when join date is in the past (for fixed period memberships).
----------------------------------------
* CRM-13786: Membership End Date not calculated properly for fixed period MembershipTypes
http://issues.civicrm.org/jira/browse/CRM-13786
Dave Greenberg [Wed, 20 Nov 2013 23:34:39 +0000 (15:34 -0800)]
CRM-13786 Applying updated patch from Karin which fixes the calculation of start date and edndate for fixed memberships. All related BAO, api and Form unit tests passing now.
----------------------------------------
* CRM-13786: Membership End Date not calculated properly for fixed period MembershipTypes
http://issues.civicrm.org/jira/browse/CRM-13786
colemanw [Wed, 20 Nov 2013 22:09:10 +0000 (14:09 -0800)]
Merge pull request #2057 from kurund/CRM-13794
always check if result set has pseudo constants like state, country.. CR...
kurund [Wed, 20 Nov 2013 19:50:29 +0000 (01:20 +0530)]
always check if result set has pseudo constants like state, country.. CRM-13794
----------------------------------------
* CRM-13794: State/Country fields in Participant export not pulling data after upgrade
http://issues.civicrm.org/jira/browse/CRM-13794
Kurund Jalmi [Wed, 20 Nov 2013 19:41:21 +0000 (11:41 -0800)]
Merge pull request #2056 from kurund/overlay-css-fixes
fixed the display of contact values in contact overlay
kurund [Wed, 20 Nov 2013 19:39:55 +0000 (01:09 +0530)]
fixed the display of contact values in contact overlay
colemanw [Wed, 20 Nov 2013 16:54:16 +0000 (08:54 -0800)]
Merge pull request #2054 from colemanw/4.4
CRM-13802 - Search Builder js - fix variable type comparison
Coleman Watts [Wed, 20 Nov 2013 16:52:57 +0000 (08:52 -0800)]
CRM-13802 - Search Builder js - fix variable type comparison
dlobo [Wed, 20 Nov 2013 16:17:03 +0000 (08:17 -0800)]
Merge pull request #2053 from monishdeb/CRM-13738
CRM-13738 related improvisation and notice fix in Activity Report
monishdeb [Wed, 20 Nov 2013 15:43:15 +0000 (21:13 +0530)]
CRM-13738 related improvisation and notice fix
----------------------------------------
* CRM-13738: Activity Report fails if filtering on any contact
http://issues.civicrm.org/jira/browse/CRM-13738
Kurund Jalmi [Wed, 20 Nov 2013 13:40:20 +0000 (05:40 -0800)]
Merge pull request #2052 from pratik-joshi/HR-200
hr-200 : failure for hr-200 unit test was encountered due to 'Only variables should be passed by reference' on E_STRICT php error reporting
Kurund Jalmi [Wed, 20 Nov 2013 13:39:44 +0000 (05:39 -0800)]
Merge pull request #2050 from mgbdev/CRM-13759
CRM-13759 add webtest for multiple phone edit
Pratik Joshi [Wed, 20 Nov 2013 13:33:10 +0000 (19:03 +0530)]
hr-200 : failure for hr-200 unit test was encountered due to 'Only variables should be passed by …
…reference' on E_STRICT php error reporting
mgbdev [Wed, 20 Nov 2013 13:33:04 +0000 (19:03 +0530)]
CRM-13759 add webtest for multiple phone edit
mgbdev [Wed, 20 Nov 2013 12:22:37 +0000 (17:52 +0530)]
CRM-13759 add webtest for multiple phone edit
Kurund Jalmi [Wed, 20 Nov 2013 10:31:55 +0000 (02:31 -0800)]
Merge pull request #2048 from monishdeb/CRM-13795
CRM-13795 related fix
Kurund Jalmi [Wed, 20 Nov 2013 10:21:56 +0000 (02:21 -0800)]
Merge pull request #2047 from pratik-joshi/CRM-10635
CRM-10635 : parents processing on initial load of manage display screen of groups
monishdeb [Wed, 20 Nov 2013 10:17:36 +0000 (15:47 +0530)]
CRM-13795 related fix
----------------------------------------
* CRM-13795: Improve Use of honor role for Personal campaign pages
http://issues.civicrm.org/jira/browse/CRM-13795
Kurund Jalmi [Wed, 20 Nov 2013 10:04:20 +0000 (02:04 -0800)]
Merge pull request #1997 from vivekarora/CRM-13165-ApiFixes
CRM-13165 - Schedule Action Api Fixes
Pratik Joshi [Wed, 20 Nov 2013 09:25:03 +0000 (14:55 +0530)]
CRM-10635 : parents processing on initial load of manage display screen of groups
vivekarora [Wed, 20 Nov 2013 07:54:04 +0000 (13:24 +0530)]
Set name from title if that is not given in API
Kurund Jalmi [Wed, 20 Nov 2013 06:22:48 +0000 (22:22 -0800)]
Merge pull request #2046 from yashodha/feedfixes
parameterize getFeed method to accept blog url to be displayed in news
Kurund Jalmi [Wed, 20 Nov 2013 06:20:45 +0000 (22:20 -0800)]
Merge pull request #2043 from totten/4.4-case-test
CRM-13768 - api_v3_CaseTest::testCreateCaseEmpty - Fix regression and warning
yashodha [Wed, 20 Nov 2013 06:20:34 +0000 (11:50 +0530)]
parameterise getFeed method to accept blog url to be displayed in news section
Kurund Jalmi [Wed, 20 Nov 2013 06:09:03 +0000 (22:09 -0800)]
Merge pull request #2045 from pratik-joshi/CRM-13771
CRM-13771 : faced a fatal error while reproducing this issue, fix done is handling of import error improvement which occurs when the data being imported is not a valid one
Tim Otten [Wed, 20 Nov 2013 05:19:27 +0000 (10:49 +0530)]
CRM-13768 - api_v3_CaseTest::testCreateCaseEmpty - Fix regression and warning
----------------------------------------
* CRM-13768: CiviCase not fully activated during extension installation
http://issues.civicrm.org/jira/browse/CRM-13768
Pratik Joshi [Wed, 20 Nov 2013 05:18:17 +0000 (10:48 +0530)]
CRM-13771 : faced a fatal error while reproducing this issue, fix done is handling error improvement for invalid data import
Kurund Jalmi [Wed, 20 Nov 2013 05:03:29 +0000 (21:03 -0800)]
Merge pull request #2038 from jmcclelland/honor-roll-4.4
Honor role fixes on personal campaign pages
dlobo [Wed, 20 Nov 2013 01:25:59 +0000 (17:25 -0800)]
Merge pull request #2042 from dlobo/NoticeFixes
do not use a hook return value - fixes notice in joomla install
Donald A. Lobo [Wed, 20 Nov 2013 01:24:41 +0000 (17:24 -0800)]
do not use a hook return value - fixes notice in joomla install
dlobo [Tue, 19 Nov 2013 23:53:43 +0000 (15:53 -0800)]
Merge pull request #2037 from jmcclelland/reports-with-custom-fields
ensure activity reports with custom fields work properly.
dlobo [Tue, 19 Nov 2013 23:45:46 +0000 (15:45 -0800)]
Merge pull request #2039 from jmcclelland/assignee-email
ensure email is sent when contact is assigned to an activity
Dave Greenberg [Tue, 19 Nov 2013 23:01:07 +0000 (15:01 -0800)]
Update Activity.tpl
Remove extraneous comma in line 138 (include for NewContact.tpl)
Jamie McClelland [Tue, 19 Nov 2013 21:24:34 +0000 (16:24 -0500)]
ensure email to contact works when assignee and activity
See http://issues.civicrm.org/jira/browse/CRM-13203
Jamie McClelland [Mon, 18 Nov 2013 21:12:32 +0000 (16:12 -0500)]
Default to including in honor roll anonymously
This was we maximize use of honor role and preserve anonymity.
See: http://issues.civicrm.org/jira/browse/CRM-13795
Jamie McClelland [Mon, 18 Nov 2013 21:11:01 +0000 (16:11 -0500)]
Only add option to display in honor role if PCP allows honor role
See: http://issues.civicrm.org/jira/browse/CRM-13795
Jamie McClelland [Tue, 19 Nov 2013 19:43:36 +0000 (14:43 -0500)]
ensure activity reports with custom fields work properly.
See http://issues.civicrm.org/jira/browse/CRM-13715
dlobo [Tue, 19 Nov 2013 17:23:09 +0000 (09:23 -0800)]
Merge pull request #2035 from dlobo/CRM-13793
CRM-13793 - fix bad assignment
Donald A. Lobo [Tue, 19 Nov 2013 17:22:29 +0000 (09:22 -0800)]
CRM-13793 - fix bad assignment
----------------------------------------
* CRM-13793: Miscellaneous code cleanups
http://issues.civicrm.org/jira/browse/CRM-13793
dlobo [Tue, 19 Nov 2013 17:20:32 +0000 (09:20 -0800)]
Merge pull request #2031 from dakshayani/CRM-13627
-- CRM-13627 modification for sort object in getrows function
dlobo [Tue, 19 Nov 2013 17:17:45 +0000 (09:17 -0800)]
Merge pull request #2034 from dlobo/CRM-13780
CRM-13780 - rework error message
Donald A. Lobo [Tue, 19 Nov 2013 17:15:37 +0000 (09:15 -0800)]
CRM-13780 - rework error message
----------------------------------------
* CRM-13780: Don't allow users to attempt to merge the Default Organization into another organization
http://issues.civicrm.org/jira/browse/CRM-13780
dlobo [Tue, 19 Nov 2013 17:09:45 +0000 (09:09 -0800)]
Merge pull request #2030 from monishdeb/CRM-13780
CRM-13780 fix - Don't allow users to attempt to merge the Default Organization into another organization
Dakshayani Chinchwadkar [Tue, 19 Nov 2013 10:25:48 +0000 (15:55 +0530)]
-- CRM-13627 modification for sort object in getrows function
----------------------------------------
* CRM-13627: AJAX filtering for profile listings
http://issues.civicrm.org/jira/browse/CRM-13627
monishdeb [Tue, 19 Nov 2013 10:01:42 +0000 (15:31 +0530)]
Remove html formatting from status message
monishdeb [Mon, 18 Nov 2013 13:49:46 +0000 (19:19 +0530)]
CRM-13780 fix - Don't allow users to attempt to merge the Default Organization into another organization
http://issues.civicrm.org/jira/browse/CRM-13780
Kurund Jalmi [Tue, 19 Nov 2013 06:46:15 +0000 (22:46 -0800)]
Merge pull request #2029 from kurund/CRM-11301
fixed regression in CRM-11301, due to changes in 4.4
kurund [Tue, 19 Nov 2013 06:45:15 +0000 (12:15 +0530)]
fixed regression in CRM-11301, due to changes in 4.4
----------------------------------------
* CRM-11301: Add / Edit Activity: create new contact option for With contact (target) field
http://issues.civicrm.org/jira/browse/CRM-11301
dlobo [Tue, 19 Nov 2013 03:01:27 +0000 (19:01 -0800)]
Merge pull request #2028 from davecivicrm/CRM-13786
CRM-13876 - Fixed membership end date calculation should use start date,...
Eileen McNaughton [Tue, 19 Nov 2013 02:32:39 +0000 (15:32 +1300)]
CRM-13737 drupal integration - opps - fix double negative that snuck in
Dave Greenberg [Tue, 19 Nov 2013 02:28:16 +0000 (18:28 -0800)]
CRM-13876 - Fixed membership end date calculation should use start date, not join date.
----------------------------------------
* CRM-13876:
http://issues.civicrm.org/jira/browse/CRM-13876
dlobo [Mon, 18 Nov 2013 22:48:53 +0000 (14:48 -0800)]
Merge pull request #2024 from PalanteJon/uu
CRM-13762 - CiviReport - Add Postal Code Suffix to available Address Fie...
dlobo [Mon, 18 Nov 2013 22:48:27 +0000 (14:48 -0800)]
Merge pull request #2021 from dlobo/CRM-13792
CRM-13792 - Custom search triggers table full error
dlobo [Mon, 18 Nov 2013 22:10:20 +0000 (14:10 -0800)]
Merge pull request #2027 from dlobo/CRM-13791
CRM-13791 - Custom search edit form help link is broken
Donald A. Lobo [Mon, 18 Nov 2013 22:09:33 +0000 (14:09 -0800)]
CRM-13791 - Custom search edit form help link is broken
http://issues.civicrm.org/jira/browse/CRM-13791
Jon goldberg - Linux laptop [Mon, 18 Nov 2013 21:19:08 +0000 (16:19 -0500)]
CRM-13762 - CiviReport - Add Postal Code Suffix to available Address Fields
----------------------------------------
* CRM-13762: fucntion addAddressFields in CiviReport doesn't include Postal Code Suffix
http://issues.civicrm.org/jira/browse/CRM-13762
dlobo [Mon, 18 Nov 2013 21:13:42 +0000 (13:13 -0800)]
Merge pull request #2017 from monishdeb/CRM-13738
CRM-13738 related fix on Activity Report
dlobo [Mon, 18 Nov 2013 21:12:18 +0000 (13:12 -0800)]
Merge pull request #2015 from pratik-joshi/CRM-13784
CRM-13784 : set proper fiscal end date
dlobo [Mon, 18 Nov 2013 21:10:40 +0000 (13:10 -0800)]
Merge pull request #2008 from eileenmcnaughton/CRM-12023
CRM-12023 add 4 region tags to summary.tpl
dlobo [Mon, 18 Nov 2013 21:10:05 +0000 (13:10 -0800)]
Merge pull request #2023 from PalanteJon/CRM-13779
CRM-13779 - CiviEvent - fire skipPaymentMethod on select boxes
dlobo [Mon, 18 Nov 2013 21:09:20 +0000 (13:09 -0800)]
Merge pull request #2019 from dlobo/CRM-13788
CRM-13788 - Another place to check if array index is set - Field.php
dlobo [Mon, 18 Nov 2013 21:08:22 +0000 (13:08 -0800)]
Merge pull request #2020 from dlobo/CRM-13790
CRM-13790 - Smart group cache timeout description is wrong
Jon goldberg - Linux laptop [Mon, 18 Nov 2013 21:04:47 +0000 (16:04 -0500)]
CRM-13779 - CiviEvent - fire skipPaymentMethod on select boxes
----------------------------------------
* CRM-13779: Events with Price Sets with only Select boxes don't allow payment
http://issues.civicrm.org/jira/browse/CRM-13779
Donald A. Lobo [Mon, 18 Nov 2013 19:51:56 +0000 (11:51 -0800)]
CRM-13792 - Custom search triggers table full error
http://issues.civicrm.org/jira/browse/CRM-13792
Dave Greenberg [Mon, 18 Nov 2013 17:20:03 +0000 (09:20 -0800)]
Merge pull request #2003 from lcdservices/CRM-13781
CRM-13781 limit date selection in calendar widget
Donald A. Lobo [Mon, 18 Nov 2013 17:11:06 +0000 (09:11 -0800)]
CRM-13790 - improve error message
----------------------------------------
* CRM-13790: Smart group cache timeout description is wrong
http://issues.civicrm.org/jira/browse/CRM-13790
Donald A. Lobo [Mon, 18 Nov 2013 17:03:47 +0000 (09:03 -0800)]
CRM-13790 - Smart group cache timeout description is wrong
http://issues.civicrm.org/jira/browse/CRM-13790
Donald A. Lobo [Mon, 18 Nov 2013 16:59:25 +0000 (08:59 -0800)]
CRM-13788 - Another place to check if array index is set - Field.php
http://issues.civicrm.org/jira/browse/CRM-13788
monishdeb [Mon, 18 Nov 2013 14:12:15 +0000 (19:42 +0530)]
CRM-13738 related fix
----------------------------------------
* CRM-13738: Activity Report fails if filtering on any contact
http://issues.civicrm.org/jira/browse/CRM-13738
Pratik Joshi [Mon, 18 Nov 2013 12:43:18 +0000 (18:13 +0530)]
CRM-13784 : set proper fiscal end date
Yashodha Chaku [Mon, 18 Nov 2013 11:08:40 +0000 (03:08 -0800)]
Merge pull request #1994 from totten/4.4-setting-component
CRM-13768 - enable_component - Use same logic when toggling components via API/web
Kurund Jalmi [Mon, 18 Nov 2013 10:58:50 +0000 (02:58 -0800)]
Merge pull request #2012 from kenwest/CRM-13690
CRM-13690 - CiviMail - prevent html2text treating mailing tokens as rela...
Kurund Jalmi [Mon, 18 Nov 2013 10:58:33 +0000 (02:58 -0800)]
Merge pull request #2013 from kenwest/CRM-13690-B
CRM-13690 - CiviMail - prevent html2text treating mailing tokens as rela...
Kurund Jalmi [Mon, 18 Nov 2013 10:56:27 +0000 (02:56 -0800)]
Merge pull request #2011 from kenwest/CRM-13695
CRM-13695 set $_SERVER[HTTP_HOST] from CIVICRM_UF_BASEURL
Kurund Jalmi [Mon, 18 Nov 2013 10:26:43 +0000 (02:26 -0800)]
Merge pull request #2010 from kenwest/CRM-13789-1
CRM-13789 - alias added to Interviewer filter
Kurund Jalmi [Mon, 18 Nov 2013 10:00:24 +0000 (02:00 -0800)]
Merge pull request #2014 from NileemaJadhav/CRM-13747
-- CRM-13747 CiviCase label and title simplification to increase adaptability
Nileema [Mon, 18 Nov 2013 07:59:30 +0000 (13:29 +0530)]
-- CRM-13747 CiviCase label and title simplification to increase adaptability
----------------------------------------
* CRM-13747: CiviCase label and title simplification to increase adaptability
http://issues.civicrm.org/jira/browse/CRM-13747
Ken West [Mon, 18 Nov 2013 05:30:08 +0000 (16:30 +1100)]
CRM-13690 - CiviMail - prevent html2text treating mailing tokens as relative URLs
----------------------------------------
* CRM-13690: html2text fails to convert Mailing token links
http://issues.civicrm.org/jira/browse/CRM-13690
Ken West [Mon, 18 Nov 2013 05:15:50 +0000 (16:15 +1100)]
CRM-13690 - CiviMail - prevent html2text treating mailing tokens as relative URLs
----------------------------------------
* CRM-13690: html2text fails to convert Mailing token links
http://issues.civicrm.org/jira/browse/CRM-13690
Ken West [Mon, 18 Nov 2013 04:44:35 +0000 (15:44 +1100)]
CRM-13695 set $_SERVER[HTTP_HOST] from CIVICRM_UF_BASEURL
----------------------------------------
* CRM-13695: cli - set $_SERVER['HTTP_HOST'] from CIVICRM_UF_BASEURL
http://issues.civicrm.org/jira/browse/CRM-13695
Ken West [Mon, 18 Nov 2013 04:04:02 +0000 (15:04 +1100)]
CRM-13789 - alias added to Interviewer filter
----------------------------------------
* CRM-13789: Survey Report fails when filtering on Interviewer
http://issues.civicrm.org/jira/browse/CRM-13789
Eileen [Sun, 17 Nov 2013 22:28:23 +0000 (11:28 +1300)]
CRM-12023 add 4* region markups to summary.tpl & adjust whitespace accordingly
----------------------------------------
* CRM-12023: Create regions on Summary.tpl for customisation of that screen
http://issues.civicrm.org/jira/browse/CRM-12023
Eileen [Sun, 17 Nov 2013 22:19:49 +0000 (11:19 +1300)]
CRM-12023 whitespace only align html in summary.tpl in order to make it more legible
----------------------------------------
* CRM-12023: Create regions on Summary.tpl for customisation of that screen
http://issues.civicrm.org/jira/browse/CRM-12023
Eileen [Fri, 15 Nov 2013 21:09:20 +0000 (10:09 +1300)]
Extra tests to check behaviour when setting current employer on existing relationships
projects / civicrm-core.git / log