Kurund Jalmi [Wed, 5 Jun 2013 12:33:41 +0000 (18:03 +0530)]
notice fix
Tim Otten [Tue, 4 Jun 2013 23:32:59 +0000 (16:32 -0700)]
Merge pull request #957 from colemanw/getQuick
Escape sql in contact.getquick api
Coleman Watts [Tue, 4 Jun 2013 22:34:36 +0000 (15:34 -0700)]
Move all escaping from Ajax callback to api CRM-12765
Coleman Watts [Tue, 4 Jun 2013 19:42:35 +0000 (12:42 -0700)]
Remove escaping from ajax callback, it is now handled by api CRM-12765
Coleman Watts [Tue, 4 Jun 2013 18:13:43 +0000 (11:13 -0700)]
Escape sql in contact.getquick api CRM-12765
Kurund Jalmi [Tue, 4 Jun 2013 16:40:28 +0000 (09:40 -0700)]
Merge pull request #956 from kurund/fix-gendata
fixed incorrect report instance id's in sample dashlets
deepak-srivastava [Tue, 4 Jun 2013 15:44:30 +0000 (08:44 -0700)]
Merge pull request #954 from deepak-srivastava/4.3
php 5.4 notice fixes
Kurund Jalmi [Tue, 4 Jun 2013 15:39:13 +0000 (21:09 +0530)]
fixed incorrect report instance id's in sample dashlets
Deepak Srivastava [Tue, 4 Jun 2013 15:39:10 +0000 (21:09 +0530)]
php 5.4 notice fixes
Kurund Jalmi [Tue, 4 Jun 2013 15:03:41 +0000 (08:03 -0700)]
Merge pull request #953 from pratik-joshi/event-income-summary-report-charts-no-display
fix for bar chart and pie chart not displaying for event income summary ...
Pratik Joshi [Tue, 4 Jun 2013 14:56:19 +0000 (20:26 +0530)]
fix for bar chart and pie chart not displaying for event income summary report
Kurund Jalmi [Tue, 4 Jun 2013 13:10:29 +0000 (06:10 -0700)]
Merge pull request #951 from ravishnair/CRM-12741webtest
-- CRM-12741 webtest
Ravish Nair [Tue, 4 Jun 2013 07:22:37 +0000 (12:52 +0530)]
-- CRM-12741 webtest
dlobo [Mon, 3 Jun 2013 20:48:58 +0000 (13:48 -0700)]
Merge pull request #947 from dlobo/FormattingFixes
misc fixes while testing ofc and wkhtml
Donald A. Lobo [Mon, 3 Jun 2013 20:47:06 +0000 (13:47 -0700)]
misc fixes while testing ofc and wkhtml
colemanw [Mon, 3 Jun 2013 19:38:34 +0000 (12:38 -0700)]
Merge pull request #946 from dlobo/CRM-12750
CRM-12755
dlobo [Mon, 3 Jun 2013 17:57:26 +0000 (10:57 -0700)]
Merge pull request #945 from totten/4.3-indent
Fix indentation
Donald A. Lobo [Mon, 3 Jun 2013 16:10:42 +0000 (09:10 -0700)]
CRM-12750
----------------------------------------
* CRM-12750: upgrade smarty to 2.6.27
http://issues.civicrm.org/jira/browse/CRM-12750
Tim Otten [Mon, 3 Jun 2013 15:20:21 +0000 (11:20 -0400)]
Fix indentation
Kurund Jalmi [Mon, 3 Jun 2013 14:28:00 +0000 (07:28 -0700)]
Merge pull request #943 from kurund/CRM-12752
CRM-12752, check ids instead of label for showing notification checkbox below participant status
Kurund Jalmi [Mon, 3 Jun 2013 13:05:19 +0000 (18:35 +0530)]
CRM-12752, check ids instead of label for showing notification checkbox, also code cleanup
Kurund Jalmi [Mon, 3 Jun 2013 12:59:41 +0000 (18:29 +0530)]
remove obsolete code
Kurund Jalmi [Mon, 3 Jun 2013 10:10:51 +0000 (03:10 -0700)]
Merge pull request #941 from kurund/CRM-12711
removing code that popsup dialog on load in j2,j3 and wp
Kurund Jalmi [Mon, 3 Jun 2013 09:59:50 +0000 (15:29 +0530)]
removing code that popsup dialog on load in j2,j3 and wp
Kurund Jalmi [Mon, 3 Jun 2013 09:56:17 +0000 (02:56 -0700)]
Merge pull request #930 from colemanw/task.tpl
Fix missing ($) CRM-12711
Kurund Jalmi [Mon, 3 Jun 2013 07:12:23 +0000 (00:12 -0700)]
Merge pull request #940 from pratik-joshi/CRM-12741
CRM-12741 : did event template handing while price set deletion i.e appr...
Pratik Joshi [Mon, 3 Jun 2013 06:17:10 +0000 (11:47 +0530)]
CRM-12741 : did event template handing while price set deletion i.e appropriate message display while deleting price set used for event templates so can user is aware of price set / field usage
dlobo [Sun, 2 Jun 2013 13:53:03 +0000 (06:53 -0700)]
Merge pull request #937 from dlobo/CRM-12745
CRM-12745
Donald A. Lobo [Sun, 2 Jun 2013 13:52:15 +0000 (06:52 -0700)]
CRM-12745
----------------------------------------
* CRM-12745: AlterPreferences.php has Bad Characters
http://issues.civicrm.org/jira/browse/CRM-12745
Kurund Jalmi [Sun, 2 Jun 2013 12:12:19 +0000 (05:12 -0700)]
Merge pull request #936 from kurund/CRM-12594
fixed text typo
Kurund Jalmi [Sun, 2 Jun 2013 12:10:39 +0000 (17:40 +0530)]
fixed text typo
dlobo [Sat, 1 Jun 2013 20:15:24 +0000 (13:15 -0700)]
Merge pull request #927 from dlobo/CRM-12466
CRM-12466 - Add locking to smart group creation
Donald A. Lobo [Fri, 31 May 2013 23:25:47 +0000 (16:25 -0700)]
CRM-12466 - force will always reevaluate the query, used in tests
----------------------------------------
* CRM-12466: Group listings don't load
http://issues.civicrm.org/jira/browse/CRM-12466
Donald A. Lobo [Fri, 31 May 2013 23:24:17 +0000 (16:24 -0700)]
Merge branch '4.3' of git://github.com/civicrm/civicrm-core into CRM-12466
Kurund Jalmi [Fri, 31 May 2013 18:24:27 +0000 (11:24 -0700)]
Merge pull request #928 from yashodha/4.3
CRM-12734
colemanw [Fri, 31 May 2013 17:30:48 +0000 (10:30 -0700)]
Merge pull request #932 from colemanw/fullTextHelp
Fix fulltext search help
Coleman Watts [Fri, 31 May 2013 17:30:08 +0000 (10:30 -0700)]
Fix fulltext search help
Coleman Watts [Fri, 31 May 2013 16:03:46 +0000 (09:03 -0700)]
Fix missing ($) CRM-12711
Donald A. Lobo [Fri, 31 May 2013 15:45:14 +0000 (08:45 -0700)]
CRM-12466 - tweak function names, debug and check query logs
----------------------------------------
* CRM-12466: Group listings don't load
http://issues.civicrm.org/jira/browse/CRM-12466
yashodha [Fri, 31 May 2013 12:19:08 +0000 (17:49 +0530)]
CRM-12734
Donald A. Lobo [Fri, 31 May 2013 01:19:19 +0000 (18:19 -0700)]
CRM-12466
----------------------------------------
* CRM-12466: Group listings don't load
http://issues.civicrm.org/jira/browse/CRM-12466
Donald A. Lobo [Thu, 30 May 2013 00:20:28 +0000 (17:20 -0700)]
CRM-12466
----------------------------------------
* CRM-12466: Group listings don't load
http://issues.civicrm.org/jira/browse/CRM-12466
colemanw [Thu, 30 May 2013 20:49:11 +0000 (13:49 -0700)]
Merge pull request #923 from totten/findfiles-dotfiles
CRM_Utils_File::findFiles -- Ignore other dot directories (like .git / .bzr)
Tim Otten [Thu, 30 May 2013 20:45:36 +0000 (16:45 -0400)]
CRM_Utils_File::findFiles -- Ignore other dot directories (like .git / .bzr)
colemanw [Thu, 30 May 2013 18:19:51 +0000 (11:19 -0700)]
Merge pull request #920 from kurund/CRM-12681
CRM-12681, fixes for j2
colemanw [Thu, 30 May 2013 18:17:43 +0000 (11:17 -0700)]
Merge pull request #922 from colemanw/caseTitle
Simplify case title and remove redundant phrase CRM-12453
Coleman Watts [Thu, 30 May 2013 17:53:27 +0000 (10:53 -0700)]
Simplify case title and remove redundant phrase CRM-12453
Kurund Jalmi [Thu, 30 May 2013 17:31:56 +0000 (10:31 -0700)]
Merge pull request #921 from kurund/notice-fixes
notice fix
Kurund Jalmi [Thu, 30 May 2013 14:57:22 +0000 (20:27 +0530)]
CRM-12681, fixes for j2
Kurund Jalmi [Thu, 30 May 2013 14:55:50 +0000 (07:55 -0700)]
Merge pull request #918 from pratik-joshi/CRM-12728-fix
CRM-12728-fix : fixed notices
Pratik Joshi [Thu, 30 May 2013 14:38:27 +0000 (20:08 +0530)]
CRM-12728-fix : fixed notices
Kurund Jalmi [Thu, 30 May 2013 13:09:13 +0000 (06:09 -0700)]
Merge pull request #915 from pratik-joshi/CRM-12726-fix
CRM-12726 : applied patch and did some modifications
Pratik Joshi [Thu, 30 May 2013 13:03:56 +0000 (18:33 +0530)]
CRM-12726 : code improvement
Pratik Joshi [Thu, 30 May 2013 12:38:56 +0000 (18:08 +0530)]
CRM-12726 : applied patch and did some modifications
Kurund Jalmi [Thu, 30 May 2013 09:50:54 +0000 (15:20 +0530)]
notice fix
dlobo [Wed, 29 May 2013 20:27:15 +0000 (13:27 -0700)]
Merge pull request #907 from kurund/remove-nav
worked on CRM-12723, hide top nav bar on wordpress frontend
Coleman Watts [Wed, 29 May 2013 20:13:51 +0000 (13:13 -0700)]
Fix versionAlert setting CRM-12701
Kurund Jalmi [Wed, 29 May 2013 20:00:31 +0000 (01:30 +0530)]
worked on CRM-12723, hide top nav bar on wordpress frontend
Kurund Jalmi [Wed, 29 May 2013 19:18:17 +0000 (12:18 -0700)]
Merge pull request #905 from davecivicrm/CRM-12721
CRM-12721 Change a=true to a=1. Add fe=1 if missing. Add conditional to ...
Kurund Jalmi [Wed, 29 May 2013 19:16:50 +0000 (12:16 -0700)]
Merge pull request #904 from dlobo/CRM-12718
CRM-12718
Kurund Jalmi [Wed, 29 May 2013 18:53:23 +0000 (11:53 -0700)]
Merge pull request #902 from colemanw/searchBuilderDate
Remove empty operators for dates in search builder CRM-12712
Kurund Jalmi [Wed, 29 May 2013 18:51:37 +0000 (11:51 -0700)]
Merge pull request #898 from dlobo/CRM-10682
CRM-10682 - move wpBasePage to setting object, cache in config
Dave Greenberg [Wed, 29 May 2013 18:24:10 +0000 (11:24 -0700)]
CRM-12721 Change a=true to a=1. Add fe=1 if missing. Add conditional to display URLs for WordPress sites where missing.
----------------------------------------
* CRM-12721: Correct crmURL parameters and add option for WordPress link display
http://issues.civicrm.org/jira/browse/CRM-12721
Donald A. Lobo [Wed, 29 May 2013 17:56:43 +0000 (10:56 -0700)]
CRM-12718
----------------------------------------
* CRM-12718: in_array() expects parameter 2 to be array in IDS.php
http://issues.civicrm.org/jira/browse/CRM-12718
colemanw [Wed, 29 May 2013 17:53:39 +0000 (10:53 -0700)]
Merge pull request #884 from davecivicrm/CRM-12691
CRM-12691 remove references to Create PCP URL from help files since the ...
dlobo [Wed, 29 May 2013 17:51:57 +0000 (10:51 -0700)]
Merge pull request #903 from dlobo/MiscFixes
Misc fixes
Dave Greenberg [Wed, 29 May 2013 17:47:31 +0000 (10:47 -0700)]
CRM-12691 modify crmURL for WordPress links to use a=1 fe=1
----------------------------------------
* CRM-12691: Create PCP link is hard to discover and link in user guide is incomplete
http://issues.civicrm.org/jira/browse/CRM-12691
Donald A. Lobo [Wed, 29 May 2013 17:30:32 +0000 (10:30 -0700)]
fix notices and formatting fixes
Donald A. Lobo [Wed, 29 May 2013 17:29:15 +0000 (10:29 -0700)]
formatting fixes
Donald A. Lobo [Tue, 28 May 2013 17:53:50 +0000 (10:53 -0700)]
Fix notice
Coleman Watts [Wed, 29 May 2013 17:03:41 +0000 (10:03 -0700)]
Remove empty operators for dates in search builder CRM-12712
dlobo [Wed, 29 May 2013 16:15:15 +0000 (09:15 -0700)]
Merge pull request #901 from dlobo/CRM-12674
CRM-12674
Donald A. Lobo [Wed, 29 May 2013 16:13:47 +0000 (09:13 -0700)]
CRM-12674
----------------------------------------
* CRM-12674:
http://issues.civicrm.org/jira/browse/CRM-12674
Donald A. Lobo [Wed, 29 May 2013 15:07:42 +0000 (08:07 -0700)]
CRM-10682 - move wpBasePage to setting object, cache in config
----------------------------------------
* CRM-10682: Let frontend WordPress pages use template other than home page
http://issues.civicrm.org/jira/browse/CRM-10682
Kurund Jalmi [Wed, 29 May 2013 14:37:10 +0000 (07:37 -0700)]
Merge pull request #897 from pratik-joshi/CRM-12684
CRM-12684 fix: if custom data's profile field weight order is against to the order of its creation then the issue replicates
Pratik Joshi [Wed, 29 May 2013 14:21:20 +0000 (19:51 +0530)]
CRM-12684: indentation fix
Pratik Joshi [Wed, 29 May 2013 14:13:04 +0000 (19:43 +0530)]
CRM-12684 fix: if custom data's profile field weight order is against to the order of its creation then the issue replicates
Kurund Jalmi [Wed, 29 May 2013 13:45:11 +0000 (06:45 -0700)]
Merge pull request #896 from totten/httpclient-test
CRM_Utils_HttpClientTest - Fix regression
Tim Otten [Wed, 29 May 2013 13:21:31 +0000 (09:21 -0400)]
CRM_Utils_HttpClientTest - Fix regression
Kurund Jalmi [Wed, 29 May 2013 13:20:05 +0000 (06:20 -0700)]
Merge pull request #894 from ravishnair/CRM-12719
-- CRM-12719 applied patch and improved it.
Kurund Jalmi [Wed, 29 May 2013 13:02:39 +0000 (06:02 -0700)]
Merge pull request #895 from kurund/CRM-12709
CRM-12709 fixed display of formatting field in profile
Kurund Jalmi [Wed, 29 May 2013 13:00:50 +0000 (18:30 +0530)]
more work on CRM-12709, fixed profile preview
Ravish Nair [Wed, 29 May 2013 10:59:47 +0000 (16:29 +0530)]
-- CRM-12719 applied patch and improved it.
Kurund Jalmi [Wed, 29 May 2013 10:53:53 +0000 (16:23 +0530)]
worked on CRM-12709
Kurund Jalmi [Wed, 29 May 2013 09:38:38 +0000 (02:38 -0700)]
Merge pull request #891 from pradpnayak/CRM-12470
-- fixed table reference checks for financial_type_id before deleting, CRM-12470
Kurund Jalmi [Wed, 29 May 2013 09:38:10 +0000 (02:38 -0700)]
Merge pull request #892 from kurund/multiple-buttons
do not repeat custom data edit button for custom data with multiple values
Kurund Jalmi [Wed, 29 May 2013 09:36:28 +0000 (15:06 +0530)]
do not repeat custom data edit button for custom data with multiple values
Kurund Jalmi [Wed, 29 May 2013 09:34:12 +0000 (15:04 +0530)]
more template cleanup
Kurund Jalmi [Wed, 29 May 2013 09:27:12 +0000 (14:57 +0530)]
template cleanup
Pradeep Nayak [Wed, 29 May 2013 09:22:01 +0000 (14:52 +0530)]
-- fixed db reference checks for financial_type_id, CRM-12470
----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
http://issues.civicrm.org/jira/browse/CRM-12470
Kurund Jalmi [Wed, 29 May 2013 08:53:58 +0000 (01:53 -0700)]
Merge pull request #858 from colemanw/tinymce
Fix tinymce when jQuery not present CRM-12589
Kurund Jalmi [Wed, 29 May 2013 08:43:40 +0000 (01:43 -0700)]
Merge pull request #889 from kurund/CRM-12711
CRM-12711, few notice fixes that broke ajax reposnse
Kurund Jalmi [Wed, 29 May 2013 08:20:01 +0000 (13:50 +0530)]
worked on CRM-12711
Kurund Jalmi [Wed, 29 May 2013 08:15:23 +0000 (13:45 +0530)]
notice fixes
Kurund Jalmi [Wed, 29 May 2013 07:39:45 +0000 (00:39 -0700)]
Merge pull request #882 from ddoligalski/CRM-12710
modification to eliminate extra page on label/badge
Kurund Jalmi [Wed, 29 May 2013 05:50:10 +0000 (22:50 -0700)]
Merge pull request #881 from pradpnayak/CRM-12699
Crm 12699
Kurund Jalmi [Wed, 29 May 2013 05:48:45 +0000 (22:48 -0700)]
Merge pull request #883 from JoeMurray/patch-1
Removing extraneous & before function call that was producing PHP warnin...
Kurund Jalmi [Wed, 29 May 2013 05:48:19 +0000 (22:48 -0700)]
Merge pull request #885 from davecivicrm/CRM-12714
CRM-12714 Add is_test to params passed to CRM_Event_BAO_Event::eventTota...
Dave Greenberg [Wed, 29 May 2013 03:24:12 +0000 (20:24 -0700)]
CRM-12714 Add is_test to params passed to CRM_Event_BAO_Event::eventTotalSeats to prevent erroneous display of Actual participant count in Find Participants search results summary.
----------------------------------------
* CRM-12714: Actual Participants count on Find Participants is mistakenly displayed when search test participant records are present
http://issues.civicrm.org/jira/browse/CRM-12714
Dave Greenberg [Wed, 29 May 2013 02:43:46 +0000 (19:43 -0700)]
CRM-12691 remove references to Create PCP URL from help files since the page id was not available. Add this info inline to the forms, and generically to the Manage PCP page. Also added the example URL for WordPress, which was missing.
----------------------------------------
* CRM-12691: Create PCP link is hard to discover and link in user guide is incomplete
http://issues.civicrm.org/jira/browse/CRM-12691
projects / civicrm-core.git / log