dlobo [Mon, 18 Nov 2013 21:08:46 +0000 (13:08 -0800)]
Merge pull request #2018 from dlobo/NoticeFixes
fix notice messages on function definition and call
Donald A. Lobo [Mon, 18 Nov 2013 16:57:28 +0000 (08:57 -0800)]
formatting fixes
Donald A. Lobo [Mon, 18 Nov 2013 16:21:43 +0000 (08:21 -0800)]
more static function fixes
Donald A. Lobo [Mon, 18 Nov 2013 15:57:07 +0000 (07:57 -0800)]
fix notice messages on function definition and call
Donald A. Lobo [Mon, 18 Nov 2013 15:13:13 +0000 (07:13 -0800)]
fix notice messages on function definition and call
kurund [Mon, 18 Nov 2013 13:32:24 +0000 (19:02 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-18-19-02-17
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 11:02:47 +0000 (03:02 -0800)]
Merge pull request #1818 from pradpnayak/CRM-13578
--CRM-13578
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
dlobo [Sun, 17 Nov 2013 16:40:28 +0000 (08:40 -0800)]
Merge pull request #1991 from dlobo/CRM-13760
CRM-13760 - improve spec code and cleanup
colemanw [Sun, 17 Nov 2013 01:07:34 +0000 (17:07 -0800)]
Merge pull request #2007 from civicrm/4.4
Merge branch 4.4 into master
colemanw [Sun, 17 Nov 2013 01:06:39 +0000 (17:06 -0800)]
Merge pull request #2006 from civicrm/4.3
Merge branch 4.3 into 4.4
Coleman Watts [Sun, 17 Nov 2013 01:04:48 +0000 (17:04 -0800)]
Fix comment in CRM_Core_Session
colemanw [Sat, 16 Nov 2013 23:25:14 +0000 (15:25 -0800)]
Merge pull request #2005 from colemanw/4.3
CRM-13782 - snippet/print tpl - Fix messages display
Coleman Watts [Sat, 16 Nov 2013 23:23:36 +0000 (15:23 -0800)]
CRM-13782 - snippet/print tpl - Fix messages display
dlobo [Sat, 16 Nov 2013 16:31:57 +0000 (08:31 -0800)]
Merge pull request #2004 from dlobo/NoticeFixes
fix notice messages reported on forum
Donald A. Lobo [Sat, 16 Nov 2013 15:52:08 +0000 (07:52 -0800)]
fix notice messages reported on forum
Tim Otten [Sat, 16 Nov 2013 10:29:03 +0000 (02:29 -0800)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-16-02-28-05
Conflicts:
css/civicrm.css
Dave Greenberg [Fri, 15 Nov 2013 23:53:07 +0000 (15:53 -0800)]
Merge pull request #1985 from kirkatcaat/upstream
Enable participant roles to be changed from counted to not counted (CRM-13761)
Tim Otten [Fri, 15 Nov 2013 23:15:31 +0000 (15:15 -0800)]
Merge pull request #2002 from totten/4.4-actionschedule-groupid
SyntaxConformanceTest - Skip single-value-alter for ActionSchedule.group_id
Tim Otten [Fri, 15 Nov 2013 23:09:04 +0000 (15:09 -0800)]
SyntaxConformanceTest - Skip single-value-alter for ActionSchedule.group_id
dlobo [Fri, 15 Nov 2013 17:40:55 +0000 (09:40 -0800)]
Merge pull request #2001 from dlobo/CRM-13766
CRM-13766 - dont reset scheduled_date, use create function to reset appr...
Donald A. Lobo [Fri, 15 Nov 2013 17:33:25 +0000 (09:33 -0800)]
CRM-13766 - dont reset scheduled_date, use create function to reset approval fields
----------------------------------------
* CRM-13766: civimail with workflow broken: scheduled date not stored with mailing job
http://issues.civicrm.org/jira/browse/CRM-13766
dlobo [Fri, 15 Nov 2013 16:58:16 +0000 (08:58 -0800)]
Merge pull request #1990 from dlobo/CRM-13765
CRM-13765 - Initialization error throws a undefined function php error
dlobo [Fri, 15 Nov 2013 16:00:31 +0000 (08:00 -0800)]
Merge pull request #1993 from lcdservices/CRM-13766
CRM-13766 set scheduled date in params after approval
dlobo [Fri, 15 Nov 2013 15:55:05 +0000 (07:55 -0800)]
Merge pull request #2000 from dlobo/NameFixes
Fix spelling since class names are case sensitive
Donald A. Lobo [Fri, 15 Nov 2013 15:54:31 +0000 (07:54 -0800)]
Fix spelling since class names are case sensitive
Kurund Jalmi [Fri, 15 Nov 2013 10:52:06 +0000 (02:52 -0800)]
Merge pull request #1983 from NileemaJadhav/CRM-HR-13747
-- CRM-13747 CiviCase label and title simplification to increase adaptability
Kurund Jalmi [Fri, 15 Nov 2013 10:51:24 +0000 (02:51 -0800)]
Merge pull request #1986 from dlobo/CRM-13714
CRM-13714 - use joomla 3.x to render error template - title still buggy
Kurund Jalmi [Fri, 15 Nov 2013 10:40:10 +0000 (02:40 -0800)]
Merge pull request #1996 from kurund/CRM-13769
applied patch for CRM-13769
kurund [Fri, 15 Nov 2013 10:39:20 +0000 (16:09 +0530)]
applied patch for CRM-13769
----------------------------------------
* CRM-13769: Receive date time field on membership page should prefill with current time
http://issues.civicrm.org/jira/browse/CRM-13769
Kurund Jalmi [Fri, 15 Nov 2013 10:30:38 +0000 (02:30 -0800)]
Merge pull request #1995 from kurund/CRM-13770
patched fix for CRM-13770
kurund [Fri, 15 Nov 2013 10:28:29 +0000 (15:58 +0530)]
patched fix for CRM-13770
----------------------------------------
* CRM-13770: Recurring Paypal Contributions for merged contacts are being recorded against the wrong contact
http://issues.civicrm.org/jira/browse/CRM-13770
Kurund Jalmi [Fri, 15 Nov 2013 10:14:35 +0000 (02:14 -0800)]
Merge pull request #1984 from dlobo/CRM-13621
CRM-13621 - suppress entryURL for snippet forms
Kurund Jalmi [Fri, 15 Nov 2013 08:24:15 +0000 (00:24 -0800)]
Merge pull request #1980 from monishdeb/CRM-13738
CRM-13738 fix - Activity Report fails if filtering on any contact
Tim Otten [Fri, 15 Nov 2013 08:07:20 +0000 (00:07 -0800)]
CRM-13768 - enable_components - Use same logic when toggling components via API and web UI
----------------------------------------
* CRM-13768: CiviCase not fully activated during extension installation
http://issues.civicrm.org/jira/browse/CRM-13768
Tim Otten [Fri, 15 Nov 2013 01:02:16 +0000 (17:02 -0800)]
CRM-13768 - api_v3_SettingTest, CRM_Core_BAO_SettingTest - Test for on_change event
----------------------------------------
* CRM-13768: CiviCase not fully activated during extension installation
http://issues.civicrm.org/jira/browse/CRM-13768
Tim Otten [Thu, 14 Nov 2013 23:31:41 +0000 (15:31 -0800)]
CRM-13768 - CRM_Core_BAO_Setting - Fire on_change events
----------------------------------------
* CRM-13768: CiviCase not fully activated during extension installation
http://issues.civicrm.org/jira/browse/CRM-13768
Tim Otten [Fri, 15 Nov 2013 01:01:28 +0000 (17:01 -0800)]
api/v3/Setting - Better reporting of errors
Brian Shaughnessy [Fri, 15 Nov 2013 01:24:07 +0000 (20:24 -0500)]
CRM-13766 set scheduled date in params after approval
Donald A. Lobo [Thu, 14 Nov 2013 23:43:38 +0000 (15:43 -0800)]
CRM-13760 - add comments to clarify debug call
----------------------------------------
* CRM-13760: "Geocoding failed. Message from Google: OVER_QUERY_LIMIT" should not be fatal
http://issues.civicrm.org/jira/browse/CRM-13760
Donald A. Lobo [Thu, 14 Nov 2013 21:54:29 +0000 (13:54 -0800)]
CRM-13765 - Initialization error throws a undefined function php error
http://issues.civicrm.org/jira/browse/CRM-13765
Tim Otten [Thu, 14 Nov 2013 23:30:56 +0000 (15:30 -0800)]
CRM_Core_BAO_Setting - Autocleanup
Tim Otten [Thu, 14 Nov 2013 22:57:06 +0000 (14:57 -0800)]
Merge pull request #1992 from totten/4.4-actionschedule
ActionSchedule - Backport API (master=>4.4)
Tim Otten [Thu, 14 Nov 2013 22:40:41 +0000 (14:40 -0800)]
CRM-13615 - Fix PHP error
----------------------------------------
* CRM-13615: Implement API for Scheduled Reminders
http://issues.civicrm.org/jira/browse/CRM-13615
Donald A. Lobo [Thu, 14 Nov 2013 22:37:59 +0000 (14:37 -0800)]
CRM-13760 - improve spec code and cleanup
----------------------------------------
* CRM-13760: "Geocoding failed. Message from Google: OVER_QUERY_LIMIT" should not be fatal
http://issues.civicrm.org/jira/browse/CRM-13760
vivekarora [Tue, 12 Nov 2013 13:56:20 +0000 (19:26 +0530)]
Code review for schedule reminders
dlobo [Thu, 14 Nov 2013 19:42:58 +0000 (11:42 -0800)]
Merge pull request #1989 from cividesk/CRM-13763
CRM-13763
Nicolas Ganivet [Thu, 14 Nov 2013 19:35:16 +0000 (12:35 -0700)]
Full fix
colemanw [Thu, 14 Nov 2013 19:12:20 +0000 (11:12 -0800)]
Merge pull request #1988 from colemanw/4.4
CRM-13758 - Fix profile fields gender, prefix, suffix
Coleman Watts [Thu, 14 Nov 2013 19:02:13 +0000 (11:02 -0800)]
CRM-13758 - Fix profile fields gender, prefix, suffix
Donald A. Lobo [Thu, 14 Nov 2013 16:51:14 +0000 (08:51 -0800)]
CRM-13714 - use joomla 3.x to render error template - title still buggy
----------------------------------------
* CRM-13714: Display fatal error for Joomla 3.x
http://issues.civicrm.org/jira/browse/CRM-13714
Kirk Jackson [Thu, 14 Nov 2013 16:02:51 +0000 (16:02 +0000)]
Enable participant roles to be changed from counted to not counted
Donald A. Lobo [Thu, 14 Nov 2013 14:16:20 +0000 (06:16 -0800)]
CRM-13621 - suppress entryURL for snippet forms
----------------------------------------
* CRM-13621: Handle invalid session errors for public pages in a nicer manner
http://issues.civicrm.org/jira/browse/CRM-13621
Nileema [Thu, 14 Nov 2013 13:39:28 +0000 (19:09 +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
Kurund Jalmi [Thu, 14 Nov 2013 13:02:02 +0000 (05:02 -0800)]
Merge pull request #1982 from mgbdev/CRM-10225
Crm 10225 related fix
mgbdev [Thu, 14 Nov 2013 12:41:10 +0000 (18:11 +0530)]
CRM-10225 indentation fix
mgbdev [Thu, 14 Nov 2013 12:31:40 +0000 (18:01 +0530)]
CRM-10225 fix
mgbdev [Thu, 14 Nov 2013 12:21:40 +0000 (17:51 +0530)]
CRM-10025:Price Set Error
Kurund Jalmi [Thu, 14 Nov 2013 11:28:30 +0000 (03:28 -0800)]
Merge pull request #1931 from monishdeb/CRM-10225
CRM-10225 fix - New Price Set Error
Kurund Jalmi [Thu, 14 Nov 2013 09:58:33 +0000 (01:58 -0800)]
Merge pull request #1978 from eileenmcnaughton/CRM-13757
CRM-13757 Paypal Pro IPN - fix type on recurring_payment_id (Closes)
monishdeb [Thu, 14 Nov 2013 08:24:24 +0000 (13:54 +0530)]
CRM-13738 fix - Activity Report fails if filtering on any contact
http://issues.civicrm.org/jira/browse/CRM-13738
Eileen [Thu, 14 Nov 2013 01:27:56 +0000 (14:27 +1300)]
CRM-13757 Paypal Pro IPN - fix type on recurring_payment_id
----------------------------------------
* CRM-13757: Paypal pro ipn - 'recurring_payment_id' incorrectly typed as an integer
http://issues.civicrm.org/jira/browse/CRM-13757
Tim Otten [Wed, 13 Nov 2013 23:16:22 +0000 (15:16 -0800)]
Merge pull request #1951 from mlutfy/4.4-crm13740
CRM-13740: enforce https when necessary, on ->extensionsURL.
Dave Greenberg [Wed, 13 Nov 2013 22:39:49 +0000 (14:39 -0800)]
Merge pull request #1977 from davecivicrm/CRM-13750
CRM-13750 Add search by permissioned relationship to Advanced Search.
Dave Greenberg [Wed, 13 Nov 2013 22:29:53 +0000 (14:29 -0800)]
CRM-13750 Add search by permissioned relationship to Advanced Search.
----------------------------------------
* CRM-13750: Advanced search - add permissioned relationship as a criteria
http://issues.civicrm.org/jira/browse/CRM-13750
Kurund Jalmi [Wed, 13 Nov 2013 18:47:00 +0000 (10:47 -0800)]
Merge pull request #1965 from dlobo/CRM-13739
CRM-13739 - Transaction ID limited to 16chars when exporting event parti...
Kurund Jalmi [Wed, 13 Nov 2013 18:41:16 +0000 (10:41 -0800)]
Merge pull request #1975 from kurund/CRM-13741
manually applying PR for CRM-13741
kurund [Wed, 13 Nov 2013 18:40:15 +0000 (00:10 +0530)]
manually applying PR for CRM-13741
----------------------------------------
* CRM-13741: Strike through names of survey participants that have already been interviewed
http://issues.civicrm.org/jira/browse/CRM-13741
dlobo [Wed, 13 Nov 2013 16:05:49 +0000 (08:05 -0800)]
Merge pull request #1956 from eileenmcnaughton/CRM-13743
CRM-13743 use paypal receive date on ipn
dlobo [Wed, 13 Nov 2013 16:03:36 +0000 (08:03 -0800)]
Merge pull request #1950 from pratik-joshi/CRM-13735
CRM-13735
dlobo [Wed, 13 Nov 2013 16:02:40 +0000 (08:02 -0800)]
Merge pull request #1973 from kurund/CRM-13587
CRM-13587, fixes trigger issue while updating custom group - contact subtypes
Kurund Jalmi [Wed, 13 Nov 2013 14:01:28 +0000 (06:01 -0800)]
Merge pull request #1968 from davecivicrm/CRM-13742
CRM-13742 conditional display of invite to create your own PCP after com...
kurund [Wed, 13 Nov 2013 13:46:27 +0000 (19:16 +0530)]
fixes for CRM-13587, due to mysql limitations drop and rebuild trigger
----------------------------------------
* CRM-13587: Can't update table 'civicrm_contact' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
http://issues.civicrm.org/jira/browse/CRM-13587
Yashodha Chaku [Wed, 13 Nov 2013 11:20:43 +0000 (03:20 -0800)]
Merge pull request #1972 from NileemaJadhav/CRM-13617webtest
-- CRM-13617 Webtest modification
kurund [Wed, 13 Nov 2013 10:43:15 +0000 (16:13 +0530)]
notice fixes
Nileema [Wed, 13 Nov 2013 10:29:31 +0000 (15:59 +0530)]
-- CRM-13617 Webtest modification
----------------------------------------
* CRM-13617: Link Country and state province widget for custom data
http://issues.civicrm.org/jira/browse/CRM-13617
Kurund Jalmi [Wed, 13 Nov 2013 07:01:06 +0000 (23:01 -0800)]
Merge pull request #1969 from totten/4.4-gencode
GenCode, etal - WordPress fixes
Yashodha Chaku [Wed, 13 Nov 2013 06:48:33 +0000 (22:48 -0800)]
Merge pull request #1961 from vivekarora/CRM-13615-Api
Code review for schedule reminders
Yashodha Chaku [Wed, 13 Nov 2013 06:31:06 +0000 (22:31 -0800)]
Merge pull request #1971 from yashodha/CRM-13617
CRM-13617 - fix linking state province and country in multi-value custom fields
yashodha [Wed, 13 Nov 2013 04:44:51 +0000 (10:14 +0530)]
CRM-13617 - fix linking state province and country in multi-value custom fields
Tim Otten [Wed, 13 Nov 2013 01:53:19 +0000 (17:53 -0800)]
setup.sh - Add support for WordPress
Tim Otten [Wed, 13 Nov 2013 01:05:01 +0000 (17:05 -0800)]
distmaker - WordPress - Read civicrm.config.php from WordPress repo
Tim Otten [Wed, 13 Nov 2013 00:54:33 +0000 (16:54 -0800)]
GenCode - Allow generating on WordPress without Drupal around. Use more constructor injection.
Tim Otten [Wed, 13 Nov 2013 00:45:12 +0000 (16:45 -0800)]
distmaker - drupal7 - Attempt to detect GNU or BSD sed
Dave Greenberg [Wed, 13 Nov 2013 00:50:45 +0000 (16:50 -0800)]
CRM-13742 conditional display of invite to create your own PCP after completing a contribution or event registration as a supporter.
----------------------------------------
* CRM-13742: PCP message should not always promise ability to create your own PCP
http://issues.civicrm.org/jira/browse/CRM-13742
colemanw [Tue, 12 Nov 2013 21:43:24 +0000 (13:43 -0800)]
Merge pull request #1967 from colemanw/master
CRM-12578 - Remove extras.css
Coleman Watts [Tue, 12 Nov 2013 21:37:43 +0000 (13:37 -0800)]
CRM-12578 - Remove extras.css
Donald A. Lobo [Tue, 12 Nov 2013 17:45:59 +0000 (09:45 -0800)]
CRM-13739 - Transaction ID limited to 16chars when exporting event participations
http://issues.civicrm.org/jira/browse/CRM-13739
dlobo [Tue, 12 Nov 2013 17:16:59 +0000 (09:16 -0800)]
Merge pull request #1964 from dlobo/CRM-13746
CRM-13746 - Enable delete hooks for Mailings
Donald A. Lobo [Tue, 12 Nov 2013 17:16:16 +0000 (09:16 -0800)]
CRM-13746 - Enable delete hooks for Mailings
http://issues.civicrm.org/jira/browse/CRM-13746
projects / civicrm-core.git / log