civicrm-core.git
11 years agorename test class as it turns out deceased contacts ARE returned by default
eileen [Thu, 5 Sep 2013 03:45:16 +0000 (15:45 +1200)]
rename test class as it turns out deceased contacts ARE returned by default

11 years agoMerge pull request #1596 from GiantRobot/CRM-13343
Tim Otten [Thu, 5 Sep 2013 01:52:17 +0000 (18:52 -0700)]
Merge pull request #1596 from GiantRobot/CRM-13343

Handle JSON decode errors in API requests, throw synthetic error.

11 years agoHandle JSON decode errors in API requests, throw synthetic error.
Chris Burgess [Wed, 4 Sep 2013 22:24:50 +0000 (10:24 +1200)]
Handle JSON decode errors in API requests, throw synthetic error.

11 years agoadd error_message on curl error+json_decode error
Xavier Dutoit [Wed, 4 Sep 2013 09:44:49 +0000 (11:44 +0200)]
add error_message on curl error+json_decode error

11 years agoMerge pull request #1595 from colemanw/master
colemanw [Wed, 4 Sep 2013 18:42:24 +0000 (11:42 -0700)]
Merge pull request #1595 from colemanw/master

Fix convertToPseudoNames for CRM-13318

11 years agoFix convertToPseudoNames for CRM-13318
Coleman Watts [Wed, 4 Sep 2013 18:34:07 +0000 (14:34 -0400)]
Fix convertToPseudoNames for CRM-13318

----------------------------------------
* CRM-13318: Api doesn't return gender, prefix, suffix by default
  http://issues.civicrm.org/jira/browse/CRM-13318

11 years agoMerge pull request #1594 from yashodha/notice-fixes
Kurund Jalmi [Wed, 4 Sep 2013 17:39:43 +0000 (10:39 -0700)]
Merge pull request #1594 from yashodha/notice-fixes

notice fix

11 years agoMerge pull request #1592 from ravishnair/CRM-13338
Kurund Jalmi [Wed, 4 Sep 2013 17:38:53 +0000 (10:38 -0700)]
Merge pull request #1592 from ravishnair/CRM-13338

-- CRM-13338 minor fix to populate profile defaults in live contribution page

11 years agoMerge pull request #1590 from ravishnair/webtestfix
Kurund Jalmi [Wed, 4 Sep 2013 17:38:32 +0000 (10:38 -0700)]
Merge pull request #1590 from ravishnair/webtestfix

-- webtest fixes

11 years agoMerge pull request #1593 from pratik-joshi/CRM-13328-fix
Kurund Jalmi [Wed, 4 Sep 2013 14:09:30 +0000 (07:09 -0700)]
Merge pull request #1593 from pratik-joshi/CRM-13328-fix

CRM-13328

11 years agoCRM-13328-fix
Pratik Joshi [Wed, 4 Sep 2013 14:00:50 +0000 (19:30 +0530)]
CRM-13328-fix

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

11 years agonotice fix
yashodha [Wed, 4 Sep 2013 13:55:34 +0000 (19:25 +0530)]
notice fix

11 years ago-- CRM-13338 minor fix to populate profile defaults in live contribution page
Ravish Nair [Wed, 4 Sep 2013 13:53:44 +0000 (19:23 +0530)]
-- CRM-13338 minor fix to populate profile defaults in live contribution page

----------------------------------------
* CRM-13338: Profile field defaults not getting populated in contribution live page
  http://issues.civicrm.org/jira/browse/CRM-13338

11 years agoMerge pull request #1591 from deepak-srivastava/logs
deepak-srivastava [Wed, 4 Sep 2013 12:03:55 +0000 (05:03 -0700)]
Merge pull request #1591 from deepak-srivastava/logs

CRM-13335

11 years agoCRM-13335
Deepak Srivastava [Wed, 4 Sep 2013 12:00:48 +0000 (17:30 +0530)]
CRM-13335

11 years agoMerge pull request #1588 from monishdeb/WebTestFixes
Kurund Jalmi [Wed, 4 Sep 2013 11:23:36 +0000 (04:23 -0700)]
Merge pull request #1588 from monishdeb/WebTestFixes

Webtest fix

11 years agoMerge pull request #1589 from kurund/CRM-13330
Kurund Jalmi [Wed, 4 Sep 2013 11:10:52 +0000 (04:10 -0700)]
Merge pull request #1589 from kurund/CRM-13330

CRM-13330, added font style support for event badge creation

11 years agoCRM-13330, fixed generated data to add style
kurund [Wed, 4 Sep 2013 11:06:21 +0000 (16:36 +0530)]
CRM-13330, fixed generated data to add style

----------------------------------------
* CRM-13330: Allow user to define font style for each row in badge layout
  http://issues.civicrm.org/jira/browse/CRM-13330

11 years agoCRM-13330, fixed generated data
kurund [Wed, 4 Sep 2013 10:53:29 +0000 (16:23 +0530)]
CRM-13330, fixed generated data

----------------------------------------
* CRM-13330: Allow user to define font style for each row in badge layout
  http://issues.civicrm.org/jira/browse/CRM-13330

11 years agoWebtest fix
monishdeb [Wed, 4 Sep 2013 10:47:04 +0000 (16:17 +0530)]
Webtest fix

11 years agoCRM-13330, fixed badge to respect style
kurund [Wed, 4 Sep 2013 10:35:30 +0000 (16:05 +0530)]
CRM-13330, fixed badge to respect style

----------------------------------------
* CRM-13330: Allow user to define font style for each row in badge layout
  http://issues.civicrm.org/jira/browse/CRM-13330

11 years agoCRM-13330, added font style
kurund [Wed, 4 Sep 2013 10:19:24 +0000 (15:49 +0530)]
CRM-13330, added font style

----------------------------------------
* CRM-13330: Allow user to define font style for each row in badge layout
  http://issues.civicrm.org/jira/browse/CRM-13330

11 years ago-- webtest fixes
Ravish Nair [Wed, 4 Sep 2013 10:06:07 +0000 (15:36 +0530)]
-- webtest fixes

11 years agoMerge pull request #1586 from eileenmcnaughton/CRM-9493
pratik-joshi [Wed, 4 Sep 2013 09:58:28 +0000 (02:58 -0700)]
Merge pull request #1586 from eileenmcnaughton/CRM-9493

CRM-9493 - improve performance on group contact cache build (fixed & re-...

11 years agoMerge pull request #1582 from ravishnair/CRM-13321
Kurund Jalmi [Wed, 4 Sep 2013 04:55:59 +0000 (21:55 -0700)]
Merge pull request #1582 from ravishnair/CRM-13321

-- CRM-13321 Applied patch

11 years ago-- CRM-13321 removed debug code
Ravish Nair [Wed, 4 Sep 2013 04:47:48 +0000 (10:17 +0530)]
-- CRM-13321 removed debug code

----------------------------------------
* CRM-13321: Performance Issue counting Contributions Contact summary
  http://issues.civicrm.org/jira/browse/CRM-13321

11 years agoMerge pull request #1585 from eileenmcnaughton/CRM-13234
Kurund Jalmi [Wed, 4 Sep 2013 03:58:57 +0000 (20:58 -0700)]
Merge pull request #1585 from eileenmcnaughton/CRM-13234

CRM-13234 make profile.submit transactional

11 years agoMerge pull request #1584 from eileenmcnaughton/CRM-13332
Kurund Jalmi [Wed, 4 Sep 2013 03:58:28 +0000 (20:58 -0700)]
Merge pull request #1584 from eileenmcnaughton/CRM-13332

CRM-13332 (closes issue) print to error log if eWay hits an error

11 years agoCRM-9493 - improve performance on group contact cache build (fixed & re-submitted)
eileen [Tue, 3 Sep 2013 23:35:09 +0000 (11:35 +1200)]
CRM-9493 - improve performance on group contact cache build (fixed & re-submitted)

11 years agoCRM-13234 make profile.submit transactional
eileen [Fri, 30 Aug 2013 02:20:33 +0000 (14:20 +1200)]
CRM-13234 make profile.submit transactional

11 years agoMerge pull request #1583 from adamwight/CRM-13326
Dave Greenberg [Tue, 3 Sep 2013 22:48:38 +0000 (15:48 -0700)]
Merge pull request #1583 from adamwight/CRM-13326

CRM-13326: email can be up to 254 characters long

11 years agoCRM-13332 print to error log if eWay hits an error
eileen [Tue, 3 Sep 2013 21:58:34 +0000 (09:58 +1200)]
CRM-13332 print to error log if eWay hits an error

11 years agoCRM-13326: email can be up to 254 characters long
Adam Roses Wight [Tue, 3 Sep 2013 20:38:00 +0000 (13:38 -0700)]
CRM-13326: email can be up to 254 characters long

In accordance with current IETF recommendations.  For a good overview, see
http://en.wikipedia.org/wiki/Email_address

11 years ago-- CRM-13321
Ravish Nair [Tue, 3 Sep 2013 14:54:38 +0000 (20:24 +0530)]
-- CRM-13321

----------------------------------------
* CRM-13321: Performance Issue counting Contributions Contact summary
  http://issues.civicrm.org/jira/browse/CRM-13321

11 years agoMerge pull request #1579 from pratik-joshi/CRM-13324
Kurund Jalmi [Tue, 3 Sep 2013 12:41:22 +0000 (05:41 -0700)]
Merge pull request #1579 from pratik-joshi/CRM-13324

Crm 13324

11 years agoCRM-13324 : code improvement
Pratik Joshi [Tue, 3 Sep 2013 12:27:31 +0000 (17:57 +0530)]
CRM-13324 : code improvement

----------------------------------------
* CRM-13324: Reserve respondent process of survey not working if contacts are filter by particular group, and all records are selected for reserving.
  http://issues.civicrm.org/jira/browse/CRM-13324

11 years agoCRM-13324 fix
Pratik Joshi [Tue, 3 Sep 2013 11:11:12 +0000 (16:41 +0530)]
CRM-13324 fix

----------------------------------------
* CRM-13324: Reserve respondent process of survey not working if contacts are filter by particular group, and all records are selected for reserving.
  http://issues.civicrm.org/jira/browse/CRM-13324

11 years agoMerge pull request #1578 from monishdeb/CRM-13286
Kurund Jalmi [Tue, 3 Sep 2013 10:41:16 +0000 (03:41 -0700)]
Merge pull request #1578 from monishdeb/CRM-13286

CRM-13286 fix

11 years agoCRM-13286 fix
monishdeb [Tue, 3 Sep 2013 10:29:44 +0000 (15:59 +0530)]
CRM-13286 fix

----------------------------------------
* CRM-13286: Autocomplete select another contact on registration and contribution pages doesn't set State/Province if contact's country is not the default country
  http://issues.civicrm.org/jira/browse/CRM-13286

11 years agoMerge pull request #1577 from kurund/group-search
Kurund Jalmi [Tue, 3 Sep 2013 09:33:35 +0000 (02:33 -0700)]
Merge pull request #1577 from kurund/group-search

export fixes to respect search criteria

11 years agoexport fixes to respect search criteria
kurund [Tue, 3 Sep 2013 09:31:49 +0000 (15:01 +0530)]
export fixes to respect search criteria

11 years agoMerge pull request #1576 from monishdeb/WebTestFixes
Kurund Jalmi [Tue, 3 Sep 2013 09:12:37 +0000 (02:12 -0700)]
Merge pull request #1576 from monishdeb/WebTestFixes

Webtest Fixes

11 years agoWebtest Fixes
monishdeb [Tue, 3 Sep 2013 09:04:17 +0000 (14:34 +0530)]
Webtest Fixes

11 years agoMerge pull request #1575 from monishdeb/CRMtests
Kurund Jalmi [Tue, 3 Sep 2013 08:18:31 +0000 (01:18 -0700)]
Merge pull request #1575 from monishdeb/CRMtests

CRM testfixes related to Report

11 years agoCRM testfixes related to Report
monishdeb [Tue, 3 Sep 2013 07:32:47 +0000 (13:02 +0530)]
CRM testfixes related to Report

11 years agoMerge pull request #1574 from totten/master-getfields-tests
Tim Otten [Tue, 3 Sep 2013 01:21:50 +0000 (18:21 -0700)]
Merge pull request #1574 from totten/master-getfields-tests

CRM-13027 - Regressions

11 years agoCRM-13027 - Pass api_v3_CustomValueContactTypeTest::testGetFields
Tim Otten [Tue, 3 Sep 2013 01:19:37 +0000 (18:19 -0700)]
CRM-13027 - Pass api_v3_CustomValueContactTypeTest::testGetFields

----------------------------------------
* CRM-13027: Default getFields returns irrelevant custom-data fields
  http://issues.civicrm.org/jira/browse/CRM-13027

11 years agoCRM-13027 - More detail for test
Tim Otten [Tue, 3 Sep 2013 01:19:09 +0000 (18:19 -0700)]
CRM-13027 - More detail for test

----------------------------------------
* CRM-13027: Default getFields returns irrelevant custom-data fields
  http://issues.civicrm.org/jira/browse/CRM-13027

11 years agoCRM-13187 - CRM_Upgrade_Incremental_php_FourFour - Match 675605a
Tim Otten [Mon, 2 Sep 2013 19:57:40 +0000 (12:57 -0700)]
CRM-13187 - CRM_Upgrade_Incremental_php_FourFour - Match 675605a

----------------------------------------
* CRM-13187: hrui: Change breadcrumb from "CiviCRM" to "CiviHR"
  http://issues.civicrm.org/jira/browse/CRM-13187

11 years agoMerge branch 'CRM-13187-b' of git://github.com/vivekarora/civicrm-core into pull...
Tim Otten [Mon, 2 Sep 2013 19:26:58 +0000 (12:26 -0700)]
Merge branch 'CRM-13187-b' of git://github.com/vivekarora/civicrm-core into pull-request-1571

11 years agoMerge pull request #1570 from yashodha/CRM-13315
Kurund Jalmi [Mon, 2 Sep 2013 15:32:22 +0000 (08:32 -0700)]
Merge pull request #1570 from yashodha/CRM-13315

fixed target contact import (CRM-13315)

11 years agoMerge pull request #1572 from deepak-srivastava/reports
deepak-srivastava [Mon, 2 Sep 2013 14:12:15 +0000 (07:12 -0700)]
Merge pull request #1572 from deepak-srivastava/reports

CRM-12490 - test fixes

11 years agoCRM-12490 - test fixes
Deepak Srivastava [Mon, 2 Sep 2013 14:10:51 +0000 (19:40 +0530)]
CRM-12490 - test fixes

11 years agoCRM-13187 - Coding corrections for status and match type
vivekarora [Mon, 2 Sep 2013 13:49:19 +0000 (19:19 +0530)]
CRM-13187 - Coding corrections for status and match type

----------------------------------------
* CRM-13187: hrui: Change breadcrumb from "CiviCRM" to "CiviHR"
  http://issues.civicrm.org/jira/browse/CRM-13187

11 years agoCRM-13187 - Coding corrections for status and match type
vivekarora [Mon, 2 Sep 2013 13:45:44 +0000 (19:15 +0530)]
CRM-13187 - Coding corrections for status and match type

----------------------------------------
* CRM-13187: hrui: Change breadcrumb from "CiviCRM" to "CiviHR"
  http://issues.civicrm.org/jira/browse/CRM-13187

11 years agoMerge pull request #1556 from pratik-joshi/CRM-13276
Kurund Jalmi [Mon, 2 Sep 2013 12:42:54 +0000 (05:42 -0700)]
Merge pull request #1556 from pratik-joshi/CRM-13276

CRM-13276 fix

11 years agofixed target contact import (CRM-13315)
yashodha [Mon, 2 Sep 2013 11:48:18 +0000 (17:18 +0530)]
fixed target contact import (CRM-13315)

11 years agoMerge pull request #1569 from monishdeb/CRM-13314
Kurund Jalmi [Mon, 2 Sep 2013 10:15:11 +0000 (03:15 -0700)]
Merge pull request #1569 from monishdeb/CRM-13314

CRM-13314 fix - add Florida, San Jose, Rio Negro states to Uruguay

11 years agoCRM-13314 fix - add Florida, San Jose, Rio Negro states to Uraguay
monishdeb [Mon, 2 Sep 2013 10:08:32 +0000 (15:38 +0530)]
CRM-13314 fix - add Florida, San Jose, Rio Negro states to Uraguay

----------------------------------------
* CRM-13314: 3 Missing Geographic State for Uruguay in Address Drop Down
  http://issues.civicrm.org/jira/browse/CRM-13314

11 years agoMerge pull request #1568 from deepak-srivastava/reports
deepak-srivastava [Mon, 2 Sep 2013 09:47:19 +0000 (02:47 -0700)]
Merge pull request #1568 from deepak-srivastava/reports

CRM-12490 - order-by fatal error fix

11 years agoCRM-12490 - order-by fatal error fix
Deepak Srivastava [Mon, 2 Sep 2013 09:39:31 +0000 (15:09 +0530)]
CRM-12490 - order-by fatal error fix

11 years agoMerge pull request #1567 from colemanw/master
colemanw [Sun, 1 Sep 2013 21:52:51 +0000 (14:52 -0700)]
Merge pull request #1567 from colemanw/master

Fix faulty contact tests

11 years agoFix faulty contact tests
Coleman Watts [Sun, 1 Sep 2013 21:51:02 +0000 (17:51 -0400)]
Fix faulty contact tests

11 years agoMerge pull request #1566 from colemanw/master
colemanw [Sun, 1 Sep 2013 17:28:53 +0000 (10:28 -0700)]
Merge pull request #1566 from colemanw/master

Fix return defaults CRM-13318

11 years agoFix return defaults CRM-13318
Coleman Watts [Sun, 1 Sep 2013 17:26:26 +0000 (13:26 -0400)]
Fix return defaults CRM-13318

----------------------------------------
* CRM-13318: Api doesn't return gender, prefix, suffix by default
  http://issues.civicrm.org/jira/browse/CRM-13318

11 years agoMerge pull request #1565 from totten/master-getfields-fix2
Tim Otten [Sun, 1 Sep 2013 06:38:56 +0000 (23:38 -0700)]
Merge pull request #1565 from totten/master-getfields-fix2

CRM-13027 - CRM_Core_BAO_CustomField - Re-allow blank $customDataType

11 years agoCRM-13027 - CRM_Core_BAO_CustomField - Re-allow blank $customDataType
Tim Otten [Sun, 1 Sep 2013 06:36:18 +0000 (23:36 -0700)]
CRM-13027 - CRM_Core_BAO_CustomField - Re-allow blank $customDataType

----------------------------------------
* CRM-13027: Default getFields returns irrelevant custom-data fields
  http://issues.civicrm.org/jira/browse/CRM-13027

11 years agoMerge pull request #1564 from totten/master-getfields-fix
Tim Otten [Sun, 1 Sep 2013 06:11:03 +0000 (23:11 -0700)]
Merge pull request #1564 from totten/master-getfields-fix

CRM-13027 - Fix handling of custom-data in getfields API

11 years agoCRM-13027 - Fix bad results from getFields:
Tim Otten [Sun, 1 Sep 2013 01:37:11 +0000 (18:37 -0700)]
CRM-13027 - Fix bad results from getFields:

 * If entity is not extendable, then field list should be empty (not all).
 * If entity is blank, then throw an error.

----------------------------------------
* CRM-13027: Default getFields returns irrelevant custom-data fields
  http://issues.civicrm.org/jira/browse/CRM-13027

11 years agoCRM-13027 - api_v3_CustomFieldTest - Also check getfields for the contact types
Tim Otten [Sun, 1 Sep 2013 01:36:02 +0000 (18:36 -0700)]
CRM-13027 - api_v3_CustomFieldTest - Also check getfields for the contact types

----------------------------------------
* CRM-13027: Default getFields returns irrelevant custom-data fields
  http://issues.civicrm.org/jira/browse/CRM-13027

11 years agoCRM_Core_BAO_CustomField - Format
Tim Otten [Sun, 1 Sep 2013 01:06:03 +0000 (18:06 -0700)]
CRM_Core_BAO_CustomField - Format

11 years agoMerge pull request #1563 from totten/master-getfields-test
Tim Otten [Sat, 31 Aug 2013 22:54:01 +0000 (15:54 -0700)]
Merge pull request #1563 from totten/master-getfields-test

CRM-13027, CRM-12497 - Add test case for 'getfields' returning mismatched data

11 years agoCRM-13027, CRM-12497 - Add test case for 'getfields' returning mismatched data about...
Tim Otten [Sat, 31 Aug 2013 22:49:47 +0000 (15:49 -0700)]
CRM-13027, CRM-12497 - Add test case for 'getfields' returning mismatched data about custom fields

----------------------------------------
* CRM-13027: Default getFields returns irrelevant custom-data fields
  http://issues.civicrm.org/jira/browse/CRM-13027
* CRM-12497: API 'getfields' method returns all custom fields
  http://issues.civicrm.org/jira/browse/CRM-12497

11 years agoCleanup - remove unused search code
Coleman Watts [Sat, 31 Aug 2013 22:23:42 +0000 (18:23 -0400)]
Cleanup - remove unused search code

11 years agoMerge pull request #1562 from colemanw/tagTab
colemanw [Sat, 31 Aug 2013 12:50:30 +0000 (05:50 -0700)]
Merge pull request #1562 from colemanw/tagTab

Update tag tab disabled status CRM-13176

11 years agoUpdate tag tab disabled status CRM-13176
Coleman Watts [Sat, 31 Aug 2013 12:49:02 +0000 (08:49 -0400)]
Update tag tab disabled status CRM-13176

----------------------------------------
* CRM-13176: Enhance styling of "View Contact" tabs to indicate empty/non-empty tags
  http://issues.civicrm.org/jira/browse/CRM-13176

11 years agoCRM-13187 - CRM_Admin_Form_WordReplacements
Tim Otten [Sat, 31 Aug 2013 06:18:54 +0000 (23:18 -0700)]
CRM-13187 - CRM_Admin_Form_WordReplacements

Patch the admin UI for word-replacements so that it reads and writes
records in the civicrm_word_replacement table.  To make this work
without a total rewrite, we add two steps:

 * At the beginning, call the "civicrm_word_replacement=>civicrm_domain" logic
   (This logic is already written -- it's in the BAO.)
 * At the end, call the the "civicrm_domain=>civicrm_word_replacement" logic
   (This logic is already written -- copied from the upgrader to the BAO.)

This is inefficient but much simpler than rewriting the UI.

----------------------------------------
* CRM-13187: hrui: Change breadcrumb from "CiviCRM" to "CiviHR"
  http://issues.civicrm.org/jira/browse/CRM-13187

11 years agoCRM-13187 - WordReplacement API - Cut down unnecessary rebuilds
Tim Otten [Sat, 31 Aug 2013 06:15:48 +0000 (23:15 -0700)]
CRM-13187 - WordReplacement API - Cut down unnecessary rebuilds

11 years agoMerge pull request #1561 from cividesk/Membership-fix
Kurund Jalmi [Sat, 31 Aug 2013 06:28:34 +0000 (23:28 -0700)]
Merge pull request #1561 from cividesk/Membership-fix

Fix regression on membership

11 years agoMerge pull request #1559 from davecivicrm/CRM-13279
Kurund Jalmi [Sat, 31 Aug 2013 06:28:18 +0000 (23:28 -0700)]
Merge pull request #1559 from davecivicrm/CRM-13279

CRM-13279 adding birth date and gender as column options to participant ...

11 years agoMerge pull request #1558 from davecivicrm/CRM-13296
Kurund Jalmi [Sat, 31 Aug 2013 06:26:56 +0000 (23:26 -0700)]
Merge pull request #1558 from davecivicrm/CRM-13296

CRM-13296 fix e-notice, change cancel button text on mailing labels to D...

11 years agoCRM-13187 - CRM_Upgrade_Incremental_php_FourFour::rebuildWordReplacementTable
Tim Otten [Sat, 31 Aug 2013 06:11:01 +0000 (23:11 -0700)]
CRM-13187 - CRM_Upgrade_Incremental_php_FourFour::rebuildWordReplacementTable

Extract function rebuildWordReplacementTable(). This is slightly different
from the old code in that it replaces all the rows in
civicrm_word_replacement instead of simply inserting. This is an academic
distinction during upgrade but will matter in subsequent use-case.

----------------------------------------
* CRM-13187: hrui: Change breadcrumb from "CiviCRM" to "CiviHR"
  http://issues.civicrm.org/jira/browse/CRM-13187

11 years agoCRM-13187 - Autoformat
Tim Otten [Fri, 30 Aug 2013 22:07:25 +0000 (15:07 -0700)]
CRM-13187 - Autoformat

----------------------------------------
* CRM-13187: hrui: Change breadcrumb from "CiviCRM" to "CiviHR"
  http://issues.civicrm.org/jira/browse/CRM-13187

11 years agoCRM-13187 - CRM_Core_BAO_WordReplacement - Extract getAllAsConfigArray() from rebuild()
Tim Otten [Fri, 30 Aug 2013 22:05:43 +0000 (15:05 -0700)]
CRM-13187 - CRM_Core_BAO_WordReplacement - Extract getAllAsConfigArray() from rebuild()

----------------------------------------
* CRM-13187: hrui: Change breadcrumb from "CiviCRM" to "CiviHR"
  http://issues.civicrm.org/jira/browse/CRM-13187

11 years agoCRM-13187 - Upgrade fixes for WordReplacements
Tim Otten [Fri, 30 Aug 2013 21:48:37 +0000 (14:48 -0700)]
CRM-13187 - Upgrade fixes for WordReplacements

 * Move code from the activity-contacts task (in 4.4.alpha1) to its own task (in 4.4.beta1, the next release)
 * Use civicrm_api3 so that errors are converted to exceptions and reported in UI

----------------------------------------
* CRM-13187: hrui: Change breadcrumb from "CiviCRM" to "CiviHR"
  http://issues.civicrm.org/jira/browse/CRM-13187

11 years agoCRM-13187 - WordReplacement - Fix DAO generation
Tim Otten [Fri, 30 Aug 2013 21:45:14 +0000 (14:45 -0700)]
CRM-13187 - WordReplacement - Fix DAO generation

 * Update files.xml
 * Update gitignore
 * Update truncate.xml

----------------------------------------
* CRM-13187: hrui: Change breadcrumb from "CiviCRM" to "CiviHR"
  http://issues.civicrm.org/jira/browse/CRM-13187

11 years agoMerge branch 'CRM-13187' of git://github.com/vivekarora/civicrm-core into vivekarora...
Tim Otten [Sat, 31 Aug 2013 04:46:19 +0000 (21:46 -0700)]
Merge branch 'CRM-13187' of git://github.com/vivekarora/civicrm-core into vivekarora-CRM-13187-b

11 years agoMerge pull request #1560 from totten/master-matchoption
Tim Otten [Sat, 31 Aug 2013 04:44:04 +0000 (21:44 -0700)]
Merge pull request #1560 from totten/master-matchoption

CRM-13312 - Implement 'options.match' for API

11 years agoI've had to correct this for 4.2 LTS - apparently $relTypeDir[$dir] is of type Array...
Nicolas Ganivet [Sat, 31 Aug 2013 04:24:11 +0000 (22:24 -0600)]
I've had to correct this for 4.2 LTS - apparently $relTypeDir[$dir] is of type Array now.

11 years agoCRM-13312 - CRM_Utils_API_MatchOption - Improvements:
Tim Otten [Sat, 31 Aug 2013 01:39:51 +0000 (18:39 -0700)]
CRM-13312 - CRM_Utils_API_MatchOption - Improvements:

 * Extend support to the "replace" action
 * Accept 'match' as a string *or* array
 * Tweak comments

----------------------------------------
* CRM-13312: Implement API support for options.match
  http://issues.civicrm.org/jira/browse/CRM-13312

11 years agoCRM-13312 - CRM_Utils_API_MatchOption - Add option for updating based on user-specifi...
Tim Otten [Fri, 30 Aug 2013 23:41:35 +0000 (16:41 -0700)]
CRM-13312 - CRM_Utils_API_MatchOption - Add option for updating based on user-specified keys

----------------------------------------
* CRM-13312: Implement API support for options.match
  http://issues.civicrm.org/jira/browse/CRM-13312

11 years agoCRM-13279 adding birth date and gender as column options to participant listing report.
Dave Greenberg [Fri, 30 Aug 2013 22:54:58 +0000 (15:54 -0700)]
CRM-13279 adding birth date and gender as column options to participant listing report.

----------------------------------------
* CRM-13279: Include gender and date of birth in (participant) reports
  http://issues.civicrm.org/jira/browse/CRM-13279

11 years agoCRM-13296 fix e-notice, change cancel button text on mailing labels to Done, refactor...
Dave Greenberg [Fri, 30 Aug 2013 21:55:43 +0000 (14:55 -0700)]
CRM-13296 fix e-notice, change cancel button text on mailing labels to Done, refactor to sare buildQuickForm common code. Note that more refactoring is probably needed on this (4.5?) to eliminate duplicated code in postProcess, setDefaults - making use of LabelCommon.php.

----------------------------------------
* CRM-13296: Add tasks to membership search - print labels & print pdf letter
  http://issues.civicrm.org/jira/browse/CRM-13296

11 years agoMerge pull request #1534 from eileenmcnaughton/labels
Dave Greenberg [Fri, 30 Aug 2013 21:23:31 +0000 (14:23 -0700)]
Merge pull request #1534 from eileenmcnaughton/labels

CRM-13296 Add Options to Membership search to print labels & send letters

11 years agoMerge pull request #1557 from totten/master-profilepublic-revert
Tim Otten [Fri, 30 Aug 2013 20:36:14 +0000 (13:36 -0700)]
Merge pull request #1557 from totten/master-profilepublic-revert

CRM-13114 - Revert "Added missing menu row in edit profile"

11 years agoRevert "Added missing menu row in edit profile"
Tim Otten [Fri, 30 Aug 2013 20:34:07 +0000 (13:34 -0700)]
Revert "Added missing menu row in edit profile"

This reverts commit a6bf231033983407abd6d60054af559c9bf32d4f.

11 years agoMerge pull request #1554 from ravishnair/webtest-fix
Kurund Jalmi [Fri, 30 Aug 2013 18:39:41 +0000 (11:39 -0700)]
Merge pull request #1554 from ravishnair/webtest-fix

-- webtest fix

11 years ago-- webtest fix
Ravish Nair [Fri, 30 Aug 2013 14:03:39 +0000 (19:33 +0530)]
-- webtest fix

11 years agoMerge pull request #1553 from ravishnair/webtest-fix
Kurund Jalmi [Fri, 30 Aug 2013 12:43:43 +0000 (05:43 -0700)]
Merge pull request #1553 from ravishnair/webtest-fix

Webtest fixes

11 years agoMerge pull request #1550 from yashodha/webtest-fixes
Kurund Jalmi [Fri, 30 Aug 2013 11:49:56 +0000 (04:49 -0700)]
Merge pull request #1550 from yashodha/webtest-fixes

Import webtest fix