eileen [Tue, 3 Sep 2013 23:35:09 +0000 (11:35 +1200)]
CRM-9493 - improve performance on group contact cache build (fixed & re-submitted)
Kurund Jalmi [Tue, 3 Sep 2013 12:41:22 +0000 (05:41 -0700)]
Merge pull request #1579 from pratik-joshi/CRM-13324
Crm 13324
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
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
Kurund Jalmi [Tue, 3 Sep 2013 10:41:16 +0000 (03:41 -0700)]
Merge pull request #1578 from monishdeb/CRM-13286
CRM-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
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
kurund [Tue, 3 Sep 2013 09:31:49 +0000 (15:01 +0530)]
export fixes to respect search criteria
Kurund Jalmi [Tue, 3 Sep 2013 09:12:37 +0000 (02:12 -0700)]
Merge pull request #1576 from monishdeb/WebTestFixes
Webtest Fixes
monishdeb [Tue, 3 Sep 2013 09:04:17 +0000 (14:34 +0530)]
Webtest Fixes
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
monishdeb [Tue, 3 Sep 2013 07:32:47 +0000 (13:02 +0530)]
CRM testfixes related to Report
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
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
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
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
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
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)
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
Deepak Srivastava [Mon, 2 Sep 2013 14:10:51 +0000 (19:40 +0530)]
CRM-12490 - test fixes
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
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
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
yashodha [Mon, 2 Sep 2013 11:48:18 +0000 (17:18 +0530)]
fixed target contact import (CRM-13315)
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
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
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
Deepak Srivastava [Mon, 2 Sep 2013 09:39:31 +0000 (15:09 +0530)]
CRM-12490 - order-by fatal error fix
colemanw [Sun, 1 Sep 2013 21:52:51 +0000 (14:52 -0700)]
Merge pull request #1567 from colemanw/master
Fix faulty contact tests
Coleman Watts [Sun, 1 Sep 2013 21:51:02 +0000 (17:51 -0400)]
Fix faulty contact tests
colemanw [Sun, 1 Sep 2013 17:28:53 +0000 (10:28 -0700)]
Merge pull request #1566 from colemanw/master
Fix 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
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
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
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
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
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
Tim Otten [Sun, 1 Sep 2013 01:06:03 +0000 (18:06 -0700)]
CRM_Core_BAO_CustomField - Format
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
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
Coleman Watts [Sat, 31 Aug 2013 22:23:42 +0000 (18:23 -0400)]
Cleanup - remove unused search code
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
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
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
Tim Otten [Sat, 31 Aug 2013 06:15:48 +0000 (23:15 -0700)]
CRM-13187 - WordReplacement API - Cut down unnecessary rebuilds
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
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 ...
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...
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
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
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
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
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
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
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
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.
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
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
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
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
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
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"
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.
Kurund Jalmi [Fri, 30 Aug 2013 18:39:41 +0000 (11:39 -0700)]
Merge pull request #1554 from ravishnair/webtest-fix
-- webtest fix
Ravish Nair [Fri, 30 Aug 2013 14:03:39 +0000 (19:33 +0530)]
-- 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
Kurund Jalmi [Fri, 30 Aug 2013 11:49:56 +0000 (04:49 -0700)]
Merge pull request #1550 from yashodha/webtest-fixes
Import webtest fix
Kurund Jalmi [Fri, 30 Aug 2013 11:46:53 +0000 (04:46 -0700)]
Merge pull request #1552 from kurund/CRM-12638
CRM-12638, prev/next optimization issues
kurund [Fri, 30 Aug 2013 11:45:58 +0000 (17:15 +0530)]
CRM-12638, fatal error fixes due to
66ceb5d9
----------------------------------------
* CRM-12638: Optimize Prev/Next Cache and search interaction
http://issues.civicrm.org/jira/browse/CRM-12638
Ravish Nair [Fri, 30 Aug 2013 11:28:13 +0000 (16:58 +0530)]
-- petition webtest fix
kurund [Fri, 30 Aug 2013 11:19:45 +0000 (16:49 +0530)]
code cleanup
kurund [Fri, 30 Aug 2013 11:19:07 +0000 (16:49 +0530)]
code cleanup
Ravish Nair [Fri, 30 Aug 2013 11:11:33 +0000 (16:41 +0530)]
-- webtest fix
deepak-srivastava [Fri, 30 Aug 2013 10:15:34 +0000 (03:15 -0700)]
Merge pull request #1551 from deepak-srivastava/master
CRM-12399, remove twilio ext from core.
Deepak Srivastava [Fri, 30 Aug 2013 10:13:17 +0000 (15:43 +0530)]
CRM-12399, remove twilio ext from core.
Kurund Jalmi [Fri, 30 Aug 2013 10:06:14 +0000 (03:06 -0700)]
Merge pull request #1549 from pratik-joshi/crm-mailing-boa-query-test-fixes
added civicrm_mailing_recipients entries
yashodha [Fri, 30 Aug 2013 10:04:36 +0000 (15:34 +0530)]
Import webbtest fix
Kurund Jalmi [Fri, 30 Aug 2013 09:16:57 +0000 (02:16 -0700)]
Merge pull request #1546 from yashodha/webtest-fixes
fix webtest
Kurund Jalmi [Fri, 30 Aug 2013 09:12:17 +0000 (02:12 -0700)]
Merge pull request #1548 from kurund/CRM-13066
CRM-13066, move alter to php from template
kurund [Fri, 30 Aug 2013 08:58:31 +0000 (14:28 +0530)]
CRM-13066, move alter to php from template
----------------------------------------
* CRM-13066: 'Clean up Caches' deletes in progress batches
http://issues.civicrm.org/jira/browse/CRM-13066
Pratik Joshi [Fri, 30 Aug 2013 08:58:24 +0000 (14:28 +0530)]
added civicrm_mailing_recipients entries
Kurund Jalmi [Fri, 30 Aug 2013 08:53:19 +0000 (01:53 -0700)]
Merge pull request #1545 from kurund/CRM-13066
CRM-13066, move data from civicrm_cache to civicrm_batch during upgrade
Kurund Jalmi [Fri, 30 Aug 2013 08:41:12 +0000 (01:41 -0700)]
Merge pull request #1547 from kurund/CRM-9493
Revert "Merge pull request #1544 from eileenmcnaughton/master"
kurund [Fri, 30 Aug 2013 08:39:49 +0000 (14:09 +0530)]
Revert "Merge pull request #1544 from eileenmcnaughton/master"
This reverts commit
008240e2a4a0a3957d58c891604656a679fbf0c6, reversing
changes made to
f1951871b75764859fd45e23aff8933bf955de36.
yashodha [Fri, 30 Aug 2013 06:31:33 +0000 (12:01 +0530)]
fix webtest
kurund [Fri, 30 Aug 2013 06:21:56 +0000 (11:51 +0530)]
CRM-13066, minor cleanup
----------------------------------------
* CRM-13066: 'Clean up Caches' deletes in progress batches
http://issues.civicrm.org/jira/browse/CRM-13066
eileen [Fri, 30 Aug 2013 06:20:07 +0000 (18:20 +1200)]
CRM-13296 membership api enotice fix & tests
kurund [Fri, 30 Aug 2013 06:20:01 +0000 (11:50 +0530)]
CRM-13066, move data from civicrm_cache to civicrm_batch table
----------------------------------------
* CRM-13066: 'Clean up Caches' deletes in progress batches
http://issues.civicrm.org/jira/browse/CRM-13066
eileen [Fri, 30 Aug 2013 05:25:26 +0000 (17:25 +1200)]
CRM-13296 button changes per Dave'd advice
eileen [Fri, 30 Aug 2013 05:21:00 +0000 (17:21 +1200)]
CRM-13296 fix action text
eileen [Fri, 30 Aug 2013 05:09:48 +0000 (17:09 +1200)]
CRM-13296 fix enotice
eileen [Fri, 30 Aug 2013 05:05:22 +0000 (17:05 +1200)]
Merge branch 'master' of https://github.com/civicrm/civicrm-core into labels
Kurund Jalmi [Fri, 30 Aug 2013 04:37:11 +0000 (21:37 -0700)]
Merge pull request #1544 from eileenmcnaughton/master
CRM-9493 - fix for group contact cache hanging.
eileen [Thu, 29 Aug 2013 05:29:33 +0000 (17:29 +1200)]
changes to group contact cache behaviour that worked on AUG to fix performance bottleneck
Conflicts:
CRM/Contact/BAO/GroupContactCache.php
eileen [Fri, 30 Aug 2013 02:20:33 +0000 (14:20 +1200)]
CRM-13234 make profile.submit transactional
Dave Greenberg [Thu, 29 Aug 2013 22:08:40 +0000 (15:08 -0700)]
Merge pull request #1543 from kurund/CRM-13066
CRM-13066, cache batch entry data in civicrm_batch table in "data" column
Pratik Joshi [Thu, 29 Aug 2013 15:14:16 +0000 (20:44 +0530)]
CRM-13276 fix
kurund [Thu, 29 Aug 2013 13:43:26 +0000 (19:13 +0530)]
CRM-13066, code cleanup
----------------------------------------
* CRM-13066: 'Clean up Caches' deletes in progress batches
http://issues.civicrm.org/jira/browse/CRM-13066
Kurund Jalmi [Thu, 29 Aug 2013 13:36:24 +0000 (06:36 -0700)]
Merge pull request #1542 from monishdeb/CRM-13292
CRM-13292 fix
kurund [Thu, 29 Aug 2013 13:35:08 +0000 (19:05 +0530)]
CRM-13066, code cleanup
----------------------------------------
* CRM-13066: 'Clean up Caches' deletes in progress batches
http://issues.civicrm.org/jira/browse/CRM-13066