civicrm-core.git
11 years agoCRM-13842 - expose all activity types to scheduled reminders entity options.
Dave Greenberg [Wed, 27 Nov 2013 01:49:08 +0000 (17:49 -0800)]
CRM-13842 - expose all activity types to scheduled reminders entity options.

----------------------------------------
* CRM-13842: Expose ALL activity types to Scheduled Reminders Entity select
  http://issues.civicrm.org/jira/browse/CRM-13842

11 years agoMerge pull request #2099 from brylie/patch-1
colemanw [Tue, 26 Nov 2013 22:14:24 +0000 (14:14 -0800)]
Merge pull request #2099 from brylie/patch-1

CRM-12045 Modified description of form element, yes/no question.

11 years agoModified description of form toggle to indicate yes/no true/false response.
Brylie Oxley [Tue, 26 Nov 2013 21:55:55 +0000 (13:55 -0800)]
Modified description of form toggle to indicate yes/no true/false response.

11 years agoregenerated data
kurund [Tue, 26 Nov 2013 06:49:38 +0000 (12:19 +0530)]
regenerated data

11 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-26-11-46-28
kurund [Tue, 26 Nov 2013 06:41:48 +0000 (12:11 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-26-11-46-28

Conflicts:
CRM/Contact/Form/Search/Custom/Group.php
sql/civicrm_generated.mysql
templates/CRM/Contact/Page/View/Summary.tpl
xml/version.xml

11 years agoMerge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-11-26-11-43-18
kurund [Tue, 26 Nov 2013 06:13:26 +0000 (11:43 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-11-26-11-43-18

11 years agoMerge pull request #2088 from colemanw/4.4
Kurund Jalmi [Tue, 26 Nov 2013 05:44:47 +0000 (21:44 -0800)]
Merge pull request #2088 from colemanw/4.4

CRM-13830 - MailingGroup API - hack to disable pseudoconstant lookup

11 years agoMerge pull request #2089 from eileenmcnaughton/CRM-13769
Kurund Jalmi [Tue, 26 Nov 2013 05:37:51 +0000 (21:37 -0800)]
Merge pull request #2089 from eileenmcnaughton/CRM-13769

CRM-13769 Backoffice membership renewal form - prefill time

11 years agoCRM_Utils_Hook_Joomla - Fix PHP fatal parse error (missing comma)
colemanw [Tue, 26 Nov 2013 04:23:01 +0000 (20:23 -0800)]
CRM_Utils_Hook_Joomla - Fix PHP fatal parse error (missing comma)

11 years agoCRM-13769 Backoffice membership renewal form - prefill time
Eileen [Tue, 26 Nov 2013 03:27:35 +0000 (16:27 +1300)]
CRM-13769 Backoffice membership renewal form - prefill time
This has already been fixed in 4.4 for backoffice membership form on receive-date field, but not on renewal form

----------------------------------------
* CRM-13769: Receive date time field on membership page should prefill with current time
  http://issues.civicrm.org/jira/browse/CRM-13769

11 years agoCRM-13769 - backoffice membership form - prefill time
Eileen [Thu, 14 Nov 2013 23:50:47 +0000 (12:50 +1300)]
CRM-13769 - backoffice membership form - prefill time

----------------------------------------
* CRM-13769: Receive date time field on membership page should prefill with current time
  http://issues.civicrm.org/jira/browse/CRM-13769

11 years agoCRM-13830 - MailingGroup API - hack to disable pseudoconstant lookup
Coleman Watts [Mon, 25 Nov 2013 22:34:57 +0000 (14:34 -0800)]
CRM-13830 - MailingGroup API - hack to disable pseudoconstant lookup

11 years agoMerge pull request #2082 from kurund/CRM-13824
dlobo [Mon, 25 Nov 2013 20:51:16 +0000 (12:51 -0800)]
Merge pull request #2082 from kurund/CRM-13824

fixes for CRM-13824

11 years agoMerge pull request #2085 from dlobo/EncodingFixes
dlobo [Mon, 25 Nov 2013 20:32:32 +0000 (12:32 -0800)]
Merge pull request #2085 from dlobo/EncodingFixes

Fix characters with wrong encoding

11 years agoFix characters with wrong encoding
Donald A. Lobo [Mon, 25 Nov 2013 20:31:51 +0000 (12:31 -0800)]
Fix characters with wrong encoding

11 years agoMerge pull request #2080 from colemanw/checkSqlFunctionsExist
dlobo [Mon, 25 Nov 2013 14:59:38 +0000 (06:59 -0800)]
Merge pull request #2080 from colemanw/checkSqlFunctionsExist

CRM-13822 - Ensure mysql phone function exists

11 years agofixes for CRM-13824
kurund [Mon, 25 Nov 2013 14:55:29 +0000 (20:25 +0530)]
fixes for CRM-13824

----------------------------------------
* CRM-13824: Fatal error on contribution page
  http://issues.civicrm.org/jira/browse/CRM-13824

11 years agoMerge pull request #2062 from dlobo/CRM-13806
Kurund Jalmi [Mon, 25 Nov 2013 13:30:56 +0000 (05:30 -0800)]
Merge pull request #2062 from dlobo/CRM-13806

CRM-13806 - Only accept valid profile urls

11 years agoMerge pull request #2079 from yashodha/CRM-13812
Kurund Jalmi [Mon, 25 Nov 2013 13:21:50 +0000 (05:21 -0800)]
Merge pull request #2079 from yashodha/CRM-13812

CRM-13812 - fixed the broken query for activity search

11 years agoMerge pull request #2081 from eileenmcnaughton/metadata
Kurund Jalmi [Mon, 25 Nov 2013 11:14:51 +0000 (03:14 -0800)]
Merge pull request #2081 from eileenmcnaughton/metadata

Metadata

11 years agoAdd Batch metadata
Eileen [Tue, 19 Nov 2013 01:20:24 +0000 (14:20 +1300)]
Add Batch metadata

11 years agoAdd missing titles on Campaign Schema
Eileen [Mon, 18 Nov 2013 18:32:14 +0000 (18:32 +0000)]
Add missing titles on Campaign Schema

11 years agoCRM-13822 - Ensure mysql phone function exists
Coleman Watts [Mon, 25 Nov 2013 04:53:14 +0000 (20:53 -0800)]
CRM-13822 - Ensure mysql phone function exists

11 years agoMerge pull request #2072 from dlobo/CRM-13815
dlobo [Sun, 24 Nov 2013 17:34:30 +0000 (09:34 -0800)]
Merge pull request #2072 from dlobo/CRM-13815

CRM-13815 - Restrict the number of scheduled jobs log entries shown

11 years agoFix invalid html on options admin page
Coleman Watts [Sun, 24 Nov 2013 01:43:00 +0000 (17:43 -0800)]
Fix invalid html on options admin page

11 years agoMerge pull request #2076 from colemanw/CRM-11864
colemanw [Sun, 24 Nov 2013 00:59:48 +0000 (16:59 -0800)]
Merge pull request #2076 from colemanw/CRM-11864

Add profilebuilder to contribution page + system-wide ajax improvements

11 years agoMerge pull request #2074 from pratik-joshi/CRM-13814
dlobo [Sat, 23 Nov 2013 14:48:38 +0000 (06:48 -0800)]
Merge pull request #2074 from pratik-joshi/CRM-13814

CRM-13814

11 years agoMerge pull request #2075 from ErichBSchulz/patch-1
dlobo [Sat, 23 Nov 2013 14:46:34 +0000 (06:46 -0800)]
Merge pull request #2075 from ErichBSchulz/patch-1

correct doc block cut and paste error

11 years agocorrect doc block cut and paste error
Erich [Sat, 23 Nov 2013 12:50:38 +0000 (22:50 +1000)]
correct doc block cut and paste error

11 years agoCRM_Core_Component::flushEnabledComponents - Trigger after any change to settings...
Tim Otten [Sat, 23 Nov 2013 06:59:42 +0000 (12:29 +0530)]
CRM_Core_Component::flushEnabledComponents - Trigger after any change to settings (not just CiviCase activation)

11 years agoMerge branch 'CRM-PostInstall' of git://github.com/vivekarora/civicrm-core into pull...
Tim Otten [Sat, 23 Nov 2013 06:44:53 +0000 (12:14 +0530)]
Merge branch 'CRM-PostInstall' of git://github.com/vivekarora/civicrm-core into pull-request-2069

11 years agoRemoved debugging code
vivekarora [Sat, 23 Nov 2013 05:32:42 +0000 (11:02 +0530)]
Removed debugging code

11 years agoMerge pull request #1976 from eileenmcnaughton/CRM-13737
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

11 years agoCRM-10693 - LoadPage/Form improvements
Coleman Watts [Fri, 22 Nov 2013 23:05:51 +0000 (15:05 -0800)]
CRM-10693 - LoadPage/Form improvements

11 years agoMerge pull request #2073 from dlobo/CRM-13816
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()

11 years agoCRM-13816 - Undefined index notice due to disabled memberships in CRM_Member_BAO_Memb...
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

11 years agoMerge pull request #2070 from dlobo/CRM-13799
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

11 years agoCRM-13815 - Restrict the number of scheduled jobs log entries shown
Donald A. Lobo [Fri, 22 Nov 2013 14:38:35 +0000 (06:38 -0800)]
CRM-13815 - Restrict the number of scheduled jobs log entries shown

http://issues.civicrm.org/jira/browse/CRM-13815

11 years agoCRM-13814
Pratik Joshi [Fri, 22 Nov 2013 13:55:19 +0000 (19:25 +0530)]
CRM-13814

11 years agoMerge pull request #2071 from mgbdev/CRM-13693
dlobo [Fri, 22 Nov 2013 13:45:02 +0000 (05:45 -0800)]
Merge pull request #2071 from mgbdev/CRM-13693

Delete Profile - buttons unnecessarily repeated

11 years agoCRM-13812 - fixed the broken query for activity search
yashodha [Fri, 22 Nov 2013 13:07:55 +0000 (18:37 +0530)]
CRM-13812 - fixed the broken query for activity search

11 years agoDelete Profile - buttons unnecessarily repeated
mgbdev [Fri, 22 Nov 2013 05:59:39 +0000 (11:29 +0530)]
Delete Profile - buttons unnecessarily repeated

11 years agoMerge pull request #2066 from totten/4.4-ufgroup-warning
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

11 years agoCRM-13799 - group contacts list doesn't reflect correct status
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

11 years agoPost install hook
vivekarora [Thu, 21 Nov 2013 12:42:07 +0000 (18:12 +0530)]
Post install hook

11 years agoMerge pull request #2065 from mgbdev/crm-10994
Kurund Jalmi [Thu, 21 Nov 2013 06:44:44 +0000 (22:44 -0800)]
Merge pull request #2065 from mgbdev/crm-10994

Crm 10994

11 years agoCRM_Core_BAO_UFGroup - Fix warning with unknown provider
Tim Otten [Thu, 21 Nov 2013 06:14:03 +0000 (11:44 +0530)]
CRM_Core_BAO_UFGroup - Fix warning with unknown provider

11 years agoCRM-10994 in import bash donations not allowed
mgbdev [Thu, 21 Nov 2013 05:28:29 +0000 (10:58 +0530)]
CRM-10994 in import bash donations not allowed

11 years agoCRM-10994 in import bash donations not allowed
mgbdev [Thu, 21 Nov 2013 05:26:43 +0000 (10:56 +0530)]
CRM-10994 in import bash donations not allowed

11 years agoUpdate version to 4.4.3
CiviCRM [Thu, 21 Nov 2013 05:17:12 +0000 (21:17 -0800)]
Update version to 4.4.3

11 years agoCRM-13807 - Add comments and null test
Coleman Watts [Thu, 21 Nov 2013 04:33:17 +0000 (20:33 -0800)]
CRM-13807 - Add comments and null test

11 years agoMerge pull request #2064 from colemanw/4.4
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

11 years agoCRM-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

11 years agoMerge pull request #2063 from colemanw/4.4
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

11 years agoCRM-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

11 years agoCRM-13806 - Only accept valid profile urls
Donald A. Lobo [Thu, 21 Nov 2013 02:03:24 +0000 (18:03 -0800)]
CRM-13806 - Only accept valid profile urls

http://issues.civicrm.org/jira/browse/CRM-13806

11 years agoMerge pull request #2061 from civicrm/4.3
colemanw [Thu, 21 Nov 2013 01:02:07 +0000 (17:02 -0800)]
Merge pull request #2061 from civicrm/4.3

4.3

11 years agoMerge pull request #2059 from davecivicrm/CRM-13786b
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 ...

11 years agoMerge pull request #2060 from davecivicrm/CRM-13876c
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...

11 years agoMerge pull request #2058 from fjg-conflux/CRM-13805
dlobo [Thu, 21 Nov 2013 00:33:28 +0000 (16:33 -0800)]
Merge pull request #2058 from fjg-conflux/CRM-13805

CRM-13805 - Set a status alert if cURL is not installed.

11 years agoMerge pull request #2055 from JoeMurray/CRM-13793
dlobo [Thu, 21 Nov 2013 00:32:06 +0000 (16:32 -0800)]
Merge pull request #2055 from JoeMurray/CRM-13793

CRM-13793 assignment in condition code cleanup. Also line 107 fixed apparent bug.

11 years agoCRM-13786 - Fix calc of membership end date when join date is in the past (for fixed...
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

11 years agoCRM-13786 Applying updated patch from Karin which fixes the calculation of start...
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

11 years agoMerge pull request #2057 from kurund/CRM-13794
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...

11 years agoCRM-13805 - Set a status alert if cURL is not installed.
Frank J. Gómez [Wed, 20 Nov 2013 21:28:46 +0000 (16:28 -0500)]
CRM-13805 - Set a status alert if cURL is not installed.

----------------------------------------
* CRM-13805: Fetching CiviCRM News fails silently if cURL is not installed
  http://issues.civicrm.org/jira/browse/CRM-13805

11 years agoalways check if result set has pseudo constants like state, country.. CRM-13794
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

11 years agoMerge pull request #2056 from kurund/overlay-css-fixes
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

11 years agofixed 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

11 years agoCRM-13793 assignment in condition code cleanup. Also line 107 fixed apparent bug.
Joe Murray [Wed, 20 Nov 2013 17:12:38 +0000 (12:12 -0500)]
CRM-13793 assignment in condition code cleanup. Also line 107 fixed apparent bug.

11 years agoMerge pull request #2054 from colemanw/4.4
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

11 years agoCRM-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

11 years agoMerge pull request #2053 from monishdeb/CRM-13738
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

11 years agoCRM-13738 related improvisation and notice fix
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

11 years agoMerge pull request #2052 from pratik-joshi/HR-200
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

11 years agoMerge pull request #2050 from mgbdev/CRM-13759
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

11 years agohr-200 : failure for hr-200 unit test was encountered due to 'Only variables should...
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

11 years agoCRM-13759 add webtest for multiple phone edit
mgbdev [Wed, 20 Nov 2013 13:33:04 +0000 (19:03 +0530)]
CRM-13759 add webtest for multiple phone edit

11 years agoCRM-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

11 years agoMerge pull request #2048 from monishdeb/CRM-13795
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

11 years agoMerge pull request #2047 from pratik-joshi/CRM-10635
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

11 years agoCRM-13795 related fix
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

11 years agoMerge pull request #1997 from vivekarora/CRM-13165-ApiFixes
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

11 years agoCRM-10635 : parents processing on initial load of manage display screen of groups
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

11 years agoSet name from title if that is not given in API
vivekarora [Wed, 20 Nov 2013 07:54:04 +0000 (13:24 +0530)]
Set name from title if that is not given in API

11 years agoMerge pull request #2046 from yashodha/feedfixes
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

11 years agoMerge pull request #2043 from totten/4.4-case-test
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

11 years agoparameterise getFeed method to accept blog url to be displayed in news section
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

11 years agoMerge pull request #2045 from pratik-joshi/CRM-13771
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

11 years agoCRM-13768 - api_v3_CaseTest::testCreateCaseEmpty - Fix regression and warning
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

11 years agoCRM-13771 : faced a fatal error while reproducing this issue, fix done is handling...
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

11 years agoMerge pull request #2038 from jmcclelland/honor-roll-4.4
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

11 years agoMerge pull request #2042 from dlobo/NoticeFixes
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

11 years agodo 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

11 years agoMerge pull request #2037 from jmcclelland/reports-with-custom-fields
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.

11 years agoMerge pull request #2039 from jmcclelland/assignee-email
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

11 years agoUpdate Activity.tpl
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)

11 years agoensure email to contact works when assignee and activity
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

11 years agoDefault to including in honor roll anonymously
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

11 years agoOnly add option to display in honor role if PCP allows honor role
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

11 years agoensure activity reports with custom fields work properly.
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