Deepak Srivastava [Wed, 5 Jun 2013 12:58:30 +0000 (18:28 +0530)]
CRM-12490, towards issues raised by dgg
----------------------------------------
* CRM-12490: Add Soft Credit data to the Contribution Detail Report
http://issues.civicrm.org/jira/browse/CRM-12490
Kurund Jalmi [Wed, 5 Jun 2013 06:10:24 +0000 (11:40 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-06-05-06-52-23
Conflicts:
CRM/Case/Form/Activity.php
CRM/Contact/Form/Search/Custom/ContribSYBNT.php
CRM/Contact/Form/Search/Custom/ContributionAggregate.php
CRM/Contact/Form/Search/Custom/EventAggregate.php
CRM/Contact/Form/Search/Custom/PriceSet.php
CRM/Contact/Form/Search/Custom/TagContributions.php
CRM/Core/BAO/ConfigSetting.php
CRM/Financial/BAO/FinancialType.php
CRM/Report/Form.php
CRM/Report/Form/Campaign/SurveyDetails.php
CRM/Report/Form/Contribute/Summary.php
sql/civicrm_generated.mysql
templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
tools/drupal/modules/civicrm_giftaid/GiftAid/Report/Form/Contribute/GiftAid.php
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
Kurund Jalmi [Tue, 4 Jun 2013 16:16:00 +0000 (09:16 -0700)]
Merge pull request #955 from totten/master-mktest-dbload
mk-drupal-test-site - Pass through DBLOAD option
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
Tim Otten [Tue, 4 Jun 2013 15:40:21 +0000 (11:40 -0400)]
mk-drupal-test-site - Pass through DBLOAD option
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
deepak-srivastava [Tue, 4 Jun 2013 12:52:19 +0000 (05:52 -0700)]
Merge pull request #952 from deepak-srivastava/hr
CRM-12623, improvements w.r.t custom table joins and notice fixes
Deepak Srivastava [Tue, 4 Jun 2013 12:49:57 +0000 (18:19 +0530)]
CRM-12623, improvements w.r.t custom table joins and notice fixes
----------------------------------------
* CRM-12623: Create CiviHR Report Template
http://issues.civicrm.org/jira/browse/CRM-12623
Ravish Nair [Tue, 4 Jun 2013 07:22:37 +0000 (12:52 +0530)]
-- CRM-12741 webtest
deepak-srivastava [Tue, 4 Jun 2013 07:17:10 +0000 (00:17 -0700)]
Merge pull request #950 from deepak-srivastava/hr
php 5.4, notice fixes
Deepak Srivastava [Tue, 4 Jun 2013 07:08:52 +0000 (12:38 +0530)]
notice fixes
Tim Otten [Tue, 4 Jun 2013 02:21:38 +0000 (19:21 -0700)]
Merge pull request #949 from totten/gencode-version
GenCode:
Tim Otten [Tue, 4 Jun 2013 01:42:50 +0000 (01:42 +0000)]
GenCode:
* Remove shell_exec dependency.
* In the web footer, report the same version number used everywhere else
Coleman Watts [Mon, 3 Jun 2013 23:30:43 +0000 (16:30 -0700)]
Remove project task from tests CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
Coleman Watts [Mon, 3 Jun 2013 23:08:10 +0000 (16:08 -0700)]
Fix creating test objects CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
Coleman Watts [Mon, 3 Jun 2013 22:40:29 +0000 (15:40 -0700)]
Fix and extend custom field options test CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
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 18:02:32 +0000 (11:02 -0700)]
Merge pull request #944 from pratik-joshi/CRM-12747
CRM-12747 : component access permission defining way for end developer
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
Pratik Joshi [Mon, 3 Jun 2013 14:54:19 +0000 (20:24 +0530)]
CRM-12747 : component access permission defining way for end developer
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
deepak-srivastava [Mon, 3 Jun 2013 12:37:04 +0000 (05:37 -0700)]
Merge pull request #942 from deepak-srivastava/hr
CRM-12622, filters and more valid assertions
Deepak Srivastava [Mon, 3 Jun 2013 12:35:18 +0000 (18:05 +0530)]
CRM-12622, filters and more valid assertions
----------------------------------------
* CRM-12622: Create example data files for CiviHR Report Template
http://issues.civicrm.org/jira/browse/CRM-12622
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
Kurund Jalmi [Mon, 3 Jun 2013 05:04:23 +0000 (22:04 -0700)]
Merge pull request #939 from eileenmcnaughton/CRM-10859
Crm 10859 - whitespace cleanup
eileen [Mon, 3 Jun 2013 03:28:50 +0000 (15:28 +1200)]
preliminary whitespace cleanup
eileen [Mon, 3 Jun 2013 03:24:58 +0000 (15:24 +1200)]
preliminary whitespace cleanup
eileen [Mon, 3 Jun 2013 03:23:18 +0000 (15:23 +1200)]
preliminary whitespace cleanup
eileen [Mon, 3 Jun 2013 03:14:19 +0000 (15:14 +1200)]
preliminary whitespace cleanup
eileen [Mon, 3 Jun 2013 03:11:32 +0000 (15:11 +1200)]
preliminary whitespace cleanup
eileen [Mon, 3 Jun 2013 03:10:03 +0000 (15:10 +1200)]
preliminary whitespace cleanup
eileen [Mon, 3 Jun 2013 03:06:46 +0000 (15:06 +1200)]
preliminary whitespace cleanup
Tim Otten [Mon, 3 Jun 2013 02:54:56 +0000 (19:54 -0700)]
Merge pull request #938 from totten/master-restore-api_v3
api_v3_AllTests - Misc
Tim Otten [Mon, 3 Jun 2013 02:48:26 +0000 (22:48 -0400)]
api_v3_ConstantTest - Clearer errors
Tim Otten [Mon, 3 Jun 2013 02:41:12 +0000 (22:41 -0400)]
CRM_Core_DAO - Throw clearer error message about pseudoconstants
Tim Otten [Mon, 3 Jun 2013 02:20:29 +0000 (22:20 -0400)]
CRM_Contact_BAO_Query - Fix batch of regressions in api_v3_ContactTest
Tim Otten [Mon, 3 Jun 2013 02:19:47 +0000 (22:19 -0400)]
api_v3_ACLPermissionTest - Fix PHP fatalwith undefined object
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:34:23 +0000 (13:34 -0700)]
Merge pull request #925 from GiantRobot/CRM-12737
CRM-12737 - Return a CiviCRM-looking error if we hit a cURL error.
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
dlobo [Fri, 31 May 2013 23:11:27 +0000 (16:11 -0700)]
Merge pull request #935 from colemanw/CRM-12743
One last eval CRM-12743
Coleman Watts [Fri, 31 May 2013 21:23:04 +0000 (14:23 -0700)]
One last eval CRM-12743
----------------------------------------
* CRM-12743: Eliminate use of eval in core code
http://issues.civicrm.org/jira/browse/CRM-12743
----------------------------------------
* CRM-12743:
http://issues.civicrm.org/jira/browse/CRM-12743
* CRM-12743::
http://issues.civicrm.org/jira/browse/CRM-12743:
colemanw [Fri, 31 May 2013 21:13:43 +0000 (14:13 -0700)]
Merge pull request #933 from dlobo/CRM-12743
CRM-12743 - goodbye eval
Donald A. Lobo [Fri, 31 May 2013 20:16:05 +0000 (13:16 -0700)]
CRM-12743 - goodbye eval
----------------------------------------
* CRM-12743: Eliminate use of eval in core code
http://issues.civicrm.org/jira/browse/CRM-12743
Coleman Watts [Fri, 31 May 2013 20:01:18 +0000 (13:01 -0700)]
uf_group pseudoConstant fix CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
dlobo [Fri, 31 May 2013 18:54:59 +0000 (11:54 -0700)]
Merge pull request #888 from cividesk/CRM-12716
CRM-12716 - Limit the number of chars that can be entered in Notes custom fields
Kurund Jalmi [Fri, 31 May 2013 18:24:27 +0000 (11:24 -0700)]
Merge pull request #928 from yashodha/4.3
CRM-12734
Coleman Watts [Fri, 31 May 2013 18:02:12 +0000 (11:02 -0700)]
Fix tests and api options validation CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
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:58:32 +0000 (09:58 -0700)]
Fix OptionGroup::values cache CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
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
Chris Burgess [Fri, 31 May 2013 00:59:44 +0000 (12:59 +1200)]
Return a CiviCRM-looking error if we hit a cURL error.
Handle cURL errors by synthesising a CiviCRM error object.
This is API so we can't depend on having CRM_Core_Error::createError() available.
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 23:03:14 +0000 (16:03 -0700)]
Merge pull request #924 from colemanw/accountOptionValues
Restore accountOptionValues pseudoConstant CRM-12464
Coleman Watts [Thu, 30 May 2013 23:02:16 +0000 (16:02 -0700)]
Restore accountOptionValues pseudoConstant CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
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
deepak-srivastava [Thu, 30 May 2013 16:11:31 +0000 (09:11 -0700)]
Merge pull request #919 from deepak-srivastava/hr
CRM-12622
Deepak Srivastava [Thu, 30 May 2013 16:09:07 +0000 (21:39 +0530)]
CRM-12622
fixes to provide support for writing phpunit test cases for reports
fixes to support running reports in programmatic way
notice fixes in reports for test run
----------------------------------------
* CRM-12622: Create example data files for CiviHR Report Template
http://issues.civicrm.org/jira/browse/CRM-12622
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 14:10:50 +0000 (07:10 -0700)]
Merge pull request #916 from ravishnair/CRM-12682
-- CRM-12682 applied patch and made some modifications
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
Ravish Nair [Thu, 30 May 2013 13:04:14 +0000 (18:34 +0530)]
-- CRM-12682 applied patch and made 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
projects / civicrm-core.git / log