Pratik Joshi [Tue, 18 Jun 2013 08:06:19 +0000 (13:36 +0530)]
CRM-12822 : handled phone_ext field display in event online, offline receipt as well as on event online confirm, thank you pages
Kurund Jalmi [Tue, 18 Jun 2013 06:12:58 +0000 (23:12 -0700)]
Merge pull request #1027 from kurund/CRM-12594
CRM-12594 more text fixes
Kurund Jalmi [Tue, 18 Jun 2013 06:10:08 +0000 (11:40 +0530)]
CRM-12594 more text fixes
Kurund Jalmi [Tue, 18 Jun 2013 05:35:40 +0000 (22:35 -0700)]
Merge pull request #1022 from davecivicrm/CRM-12841
Applying patch to fix typo in recognition of unsubscribeUrl token and ty...
colemanw [Tue, 18 Jun 2013 00:03:43 +0000 (17:03 -0700)]
Merge pull request #1021 from pratik-joshi/CRM-12822-fix
CRM-12822-fix : added the phone ext field in event info page
Dave Greenberg [Mon, 17 Jun 2013 19:32:11 +0000 (12:32 -0700)]
Applying patch to fix typo in recognition of unsubscribeUrl token and typo in form rule error.
Pratik Joshi [Mon, 17 Jun 2013 14:54:43 +0000 (20:24 +0530)]
CRM-12822-fix : added the phone ext field in event info page
pratik-joshi [Mon, 17 Jun 2013 07:23:23 +0000 (00:23 -0700)]
Merge pull request #1011 from tttp/crm12785
patch as transmited by charles cook
Kurund Jalmi [Fri, 14 Jun 2013 11:15:53 +0000 (04:15 -0700)]
Merge pull request #1010 from pratik-joshi/CRM-12811-fix
CRM-12811 fix : passed 'GET' in $method argument for CRM_Utils_Request::retrieve which is being invoked from inside the function CRM_Core_BAO_CustomGroup::extractGetParams
Pratik Joshi [Fri, 14 Jun 2013 08:06:58 +0000 (13:36 +0530)]
CRM-12811 fix : passed 'GET' in $method argument for CRM_Utils_Request::retrieve which is being invoked from inside the function CRM_Core_BAO_CustomGroup::extractGetParams
Xavier Dutoit [Thu, 13 Jun 2013 11:45:49 +0000 (13:45 +0200)]
patch as transmited by charles cook
Kurund Jalmi [Thu, 13 Jun 2013 09:22:11 +0000 (02:22 -0700)]
Merge pull request #996 from pradpnayak/CRM-12794
-- fixed notice error for CRM-12794
deepak-srivastava [Thu, 13 Jun 2013 07:30:41 +0000 (00:30 -0700)]
Merge pull request #1008 from deepak-srivastava/ninja
CRM-12803
Deepak Srivastava [Thu, 13 Jun 2013 07:20:20 +0000 (12:50 +0530)]
CRM-12803
pratik-joshi [Thu, 13 Jun 2013 06:44:56 +0000 (23:44 -0700)]
Merge pull request #1000 from pradpnayak/CRM-12799
-- worked on CRM-12799, removed cruft for civicrm_payment
Pradeep Nayak [Wed, 12 Jun 2013 15:09:10 +0000 (20:39 +0530)]
-- worked on CRM-12799, removed cruft for civicrm_payment
----------------------------------------
* CRM-12799: Remove cruft from 4.3.alpha1.tpl file
http://issues.civicrm.org/jira/browse/CRM-12799
Pradeep Nayak [Wed, 12 Jun 2013 09:26:40 +0000 (14:56 +0530)]
-- fixed notice error for CRM-12794
----------------------------------------
* CRM-12794: Notice when trying to delete Expense Account is when that account is currently in use
http://issues.civicrm.org/jira/browse/CRM-12794
Kurund Jalmi [Wed, 12 Jun 2013 08:31:54 +0000 (01:31 -0700)]
Merge pull request #989 from colemanw/releaser
Update releaser script to create empty upgrade sql file if it doesn't exist
Coleman Watts [Mon, 10 Jun 2013 22:48:51 +0000 (15:48 -0700)]
Update releaser script to create empty upgrade sql file if it doesn't exist
Coleman Watts [Mon, 10 Jun 2013 22:24:51 +0000 (15:24 -0700)]
Add upgrade sql file for 4.3.5
CiviCRM [Mon, 10 Jun 2013 17:10:13 +0000 (10:10 -0700)]
Update version to 4.3.5
pratik-joshi [Mon, 10 Jun 2013 15:12:27 +0000 (08:12 -0700)]
Merge pull request #987 from ravishnair/CRM-12771fix
CRM-12771 fix
Ravish Nair [Mon, 10 Jun 2013 14:42:49 +0000 (20:12 +0530)]
-- CRM-12771 some more fixes
----------------------------------------
* CRM-12771: contribution pages with a zero amount are not generating receipts or creating contribution records
http://issues.civicrm.org/jira/browse/CRM-12771
Ravish Nair [Fri, 7 Jun 2013 15:59:59 +0000 (21:29 +0530)]
-- CRM-12771 offline contribution page break fix
----------------------------------------
* CRM-12771: contribution pages with a zero amount are not generating receipts or creating contribution records
http://issues.civicrm.org/jira/browse/CRM-12771
Ravish Nair [Fri, 7 Jun 2013 15:36:03 +0000 (21:06 +0530)]
-- CRM-12771 fix
----------------------------------------
* CRM-12771: contribution pages with a zero amount are not generating receipts or creating contribution records
http://issues.civicrm.org/jira/browse/CRM-12771
deepak-srivastava [Mon, 10 Jun 2013 13:37:32 +0000 (06:37 -0700)]
Merge pull request #986 from deepak-srivastava/ninja
CRM-12772
Deepak Srivastava [Mon, 10 Jun 2013 13:34:26 +0000 (19:04 +0530)]
CRM-12772
Kurund Jalmi [Mon, 10 Jun 2013 12:41:15 +0000 (05:41 -0700)]
Merge pull request #985 from kurund/CRM-12722
we don't have paging for child groups hence we should show all children,...
Kurund Jalmi [Mon, 10 Jun 2013 12:39:21 +0000 (18:09 +0530)]
we don't have paging for child groups hence we should show all children, rather than restricting to 25
Kurund Jalmi [Fri, 7 Jun 2013 13:15:29 +0000 (06:15 -0700)]
Merge pull request #977 from pratik-joshi/CRM-12733
Crm 12733
Pratik Joshi [Fri, 7 Jun 2013 12:58:07 +0000 (18:28 +0530)]
CRM-12733 fix : while case type is changed reset timeline to NO not respected
Kurund Jalmi [Thu, 6 Jun 2013 09:13:03 +0000 (02:13 -0700)]
Merge pull request #948 from eileenmcnaughton/4.3
CRM-12759 - Multisite add to group code doesn't kick in when a group is being added
Kurund Jalmi [Thu, 6 Jun 2013 03:32:39 +0000 (20:32 -0700)]
Merge pull request #964 from totten/4.3-smartgroupcache-missingvar
CRM-12466 - Fix missing var
Kurund Jalmi [Thu, 6 Jun 2013 03:32:22 +0000 (20:32 -0700)]
Merge pull request #963 from dlobo/CRM-12766
CRM-12766 - Unit test for html2text
Tim Otten [Thu, 6 Jun 2013 02:24:45 +0000 (22:24 -0400)]
CRM-12466 - Fix missing var (follow up to #927)
----------------------------------------
* CRM-12466: Group listings don't load
http://issues.civicrm.org/jira/browse/CRM-12466
Donald A. Lobo [Wed, 5 Jun 2013 15:50:04 +0000 (08:50 -0700)]
CRM-12766
----------------------------------------
* CRM-12766: Upgrade html2text to version shipped by roundcube
http://issues.civicrm.org/jira/browse/CRM-12766
Kurund Jalmi [Wed, 5 Jun 2013 12:35:15 +0000 (05:35 -0700)]
Merge pull request #960 from kurund/notice-fixes
notice fix
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
eileen [Tue, 4 Jun 2013 00:58:35 +0000 (12:58 +1200)]
CRM-12759 fix inconsistency in application of multisite setting
eileen [Tue, 4 Jun 2013 00:56:22 +0000 (12:56 +1200)]
preliminary whitespace
eileen [Tue, 4 Jun 2013 00:56:00 +0000 (12:56 +1200)]
CRM-12759 employer not being added to Multisite group
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
projects / civicrm-core.git / log