civicrm-core.git
11 years agouf_group pseudoConstant fix CRM-12464
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

11 years agoMerge pull request #888 from cividesk/CRM-12716
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

11 years agoFix tests and api options validation CRM-12464
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

11 years agoFix OptionGroup::values cache CRM-12464
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

11 years agoMerge pull request #924 from colemanw/accountOptionValues
colemanw [Thu, 30 May 2013 23:03:14 +0000 (16:03 -0700)]
Merge pull request #924 from colemanw/accountOptionValues

Restore accountOptionValues pseudoConstant CRM-12464

11 years agoRestore 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

11 years agoMerge pull request #919 from deepak-srivastava/hr
deepak-srivastava [Thu, 30 May 2013 16:11:31 +0000 (09:11 -0700)]
Merge pull request #919 from deepak-srivastava/hr

CRM-12622

11 years agoCRM-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

11 years agoMerge pull request #916 from ravishnair/CRM-12682
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

11 years ago-- CRM-12682 applied patch and made some modifications
Ravish Nair [Thu, 30 May 2013 13:04:14 +0000 (18:34 +0530)]
-- CRM-12682 applied patch and made some modifications

11 years agoMerge pull request #913 from yashodha/4.4
Kurund Jalmi [Thu, 30 May 2013 09:24:43 +0000 (02:24 -0700)]
Merge pull request #913 from yashodha/4.4

test fix (CRM-12697)

11 years agoMerge pull request #914 from ravishnair/Minor-Fix
Kurund Jalmi [Thu, 30 May 2013 09:24:22 +0000 (02:24 -0700)]
Merge pull request #914 from ravishnair/Minor-Fix

-- Minor fix for incorrect className

11 years ago-- Minor fix for incorrect ClassName
Ravish Nair [Thu, 30 May 2013 09:05:58 +0000 (14:35 +0530)]
-- Minor fix for incorrect ClassName

11 years agotest fix (CRM-12697)
yashodha [Thu, 30 May 2013 07:05:15 +0000 (12:35 +0530)]
test fix (CRM-12697)

11 years agoMerge pull request #909 from colemanw/search
colemanw [Thu, 30 May 2013 05:21:14 +0000 (22:21 -0700)]
Merge pull request #909 from colemanw/search

Search

11 years agoSupport custom fields CRM-12464
Coleman Watts [Sun, 12 May 2013 20:40:23 +0000 (13:40 -0700)]
Support custom fields CRM-12464

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

11 years agoUse new buildOptions in the api CRM-12464
Coleman Watts [Thu, 9 May 2013 18:56:19 +0000 (11:56 -0700)]
Use new buildOptions in the api CRM-12464

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

11 years agoCase, Campaign, Language PseudoConstants CRM-12464
Coleman Watts [Wed, 8 May 2013 23:41:35 +0000 (16:41 -0700)]
Case, Campaign, Language PseudoConstants CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoAdd financial pseudoconstants CRM-12464
Coleman Watts [Mon, 6 May 2013 23:50:30 +0000 (16:50 -0700)]
Add financial pseudoconstants CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoRefactor language pseudoconstant CRM-12464
Coleman Watts [Mon, 6 May 2013 04:36:03 +0000 (21:36 -0700)]
Refactor language pseudoconstant CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoRemove grant pseudoconstants CRM-12464
Coleman Watts [Sat, 4 May 2013 23:29:10 +0000 (16:29 -0700)]
Remove grant pseudoconstants CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoRefactored out of CRM_Core_PseudoConstant: billingMode(). CRM-12464
Allen Shaw [Sat, 4 May 2013 22:48:06 +0000 (15:48 -0700)]
Refactored out of CRM_Core_PseudoConstant: billingMode(). CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoMailing pseudoconstant CRM-12464
Coleman Watts [Sat, 4 May 2013 22:35:04 +0000 (15:35 -0700)]
Mailing pseudoconstant CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoAdded xml metadata for group_id column in various tables. CRM-12464
Allen Shaw [Sat, 4 May 2013 22:28:23 +0000 (15:28 -0700)]
Added xml metadata for group_id column in various tables. CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoRefactored Contact Page Summary tab to use CRM_Core_DAO::buildOptions() method. CRM...
Allen Shaw [Sat, 4 May 2013 21:33:41 +0000 (14:33 -0700)]
Refactored Contact Page Summary tab to use CRM_Core_DAO::buildOptions() method. CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoAdd membership metadata CRM-12464
Coleman Watts [Sat, 4 May 2013 21:31:26 +0000 (14:31 -0700)]
Add membership metadata CRM-12464

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

11 years agoAdd getValue and getKey methods CRM-12464
Coleman Watts [Sat, 4 May 2013 21:16:46 +0000 (14:16 -0700)]
Add getValue and getKey methods CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoAdded "DEPRECATED" comment in a couple of CRM_Core_PseudoConstant methods. CRM-12464.
Allen Shaw [Sat, 4 May 2013 20:41:26 +0000 (13:41 -0700)]
Added "DEPRECATED" comment in a couple of CRM_Core_PseudoConstant methods. CRM-12464.

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoRemove PCP pseudoconstant CRM-12464
Coleman Watts [Sat, 4 May 2013 01:43:12 +0000 (18:43 -0700)]
Remove PCP pseudoconstant CRM-12464

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

11 years agoAdded meta-data to XML schema for fields referencing 'activity_type' and 'visibility...
Allen Shaw [Sat, 4 May 2013 00:30:49 +0000 (17:30 -0700)]
Added meta-data to XML schema for fields referencing 'activity_type' and 'visibility' option_group values. CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoActually removed accountOptionValues() method and variable from CRM_Core_PseudoConsta...
Allen Shaw [Fri, 3 May 2013 05:26:05 +0000 (22:26 -0700)]
Actually removed accountOptionValues() method and variable from CRM_Core_PseudoConstant. CRM-12464

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

11 years agoRefactored out of CRM_Core_PseudoConstant: accountOptionValues(). CRM-12464
Allen Shaw [Fri, 3 May 2013 04:43:48 +0000 (21:43 -0700)]
Refactored out of CRM_Core_PseudoConstant: accountOptionValues(). CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

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

11 years agoAdd buildOptions method CRM-12464
Coleman Watts [Fri, 3 May 2013 01:54:49 +0000 (18:54 -0700)]
Add buildOptions method CRM-12464

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

11 years agoRemove eval()
Coleman Watts [Thu, 2 May 2013 23:15:00 +0000 (16:15 -0700)]
Remove eval()

11 years agoRevert "Refactored out of CRM_Core_PseudoConstant: accountOptionValues(). CRM-12464"
Allen Shaw [Fri, 3 May 2013 00:31:51 +0000 (17:31 -0700)]
Revert "Refactored out of CRM_Core_PseudoConstant: accountOptionValues(). CRM-12464"

This reverts commit 56b3d6b7dc6e3376f20f26bc403f3bf13341d792.

11 years agoRefactored out of CRM_Core_PseudoConstant: accountOptionValues(). CRM-12464
Allen Shaw [Fri, 3 May 2013 00:02:40 +0000 (17:02 -0700)]
Refactored out of CRM_Core_PseudoConstant: accountOptionValues(). CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoRefactored out of CRM_Core_PseudoConstant: ufGroup(), currencySymbols(). CRM-12464
Allen Shaw [Thu, 2 May 2013 23:36:32 +0000 (16:36 -0700)]
Refactored out of CRM_Core_PseudoConstant: ufGroup(), currencySymbols(). CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoAdded method fieldKeys() to DAOs. CRM-12464
Allen Shaw [Thu, 2 May 2013 23:35:01 +0000 (16:35 -0700)]
Added method fieldKeys() to DAOs. CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoAdd support for orderColumn CRM-12464
Coleman Watts [Thu, 2 May 2013 22:27:53 +0000 (15:27 -0700)]
Add support for orderColumn CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoRefactored out of CRM_Core_PseudoConstant: tag(), customGroup(). CRM-12464
Allen Shaw [Thu, 2 May 2013 04:35:42 +0000 (21:35 -0700)]
Refactored out of CRM_Core_PseudoConstant: tag(), customGroup(). CRM-12464

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

11 years agoRemove contact_type cache CRM-12464
Coleman Watts [Thu, 2 May 2013 03:45:09 +0000 (20:45 -0700)]
Remove contact_type cache CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoSupport contact_type and sub_type CRM-12464
Coleman Watts [Thu, 2 May 2013 01:54:32 +0000 (18:54 -0700)]
Support contact_type and sub_type CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoRefactored out of CRM_Core_PseudoConstant: locationVcardName(), locationDisplayName...
Allen Shaw [Thu, 2 May 2013 00:33:22 +0000 (17:33 -0700)]
Refactored out of CRM_Core_PseudoConstant: locationVcardName(), locationDisplayName(), component(). CRM-12464

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

11 years agoRefactored out of CRM_Core_PseudoConstant: IMProvider(), pcm(), preferredCommunicatio...
Allen Shaw [Wed, 1 May 2013 20:53:15 +0000 (13:53 -0700)]
Refactored out of CRM_Core_PseudoConstant: IMProvider(), pcm(), preferredCommunicationMethod(), activityContacts(), eventContacts(), getBatchMode(), autoRenew(). CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

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

11 years agofix PHP 5.4 static warnings
Donald A. Lobo [Wed, 1 May 2013 18:24:45 +0000 (11:24 -0700)]
fix PHP 5.4 static warnings

11 years agoRefactored out of CRM_Core_PseudoConstant: getBatchType(), getBatchStatus(). CRM...
Allen Shaw [Wed, 1 May 2013 18:13:30 +0000 (11:13 -0700)]
Refactored out of CRM_Core_PseudoConstant: getBatchType(), getBatchStatus(). CRM-12464

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

11 years agoRefactored out of CRM_Core_PseudoConstant: websiteType(), fromEmailAddress(), honorTy...
Allen Shaw [Wed, 1 May 2013 05:45:18 +0000 (22:45 -0700)]
Refactored out of CRM_Core_PseudoConstant: websiteType(), fromEmailAddress(), honorType(), priority(), wysiwygEditor(), mappingType(), mailProtocol(). CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

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

11 years agoCRM-14264 : start using xml for gender / suffix / prefix
Donald A. Lobo [Wed, 1 May 2013 01:50:04 +0000 (18:50 -0700)]
CRM-14264 : start using xml for gender / suffix / prefix

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

11 years agoCRM-14264 : start using xml for gender / suffix / prefix
Donald A. Lobo [Wed, 1 May 2013 01:31:47 +0000 (18:31 -0700)]
CRM-14264 : start using xml for gender / suffix / prefix

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

11 years agoRefactored location_type_id in CRM_Core_PseudoConstant::get() CRM_12464
Allen Shaw [Wed, 1 May 2013 00:02:49 +0000 (17:02 -0700)]
Refactored location_type_id in CRM_Core_PseudoConstant::get() CRM_12464

11 years agoSupport additional options for pseudoConstant::get CRM-12464
Coleman Watts [Tue, 30 Apr 2013 23:38:37 +0000 (16:38 -0700)]
Support additional options for pseudoConstant::get CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoRefactor cache flush CRM-12464
Coleman Watts [Tue, 30 Apr 2013 22:12:03 +0000 (15:12 -0700)]
Refactor cache flush CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoRefactor phone type CRM-12464
Coleman Watts [Tue, 30 Apr 2013 22:07:34 +0000 (15:07 -0700)]
Refactor phone type CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoRefactor individual prefix and suffix CRM-12464
Coleman Watts [Tue, 30 Apr 2013 21:57:28 +0000 (14:57 -0700)]
Refactor individual prefix and suffix CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoMigrate to new code
Donald A. Lobo [Tue, 30 Apr 2013 21:58:52 +0000 (14:58 -0700)]
Migrate to new code

11 years agoBug-fix: removed duplicate class variable declaration. CRM-12464
Allen Shaw [Tue, 30 Apr 2013 21:45:21 +0000 (14:45 -0700)]
Bug-fix: removed duplicate class variable declaration. CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoRefactor gender pseudoconstant to use generic get method CRM-12464
Coleman Watts [Tue, 30 Apr 2013 20:59:04 +0000 (13:59 -0700)]
Refactor gender pseudoconstant to use generic get method CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoAdded support for more optionValue types in get() method, with corresponding tests...
Allen Shaw [Tue, 30 Apr 2013 20:27:41 +0000 (13:27 -0700)]
Added support for more optionValue types in get() method, with corresponding tests. Toward CRM-12464.

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoAdded support for 'localize' param in CRM_Core_PseudoConstant::get(). CRM-12464
Allen Shaw [Tue, 30 Apr 2013 05:00:24 +0000 (22:00 -0700)]
Added support for 'localize' param in CRM_Core_PseudoConstant::get(). CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoAdded checks for valid array keys. CRM-12464
AS [Tue, 30 Apr 2013 04:33:41 +0000 (21:33 -0700)]
Added checks for valid array keys. CRM-12464

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

11 years agoAdded generic method CRM_Core_PseudoConstant::get(). CRM-12464
AS [Tue, 30 Apr 2013 03:59:05 +0000 (20:59 -0700)]
Added generic method CRM_Core_PseudoConstant::get(). CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoGet export working
Donald A. Lobo [Tue, 30 Apr 2013 20:38:03 +0000 (13:38 -0700)]
Get export working

11 years agoget rid of left joins
Donald A. Lobo [Tue, 30 Apr 2013 18:00:32 +0000 (11:00 -0700)]
get rid of left joins

11 years agoCRM-12464
Donald A. Lobo [Tue, 30 Apr 2013 04:13:46 +0000 (21:13 -0700)]
CRM-12464

----------------------------------------
* CRM-12464: Search improvements in 4.4
  http://issues.civicrm.org/jira/browse/CRM-12464

11 years agoMerge pull request #906 from eileenmcnaughton/CRM-12674
dlobo [Wed, 29 May 2013 20:34:00 +0000 (13:34 -0700)]
Merge pull request #906 from eileenmcnaughton/CRM-12674

CRM-12674 wordpress fix broke update settings for drupal - refactored version

11 years agoMerge pull request #908 from eileenmcnaughton/CRM-11356
Kurund Jalmi [Wed, 29 May 2013 20:04:41 +0000 (13:04 -0700)]
Merge pull request #908 from eileenmcnaughton/CRM-11356

CRM-11356 reword ending date range

11 years agoCRM-11356 reword ending date range
eileen [Wed, 29 May 2013 20:03:03 +0000 (08:03 +1200)]
CRM-11356 reword ending date range

11 years agoCRM-12674 wordpress fix broke update settings for drupal
eileen [Wed, 29 May 2013 09:02:25 +0000 (21:02 +1200)]
CRM-12674 wordpress fix broke update settings for drupal

11 years agoMerge pull request #900 from dlobo/CRM-12588
Kurund Jalmi [Wed, 29 May 2013 19:17:32 +0000 (12:17 -0700)]
Merge pull request #900 from dlobo/CRM-12588

CRM-12588

11 years agoCRM-12588
Donald A. Lobo [Wed, 29 May 2013 15:23:51 +0000 (08:23 -0700)]
CRM-12588

----------------------------------------
* CRM-12588: Query by Memership Type using Search Builder does not work
  http://issues.civicrm.org/jira/browse/CRM-12588

11 years agoMerge pull request #899 from ravishnair/CRM-12463QAfix
Kurund Jalmi [Wed, 29 May 2013 15:17:03 +0000 (08:17 -0700)]
Merge pull request #899 from ravishnair/CRM-12463QAfix

CRM-12463 QA fix

11 years ago-- CRM-12463 Indentation fix
Ravish Nair [Wed, 29 May 2013 15:11:52 +0000 (20:41 +0530)]
-- CRM-12463 Indentation fix

11 years ago-- CRM-12463 QA fix
Ravish Nair [Wed, 29 May 2013 15:07:25 +0000 (20:37 +0530)]
-- CRM-12463 QA fix

11 years agoMerge pull request #887 from yashodha/4.4
Kurund Jalmi [Wed, 29 May 2013 14:04:53 +0000 (07:04 -0700)]
Merge pull request #887 from yashodha/4.4

4.4

11 years agoMerge pull request #893 from pratik-joshi/CRM-12696
Kurund Jalmi [Wed, 29 May 2013 14:02:26 +0000 (07:02 -0700)]
Merge pull request #893 from pratik-joshi/CRM-12696

CRM-12696 fix: re-structured CRM_Contact_Form_Edit_Address::fixStateSele...

11 years agomore clean up (CRM-12697)
yashodha [Wed, 29 May 2013 10:30:59 +0000 (16:00 +0530)]
more clean up (CRM-12697)

11 years agoCRM-12696 fix: re-structured CRM_Contact_Form_Edit_Address::fixStateSelect code and...
Pratik Joshi [Wed, 29 May 2013 10:00:59 +0000 (15:30 +0530)]
CRM-12696 fix: re-structured CRM_Contact_Form_Edit_Address::fixStateSelect code and CRM_Core_BAO_Address::fixAllStateSelects code to allow state and county selections even if the country address field is disabled in civi

11 years agomore clean up (CRM-12697)
yashodha [Wed, 29 May 2013 09:45:35 +0000 (15:15 +0530)]
more clean up (CRM-12697)

11 years agoclean up (CRM-12697)
yashodha [Wed, 29 May 2013 07:20:02 +0000 (12:50 +0530)]
clean up (CRM-12697)

11 years agoclean up (CRM-12697)
yashodha [Wed, 29 May 2013 07:11:52 +0000 (12:41 +0530)]
clean up (CRM-12697)

11 years agoCRM-12697
yashodha [Wed, 29 May 2013 06:21:10 +0000 (11:51 +0530)]
CRM-12697

11 years agoCRM-12697
yashodha [Wed, 29 May 2013 06:00:28 +0000 (11:30 +0530)]
CRM-12697

11 years agoComplete implementation, including database upgrade.
Nicolas Ganivet [Wed, 29 May 2013 08:00:04 +0000 (02:00 -0600)]
Complete implementation, including database upgrade.

11 years agoMerge pull request #886 from yashodha/4.4
Kurund Jalmi [Wed, 29 May 2013 05:53:39 +0000 (22:53 -0700)]
Merge pull request #886 from yashodha/4.4

CRM-12697

11 years agoCRM-12697
yashodha [Wed, 29 May 2013 05:48:52 +0000 (11:18 +0530)]
CRM-12697

11 years agoMerge pull request #878 from pradpnayak/CRM-12470-masterFixes
Kurund Jalmi [Tue, 28 May 2013 19:06:50 +0000 (12:06 -0700)]
Merge pull request #878 from pradpnayak/CRM-12470-masterFixes

-- CRM fixes for CRM-12470

11 years ago-- CRM fixes for CRM-12470
Pradeep Nayak [Tue, 28 May 2013 17:39:59 +0000 (23:09 +0530)]
-- CRM fixes for CRM-12470

----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
  http://issues.civicrm.org/jira/browse/CRM-12470
* CRM-12470-masterFixes:
  http://issues.civicrm.org/jira/browse/CRM-12470-masterFixes

11 years agoMerge pull request #875 from yashodha/4.4
Kurund Jalmi [Tue, 28 May 2013 11:51:57 +0000 (04:51 -0700)]
Merge pull request #875 from yashodha/4.4

CRM-12697

11 years agoCRM-12697
yashodha [Tue, 28 May 2013 11:29:52 +0000 (16:59 +0530)]
CRM-12697

11 years agoMerge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-28-14-04-12
Kurund Jalmi [Tue, 28 May 2013 08:44:26 +0000 (14:14 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-28-14-04-12

Conflicts:
CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl
CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl
sql/civicrm_generated.mysql

11 years agoMerge pull request #868 from kurund/CRM-12681
Kurund Jalmi [Tue, 28 May 2013 07:41:27 +0000 (00:41 -0700)]
Merge pull request #868 from kurund/CRM-12681

worked on CRM-12681, fixed display of copy checkbox when billing block i...

11 years agoMerge pull request #869 from totten/cms-perms
Kurund Jalmi [Tue, 28 May 2013 07:41:10 +0000 (00:41 -0700)]
Merge pull request #869 from totten/cms-perms

CRM-12499 - Allow CMS-specific permission expressions

11 years agoMerge pull request #870 from colemanw/import
Kurund Jalmi [Tue, 28 May 2013 07:40:36 +0000 (00:40 -0700)]
Merge pull request #870 from colemanw/import

Rename CRM_Import -> CRM_Contact_Import CRM-11254

11 years agoMerge pull request #871 from colemanw/versionAlert
Kurund Jalmi [Tue, 28 May 2013 07:36:39 +0000 (00:36 -0700)]
Merge pull request #871 from colemanw/versionAlert

Add versionAlert setting CRM-12701

11 years agoMerge pull request #872 from eileenmcnaughton/master
Kurund Jalmi [Tue, 28 May 2013 07:35:16 +0000 (00:35 -0700)]
Merge pull request #872 from eileenmcnaughton/master

a bit more formatting / whitespace

11 years agoMerge pull request #873 from ravishnair/CRM-12410QAfix
Kurund Jalmi [Tue, 28 May 2013 07:30:41 +0000 (00:30 -0700)]
Merge pull request #873 from ravishnair/CRM-12410QAfix

-- CRM-12410 Minor QA fix

11 years agoMerge pull request #874 from kurund/CRM-12705
Kurund Jalmi [Tue, 28 May 2013 07:29:03 +0000 (00:29 -0700)]
Merge pull request #874 from kurund/CRM-12705

applied patch for CRM-12705

11 years agoapplied patch for CRM-12705
Kurund Jalmi [Tue, 28 May 2013 07:28:30 +0000 (12:58 +0530)]
applied patch for CRM-12705

11 years ago-- CRM-12410 Minor QA fix
Ravish Nair [Tue, 28 May 2013 05:58:59 +0000 (11:28 +0530)]
-- CRM-12410 Minor QA fix

11 years agoa few more trailing space removals, //ids removals, tabs
eileen [Tue, 28 May 2013 03:24:29 +0000 (15:24 +1200)]
a few more trailing space removals, //ids removals, tabs