civicrm-core.git
11 years agofixed wrong PseudoConstant call
kurund [Fri, 2 Aug 2013 21:30:22 +0000 (03:00 +0530)]
fixed wrong PseudoConstant call

11 years agofixed wrong PseudoConstant call
kurund [Fri, 2 Aug 2013 20:37:22 +0000 (02:07 +0530)]
fixed wrong PseudoConstant call

11 years agoMerge pull request #1310 from eileenmcnaughton/CRM-13149
Kurund Jalmi [Fri, 2 Aug 2013 20:04:05 +0000 (13:04 -0700)]
Merge pull request #1310 from eileenmcnaughton/CRM-13149

CRM-13149 add relationship type filter to relationship api (both paths)

11 years agoMerge pull request #1309 from yashodha/4.4
Kurund Jalmi [Fri, 2 Aug 2013 20:01:57 +0000 (13:01 -0700)]
Merge pull request #1309 from yashodha/4.4

fix typos

11 years agoMerge pull request #1318 from dlobo/CRM-12874
Tim Otten [Fri, 2 Aug 2013 19:20:47 +0000 (12:20 -0700)]
Merge pull request #1318 from dlobo/CRM-12874

CRM-12874

11 years agoCRM-12874
Donald A. Lobo [Fri, 2 Aug 2013 19:10:51 +0000 (12:10 -0700)]
CRM-12874

----------------------------------------
* CRM-12874: Rename civicrm.settings.php.tpl so it uses a different suffix from Smarty templates
  http://issues.civicrm.org/jira/browse/CRM-12874

11 years agoCRM-12874
Donald A. Lobo [Fri, 2 Aug 2013 19:08:27 +0000 (12:08 -0700)]
CRM-12874

----------------------------------------
* CRM-12874: Rename civicrm.settings.php.tpl so it uses a different suffix from Smarty templates
  http://issues.civicrm.org/jira/browse/CRM-12874

11 years agoMerge pull request #1316 from dlobo/CRM-13127
Tim Otten [Fri, 2 Aug 2013 18:22:29 +0000 (11:22 -0700)]
Merge pull request #1316 from dlobo/CRM-13127

CRM-13127

11 years agoCRM-13127
Donald A. Lobo [Fri, 2 Aug 2013 17:02:50 +0000 (10:02 -0700)]
CRM-13127

----------------------------------------
* CRM-13127: test should include isset in API contact.php
  http://issues.civicrm.org/jira/browse/CRM-13127

11 years agoMerge pull request #1312 from pratik-joshi/CRM-12639-improvements
colemanw [Fri, 2 Aug 2013 16:43:07 +0000 (09:43 -0700)]
Merge pull request #1312 from pratik-joshi/CRM-12639-improvements

CRM-12639-improvements : code improvements which also fixes the failing tests https://test.civicrm.org/job/CiviCRM-master-git/LABEL=debian6,SUITE=api_v3_AllTests/397/

11 years agoCRM-12639-improvements : code improvements which also fixes the failing tests https...
Pratik Joshi [Fri, 2 Aug 2013 14:23:02 +0000 (19:53 +0530)]
CRM-12639-improvements : code improvements which also fixes the failing tests https://test.civicrm.org/job/CiviCRM-master-git/LABEL=debian6,SUITE=api_v3_AllTests/397/

11 years agopartial tidy-up of test class (while waiting for tests to run :-)
eileen [Fri, 2 Aug 2013 11:56:24 +0000 (23:56 +1200)]
partial tidy-up of test class (while waiting for tests to run :-)

11 years agoCRM-13149 additional test on api array as filter syntax
eileen [Fri, 2 Aug 2013 11:47:10 +0000 (23:47 +1200)]
CRM-13149 additional test on api array as filter syntax

11 years agoCRM-13149 remove code comment
eileen [Fri, 2 Aug 2013 11:43:54 +0000 (23:43 +1200)]
CRM-13149 remove code comment

11 years agoremove unrelated debug code
eileen [Fri, 2 Aug 2013 11:18:23 +0000 (23:18 +1200)]
remove unrelated debug code

11 years agoCRM-13149 fix BAO based reciprocal relationship get to accept type filter as an array...
eileen [Fri, 2 Aug 2013 11:17:53 +0000 (23:17 +1200)]
CRM-13149 fix BAO based reciprocal relationship get to accept type filter as an array per API, includes extracting function to be available from the BAO

11 years agoCRM-13149 array filter now working on relationship type
eileen [Fri, 2 Aug 2013 10:53:11 +0000 (22:53 +1200)]
CRM-13149 array filter now working on relationship type

11 years agoCRM-13149 add relationship type id as a filter option for both 'paths', add tests...
eileen [Fri, 2 Aug 2013 10:39:25 +0000 (22:39 +1200)]
CRM-13149 add relationship type id as a filter option for both 'paths', add tests & tidy up membership.create fn on test class in prep for adding it to tests

11 years agofix typos
yashodha [Fri, 2 Aug 2013 08:47:50 +0000 (14:17 +0530)]
fix typos

11 years agofix typos
yashodha [Fri, 2 Aug 2013 07:26:31 +0000 (12:56 +0530)]
fix typos

11 years agoMerge pull request #1308 from totten/master-apicreate-nulls
Tim Otten [Fri, 2 Aug 2013 00:14:58 +0000 (17:14 -0700)]
Merge pull request #1308 from totten/master-apicreate-nulls

CRM-13120 - APIv3 - Don't return "null" from "create" action

11 years agoMerge pull request #1307 from eileenmcnaughton/CRM-12108
Tim Otten [Thu, 1 Aug 2013 23:49:05 +0000 (16:49 -0700)]
Merge pull request #1307 from eileenmcnaughton/CRM-12108

 CRM-12108 fix bug introduced when rebasing PR

11 years ago CRM-12108 fix bug introduced when rebasing PR
eileen [Thu, 1 Aug 2013 23:35:00 +0000 (11:35 +1200)]
 CRM-12108 fix bug introduced when rebasing PR

11 years agoMerge pull request #1275 from eileenmcnaughton/CRM-12108
Tim Otten [Thu, 1 Aug 2013 22:59:12 +0000 (15:59 -0700)]
Merge pull request #1275 from eileenmcnaughton/CRM-12108

CRM-12108 minor improvement - simplify ipn.php by putting logic in the

11 years agoCRM-13120 - APIv3 - Don't return "null" from "create" action
Tim Otten [Thu, 1 Aug 2013 21:19:00 +0000 (14:19 -0700)]
CRM-13120 - APIv3 - Don't return "null" from "create" action

 * Split CRM_Core_HTMLInputCoder in three:
   * CRM_Utils_API_AbstractFieldCoder
   * CRM_Utils_API_HTMLInputCoder
   * CRM_Core_HTMLInputCoder (for backward compatibility)
 * Add CRM_Utils_API_NullOutputCoder (based on AbstractFieldCoder)

----------------------------------------
* CRM-13120:
  http://issues.civicrm.org/jira/browse/CRM-13120

11 years agoCRM-13120 - Reproduce 'null' problem with a core API
Tim Otten [Thu, 1 Aug 2013 22:41:01 +0000 (15:41 -0700)]
CRM-13120 - Reproduce 'null' problem with a core API

----------------------------------------
* CRM-13120:
  http://issues.civicrm.org/jira/browse/CRM-13120

11 years agoCRM-12108 fix merge of intermediary commit
eileen [Thu, 1 Aug 2013 20:09:22 +0000 (08:09 +1200)]
CRM-12108 fix merge of intermediary commit

11 years agoCRM-12108 add code comments which explain why I couldn't make the test succeed withou...
eileen [Tue, 30 Jul 2013 09:29:35 +0000 (21:29 +1200)]
CRM-12108 add code comments which explain why I couldn't make the test succeed without the try catch block - see CRM-12972 for user reports

11 years agoCRM-12108 refactore PayPalProIPN.php so that it can be called outside of a webtest...
eileen [Tue, 30 Jul 2013 09:28:16 +0000 (21:28 +1200)]
CRM-12108 refactore PayPalProIPN.php so that it can be called outside of a webtest & can be tested

11 years agoCRM-12108 tests on refactored PayPalProIPN, if CRM-12972 is fixed try catch can be...
eileen [Tue, 30 Jul 2013 09:21:58 +0000 (21:21 +1200)]
CRM-12108 tests on refactored PayPalProIPN, if CRM-12972 is fixed try catch can be removed & can update to check mail is sent

11 years agoCRM-12108 noticed api.contribution_recur.start_date needs to be set or have a default...
eileen [Tue, 30 Jul 2013 01:22:25 +0000 (13:22 +1200)]
CRM-12108 noticed api.contribution_recur.start_date needs to be set or have a default - am defaulting to now

11 years agoCRM-12108 noticed api.contribution_recur.frequency_interval needs to be mandatory
eileen [Tue, 30 Jul 2013 01:18:12 +0000 (13:18 +1200)]
CRM-12108 noticed api.contribution_recur.frequency_interval needs to be mandatory

11 years agoCRM-12108 noticed type on 'skipDefault' was wrong
eileen [Tue, 30 Jul 2013 00:42:54 +0000 (12:42 +1200)]
CRM-12108 noticed type on 'skipDefault' was wrong

11 years agoCRM-12108 minor improvement - simplify ipn.php by putting logic in the
Eileen [Mon, 29 Jul 2013 02:17:45 +0000 (22:17 -0400)]
CRM-12108 minor improvement - simplify ipn.php by putting logic in the
relevant classes (no logic behind the split)

11 years agoMerge pull request #1300 from eileenmcnaughton/CRM-13142
colemanw [Thu, 1 Aug 2013 17:34:54 +0000 (10:34 -0700)]
Merge pull request #1300 from eileenmcnaughton/CRM-13142

CRM-13142 limited tidy up to extract js from tpl using new standards

11 years agoMerge pull request #1290 from pratik-joshi/CRM_12639-fix
Kurund Jalmi [Thu, 1 Aug 2013 15:47:52 +0000 (08:47 -0700)]
Merge pull request #1290 from pratik-joshi/CRM_12639-fix

Crm 12639 fix

11 years agoMerge pull request #1284 from yashodha/4.4.CRM-13092
Kurund Jalmi [Thu, 1 Aug 2013 15:44:18 +0000 (08:44 -0700)]
Merge pull request #1284 from yashodha/4.4.CRM-13092

CRM-13092

11 years agoMerge pull request #1303 from yashodha/CRM-13147
Kurund Jalmi [Thu, 1 Aug 2013 15:44:05 +0000 (08:44 -0700)]
Merge pull request #1303 from yashodha/CRM-13147

fixed query for CRM-13147

11 years agoMerge pull request #1304 from aadityawalawalkar/CRM-12439
pratik-joshi [Thu, 1 Aug 2013 15:14:44 +0000 (08:14 -0700)]
Merge pull request #1304 from aadityawalawalkar/CRM-12439

Crm 12439

11 years agoCRM-12439 - indentation changes
Aaditya Walawalkar [Thu, 1 Aug 2013 14:56:19 +0000 (20:26 +0530)]
CRM-12439 - indentation changes

----------------------------------------
* CRM-12439: Add description field for Profiles and expose the created_id field
  http://issues.civicrm.org/jira/browse/CRM-12439
* CRM-12439-org:
  http://issues.civicrm.org/jira/browse/CRM-12439-org
* CRM-12995-1:
  http://issues.civicrm.org/jira/browse/CRM-12995-1
* CRM-12995-2:
  http://issues.civicrm.org/jira/browse/CRM-12995-2

11 years agoCRM-12439 fix with webtest - Added description textarea and exposed created_id and...
Aaditya Walawalkar [Thu, 1 Aug 2013 14:49:45 +0000 (20:19 +0530)]
CRM-12439 fix with webtest - Added description textarea and exposed created_id and description fields in profile listing page

----------------------------------------
* CRM-12439: Add description field for Profiles and expose the created_id field
  http://issues.civicrm.org/jira/browse/CRM-12439
* CRM-12439-org:
  http://issues.civicrm.org/jira/browse/CRM-12439-org
* CRM-12995-1:
  http://issues.civicrm.org/jira/browse/CRM-12995-1
* CRM-12995-2:
  http://issues.civicrm.org/jira/browse/CRM-12995-2

11 years agofixed query for CRM-13147
yashodha [Thu, 1 Aug 2013 13:38:28 +0000 (19:08 +0530)]
fixed query for CRM-13147

11 years agoMerge pull request #1301 from monishdeb/CRM-13029
Kurund Jalmi [Thu, 1 Aug 2013 10:26:35 +0000 (03:26 -0700)]
Merge pull request #1301 from monishdeb/CRM-13029

CRM-13029 fix

11 years agoCRM-13029 fix
monishdeb [Thu, 1 Aug 2013 09:59:54 +0000 (15:29 +0530)]
CRM-13029 fix

----------------------------------------
* CRM-13029: search builder: unable to search activity details
  http://issues.civicrm.org/jira/browse/CRM-13029

11 years agoCRM-13142 if only one membership organization exists then prefill it (unless membersh...
eileen [Thu, 1 Aug 2013 08:17:30 +0000 (20:17 +1200)]
CRM-13142 if only one membership organization exists then prefill it (unless membership field is optional), add -select- to types as the default

11 years agoMerge pull request #1298 from davecivicrm/CRM-13141
Tim Otten [Thu, 1 Aug 2013 00:28:48 +0000 (17:28 -0700)]
Merge pull request #1298 from davecivicrm/CRM-13141

CRM-13141 restructured code to handle empty 200 result from public exten...

11 years agoCorrected issue in patch noted by Tim on PR.
Dave Greenberg [Thu, 1 Aug 2013 00:17:38 +0000 (17:17 -0700)]
Corrected issue in patch noted by Tim on PR.

11 years agoMerge pull request #1299 from totten/master-rest-empty-json
Tim Otten [Thu, 1 Aug 2013 00:02:00 +0000 (17:02 -0700)]
Merge pull request #1299 from totten/master-rest-empty-json

CRM-13139 - CRM_Utils_REST - Accept empty JSON objects ("{}")

11 years agoCRM-13139 - CRM_Utils_REST - Accept empty JSON objects ("{}")
Tim Otten [Wed, 31 Jul 2013 23:59:32 +0000 (16:59 -0700)]
CRM-13139 - CRM_Utils_REST - Accept empty JSON objects ("{}")

Note: When the "json" parameter includes malformed JSON (eg "{") or an empty
string (""), the behavior is unchanged. This only affects a well-formed empty-obect.

----------------------------------------
* CRM-13139: REST API: json_decode() fails for empty input
  http://issues.civicrm.org/jira/browse/CRM-13139

11 years agoCRM-13142 limited tidy up to extract js from tpl using new standards (I have complete...
eileen [Wed, 31 Jul 2013 23:49:14 +0000 (11:49 +1200)]
CRM-13142 limited tidy up to extract js from tpl using new standards (I have completely tidied up & jslinted it  into a new file but discarded after a tidy up was merged in from 4.3

11 years agoCRM-13141 restructured code to handle empty 200 result from public extensions directory.
Dave Greenberg [Wed, 31 Jul 2013 22:59:04 +0000 (15:59 -0700)]
CRM-13141 restructured code to handle empty 200 result from public extensions directory.

----------------------------------------
* CRM-13141: Manage Extensions throws an erroneous fatal error - Failed Fetching List - when there are no extensions available for a particular install version
  http://issues.civicrm.org/jira/browse/CRM-13141

11 years agoMerge pull request #1293 from kurund/CRM-13130
Dave Greenberg [Wed, 31 Jul 2013 22:07:49 +0000 (15:07 -0700)]
Merge pull request #1293 from kurund/CRM-13130

CRM-13130, fixed notices and using Avery 5395 as default for layout form...

11 years agoMerge pull request #1296 from dlobo/CRM-13090
dlobo [Wed, 31 Jul 2013 20:49:47 +0000 (13:49 -0700)]
Merge pull request #1296 from dlobo/CRM-13090

fix patch for CRM-13090

11 years agofix patch for CRM-13090
Donald A. Lobo [Wed, 31 Jul 2013 20:48:52 +0000 (13:48 -0700)]
fix patch for CRM-13090

----------------------------------------
* CRM-13090: New Petition/Survey form validation - enforce unique constraint on ActivityType-Campaign-Title
  http://issues.civicrm.org/jira/browse/CRM-13090

11 years agoMerge pull request #1295 from totten/master-isprimary-tables
Tim Otten [Wed, 31 Jul 2013 20:36:09 +0000 (13:36 -0700)]
Merge pull request #1295 from totten/master-isprimary-tables

CRM-13075 - CRM_Core_BAO_Block - Allow handlePrimary() with entities from extensions

11 years agoCRM-13075 - CRM_Core_BAO_Block - Allow handlePrimary() with entities from extensions
Tim Otten [Wed, 31 Jul 2013 20:32:54 +0000 (13:32 -0700)]
CRM-13075 - CRM_Core_BAO_Block - Allow handlePrimary() with entities from extensions

----------------------------------------
* CRM-13075: Mark is_primary for HRJob records
  http://issues.civicrm.org/jira/browse/CRM-13075

11 years agoMerge pull request #1217 from samuelsov/CRM-10606
Dave Greenberg [Wed, 31 Jul 2013 19:12:04 +0000 (12:12 -0700)]
Merge pull request #1217 from samuelsov/CRM-10606

CRM-10606 Remove specific code for upgrade from 2.0 to 2.1

11 years agoCRM-13130, fixed notices and using Avery 5395 as default for layout format
kurund [Wed, 31 Jul 2013 19:00:27 +0000 (00:30 +0530)]
CRM-13130, fixed notices and using Avery 5395 as default for layout format

----------------------------------------
* CRM-13130: New Label Format entries do not store the 'name' property in values colum, and produce blank name badges
  http://issues.civicrm.org/jira/browse/CRM-13130

11 years agoMerge pull request #1291 from monishdeb/CRM-8813
Kurund Jalmi [Wed, 31 Jul 2013 15:53:51 +0000 (08:53 -0700)]
Merge pull request #1291 from monishdeb/CRM-8813

CRM-8813 Message Template fix

11 years agoCRM-8813 Message Template fix
monishdeb [Wed, 31 Jul 2013 15:51:44 +0000 (21:21 +0530)]
CRM-8813 Message Template fix

----------------------------------------
* CRM-8813: Fix token insert cursor placement issue in Plain Text message body on IE 8
  http://issues.civicrm.org/jira/browse/CRM-8813

11 years agoCRM-12639 : improvement as per https://github.com/civicrm/civicrm-core/pull/1272...
Pratik Joshi [Wed, 31 Jul 2013 15:14:12 +0000 (20:44 +0530)]
CRM-12639 : improvement as per https://github.com/civicrm/civicrm-core/pull/1272#issuecomment-21735152 comment , but couldn't find a way to retreive pseudo constants labels for email_greeting, postal_greeting, addressee, state_province_abbreavation , so left the condition statements as it is.

11 years agoCRM_12639_fix : sending a clean PR after https://github.com/civicrm/civicrm-core...
Pratik Joshi [Tue, 30 Jul 2013 15:59:31 +0000 (21:29 +0530)]
CRM_12639_fix : sending a clean PR after https://github.com/civicrm/civicrm-core/pull/1272 produced merge conflict

11 years agoMerge pull request #1289 from monishdeb/CRM-8813
Kurund Jalmi [Wed, 31 Jul 2013 14:38:27 +0000 (07:38 -0700)]
Merge pull request #1289 from monishdeb/CRM-8813

CRM-8813 fix

11 years agoCRM-8813 fix
monishdeb [Wed, 31 Jul 2013 14:32:28 +0000 (20:02 +0530)]
CRM-8813 fix

----------------------------------------
* CRM-8813: Fix token insert cursor placement issue in Plain Text message body on IE 8
  http://issues.civicrm.org/jira/browse/CRM-8813

11 years agoMerge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-31-15-53-16
kurund [Wed, 31 Jul 2013 11:19:54 +0000 (16:49 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-31-15-53-16

Conflicts:
CRM/Contact/Form/Task/Batch.php
CRM/Contribute/Form/Task/Batch.php
CRM/Event/Form/ManageEvent/Fee.php
CRM/Price/BAO/LineItem.php
CRM/Utils/System/Base.php
templates/CRM/Batch/Form/Entry.tpl

11 years agoMerge pull request #1287 from pratik-joshi/CRM-13035-fix
Kurund Jalmi [Wed, 31 Jul 2013 10:06:39 +0000 (03:06 -0700)]
Merge pull request #1287 from pratik-joshi/CRM-13035-fix

CRM-13035-fix : initiating CRM_Contribute_BAO_Contribution instead of CRM_Contribute_DAO_Contribution

11 years agoMerge pull request #1286 from monishdeb/CRM-12270
Kurund Jalmi [Wed, 31 Jul 2013 10:04:01 +0000 (03:04 -0700)]
Merge pull request #1286 from monishdeb/CRM-12270

CRM-12270 fix

11 years agoMerge pull request #1288 from monishdeb/CRM-12186
Kurund Jalmi [Wed, 31 Jul 2013 10:02:10 +0000 (03:02 -0700)]
Merge pull request #1288 from monishdeb/CRM-12186

CRM-12186 fix

11 years agoMerge pull request #1283 from davecivicrm/CRM-13124
Kurund Jalmi [Wed, 31 Jul 2013 10:00:18 +0000 (03:00 -0700)]
Merge pull request #1283 from davecivicrm/CRM-13124

Crm -13124 Payment processor name missing from confirmation message

11 years agoCRM-12186 fix
monishdeb [Wed, 31 Jul 2013 09:57:41 +0000 (15:27 +0530)]
CRM-12186 fix

----------------------------------------
* CRM-12186: Fonts in new profile editor preview mode are too small and wrapped.
  http://issues.civicrm.org/jira/browse/CRM-12186

11 years agoCRM-13035-fix : initiating CRM_Contribute_BAO_Contribution instead of CRM_Contribute_...
Pratik Joshi [Wed, 31 Jul 2013 08:35:01 +0000 (14:05 +0530)]
CRM-13035-fix : initiating CRM_Contribute_BAO_Contribution instead of CRM_Contribute_DAO_Contribution

11 years agoCRM-12270 fix
monishdeb [Wed, 31 Jul 2013 08:07:14 +0000 (13:37 +0530)]
CRM-12270 fix

----------------------------------------
* CRM-12270: Batch Change Participant Status task sends confirmation email and marks contribution completed when participant status is updated FROM "Pending Pay Later" to "Attended" or "Registered"
  http://issues.civicrm.org/jira/browse/CRM-12270

11 years agoMerge pull request #1285 from kurund/CRM-12814
Kurund Jalmi [Wed, 31 Jul 2013 07:36:20 +0000 (00:36 -0700)]
Merge pull request #1285 from kurund/CRM-12814

CRM-12814, fixed the total issue, code cleanup and notice fixes

11 years agoCRM-13092
yashodha [Wed, 31 Jul 2013 06:16:45 +0000 (11:46 +0530)]
CRM-13092

11 years agoCRM-13124 Smarty variable for processor name was no longer correct in templates/CRM...
Dave Greenberg [Wed, 31 Jul 2013 00:41:19 +0000 (17:41 -0700)]
CRM-13124 Smarty variable for processor name was no longer correct in templates/CRM/Contribute/Form/Contribution/Confirm.tpl

----------------------------------------
* CRM-13124: Payment processor name missing from confirmation message
  http://issues.civicrm.org/jira/browse/CRM-13124

11 years agoCRM-12814, fixed the total issue, code cleanup and notice fixes
kurund [Tue, 30 Jul 2013 22:18:32 +0000 (03:48 +0530)]
CRM-12814, fixed the total issue, code cleanup and notice fixes

----------------------------------------
* CRM-12814: mailings tab slow performance
  http://issues.civicrm.org/jira/browse/CRM-12814

11 years agoUpdate Layout.hlp
Dave Greenberg [Tue, 30 Jul 2013 19:23:52 +0000 (12:23 -0700)]
Update Layout.hlp

fixed duplicate id in htxt tag.

11 years agoMerge pull request #1282 from colemanw/getLabel
colemanw [Tue, 30 Jul 2013 17:29:04 +0000 (10:29 -0700)]
Merge pull request #1282 from colemanw/getLabel

More robust ways to get pseudoconstant labels and names CRM-12464

11 years agoMore robust ways to get pseudoconstant labels and names CRM-12464
Coleman Watts [Tue, 30 Jul 2013 16:52:33 +0000 (09:52 -0700)]
More robust ways to get pseudoconstant labels and names CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoMerge pull request #1281 from deepak-srivastava/softcredits
deepak-srivastava [Tue, 30 Jul 2013 16:15:29 +0000 (09:15 -0700)]
Merge pull request #1281 from deepak-srivastava/softcredits

CRM-13061, soft credits - aggregate columns, filters and stats

11 years agoCRM-13061, soft credits - aggregate columns, filters and stats
Deepak Srivastava [Tue, 30 Jul 2013 15:03:31 +0000 (20:33 +0530)]
CRM-13061, soft credits - aggregate columns, filters and stats

----------------------------------------
* CRM-13061: Add Soft Credits to Contribution Summary Report
  http://issues.civicrm.org/jira/browse/CRM-13061

11 years agoMerge pull request #1276 from davecivicrm/CRM-12963
Kurund Jalmi [Tue, 30 Jul 2013 07:00:06 +0000 (00:00 -0700)]
Merge pull request #1276 from davecivicrm/CRM-12963

Crm 12963 adding help and fixing typos and markup

11 years agoMerge pull request #1278 from totten/master-reporttestcase-2
Tim Otten [Tue, 30 Jul 2013 05:23:17 +0000 (22:23 -0700)]
Merge pull request #1278 from totten/master-reporttestcase-2

CRM-12622 - Misc fixes/enhancements

11 years agoCRM-12622 - Report testing - Multiple fixes/enhancements:
Tim Otten [Tue, 30 Jul 2013 05:18:11 +0000 (22:18 -0700)]
CRM-12622 - Report testing - Multiple fixes/enhancements:

 * Use only non-international (ASCII) characters. The international characters break when executing multiple tests.
 * Drop temporary tables created by Contribute/Detail report. They break when executing multiple tess.
 * Add positive and negative test cases to CRM_Report_Form_TestCaseTest. The tests evolved originally within DetailTest, but tey look redundant/silly in DetailTest. Put them in a new class where it's clearer that we're testing the framework (and DetailTest is just an example)

----------------------------------------
* CRM-12622: Create framework for example report data files
  http://issues.civicrm.org/jira/browse/CRM-12622

11 years agoCRM-12622 - CiviUnitTestCase - Promote sethtmlGlobals
Tim Otten [Tue, 30 Jul 2013 04:19:53 +0000 (21:19 -0700)]
CRM-12622 - CiviUnitTestCase - Promote sethtmlGlobals

When defining multiple cases in CRM_Report_Form_Contribute_Detail, the
second case fails due to an uninitialized (lost?) global.
api_v3_UFFieldTest seems to have a work-around.

```
1) CRM_Report_Form_Contribute_DetailTest::testReportOutput with data set #1 ('CRM_Report_Form_Contribute_Detail', array(array('first_name', 'email', 'total_amount'), array('gte', 50)), 'fixtures/dataset.sql', 'fixtures/report.csv')
Undefined index: _HTML_QuickForm_registered_rules

/Applications/MAMP/htdocs/sites/all/modules/civicrm/packages/HTML/QuickForm/RuleRegistry.php:122
/Applications/MAMP/htdocs/sites/all/modules/civicrm/packages/HTML/QuickForm/RuleRegistry.php:98
/Applications/MAMP/htdocs/sites/all/modules/civicrm/packages/HTML/QuickForm.php:389
/Applications/MAMP/htdocs/sites/all/modules/civicrm/CRM/Core/Form.php:187
/Applications/MAMP/htdocs/sites/all/modules/civicrm/CRM/Core/Form.php:156
/Applications/MAMP/htdocs/sites/all/modules/civicrm/CRM/Report/Form.php:256
/Applications/MAMP/htdocs/sites/all/modules/civicrm/CRM/Report/Form/Contribute/Detail.php:362
/Applications/MAMP/htdocs/sites/all/modules/civicrm/CRM/Core/Controller.php:426
/Applications/MAMP/htdocs/sites/all/modules/civicrm/CRM/Core/Controller/Simple.php:79
/Applications/MAMP/htdocs/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviReportTestCase.php:43
/Applications/MAMP/htdocs/sites/all/modules/civicrm/tests/phpunit/CRM/Report/Form/Contribute/DetailTest.php:105
/Applications/MAMP/htdocs/sites/all/modules/civicrm/tools/scripts/phpunit:75
```

----------------------------------------
* CRM-12622: Create framework for example report data files
  http://issues.civicrm.org/jira/browse/CRM-12622

11 years agoCRM_Utils_GlobalStack - Allow top-level vars
Tim Otten [Tue, 30 Jul 2013 04:15:28 +0000 (21:15 -0700)]
CRM_Utils_GlobalStack - Allow top-level vars

11 years agoMerge pull request #1277 from totten/master-reporttestcase
Tim Otten [Tue, 30 Jul 2013 03:36:47 +0000 (20:36 -0700)]
Merge pull request #1277 from totten/master-reporttestcase

CRM-12622 - Fix regresion in CRM_Report_Form_Contribute_DetailTest

11 years agoCleanup/Autoformat
Tim Otten [Tue, 30 Jul 2013 03:35:22 +0000 (20:35 -0700)]
Cleanup/Autoformat

11 years agoCRM-12622 - Extract assertCsvArraysEqual
Tim Otten [Tue, 30 Jul 2013 03:33:49 +0000 (20:33 -0700)]
CRM-12622 - Extract assertCsvArraysEqual

----------------------------------------
* CRM-12622: Create framework for example report data files
  http://issues.civicrm.org/jira/browse/CRM-12622

11 years agoCRM_Report_Form_Contribute_DetailTest - Update ($ vs USD)
Tim Otten [Tue, 30 Jul 2013 03:21:44 +0000 (20:21 -0700)]
CRM_Report_Form_Contribute_DetailTest - Update ($ vs USD)

11 years agoCRM-12622 - CiviReportTestCase - Set missing global variables
Tim Otten [Tue, 30 Jul 2013 03:18:47 +0000 (20:18 -0700)]
CRM-12622 - CiviReportTestCase - Set missing global variables

----------------------------------------
* CRM-12622: Create framework for example report data files
  http://issues.civicrm.org/jira/browse/CRM-12622

11 years agoMerge pull request #1270 from ravishnair/CRM-13037
Tim Otten [Mon, 29 Jul 2013 23:47:49 +0000 (16:47 -0700)]
Merge pull request #1270 from ravishnair/CRM-13037

-- CRM-13037 fix for Navigating among tabs produces wrong popups

11 years agoCRM-12963 adding help
Dave Greenberg [Mon, 29 Jul 2013 22:30:49 +0000 (15:30 -0700)]
CRM-12963 adding help

----------------------------------------
* CRM-12963: Event Badge Improvements
  http://issues.civicrm.org/jira/browse/CRM-12963

11 years agoCRM-12963 Adding help for badges, changing field label to be consistent w our termino...
Dave Greenberg [Mon, 29 Jul 2013 22:19:50 +0000 (15:19 -0700)]
CRM-12963 Adding help for badges, changing field label to be consistent w our terminology, use standard Add New markup.

----------------------------------------
* CRM-12963: Event Badge Improvements
  http://issues.civicrm.org/jira/browse/CRM-12963

11 years agoMerge pull request #1219 from kurund/CRM-13078
Dave Greenberg [Mon, 29 Jul 2013 18:51:41 +0000 (11:51 -0700)]
Merge pull request #1219 from kurund/CRM-13078

CRM-13078
These commits improve things - you can't submit w/ invalid contact ID. Still a problem w/ error icon updating when user fixes the 'invalid contact id' situation. Kurund will investigate and submit addtional fixes as needed.

11 years agoMerge pull request #1274 from davecivicrm/CRM-13117
Kurund Jalmi [Mon, 29 Jul 2013 17:38:25 +0000 (10:38 -0700)]
Merge pull request #1274 from davecivicrm/CRM-13117

CRM-13117 remove references to Global Settings menu item.

11 years agoMerge pull request #1273 from colemanw/bool
Kurund Jalmi [Mon, 29 Jul 2013 17:30:31 +0000 (10:30 -0700)]
Merge pull request #1273 from colemanw/bool

Remove unused T_BOOL constant

11 years agoPass context from pseudoconstant getKey/getValue CRM-12464
Coleman Watts [Mon, 29 Jul 2013 17:29:56 +0000 (10:29 -0700)]
Pass context from pseudoconstant getKey/getValue CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoRemove unused T_BOOL constant
Coleman Watts [Mon, 29 Jul 2013 16:28:01 +0000 (09:28 -0700)]
Remove unused T_BOOL constant

11 years agoMerge pull request #1105 from colemanw/prevNext
colemanw [Mon, 29 Jul 2013 16:12:37 +0000 (09:12 -0700)]
Merge pull request #1105 from colemanw/prevNext

Search optimizations: prevnext cache improvements