vcs.fsf.org Git - civicrm-core.git/log

Kurund Jalmi [Fri, 6 Sep 2013 14:28:40 +0000 (07:28 -0700)]

Merge pull request #1609 from colemanw/ops

User friendly search builder operator labels

Kurund Jalmi [Fri, 6 Sep 2013 12:44:14 +0000 (05:44 -0700)]

Merge pull request #1614 from monishdeb/CRM-13323

CRM-13323 fix

monishdeb [Fri, 6 Sep 2013 12:39:53 +0000 (18:09 +0530)]

CRM-13323 fix

----------------------------------------
* CRM-13323: Contribution widgets break when pasted into ckeditor
http://issues.civicrm.org/jira/browse/CRM-13323

commit | commitdiff | tree

Kurund Jalmi [Fri, 6 Sep 2013 09:56:30 +0000 (02:56 -0700)]

Merge pull request #1613 from pratik-joshi/CRM-13336-more-improvements

Crm 13336 more improvements

commit | commitdiff | tree

Pratik Joshi [Fri, 6 Sep 2013 07:27:55 +0000 (12:57 +0530)]

CRM-13336 more improvements : click on printer friendly view (click on top right print icon) should open up view in browser's new tab or window of any civicrm form / page

----------------------------------------
* CRM-13336: remove inline edit from contact summary in print mode
http://issues.civicrm.org/jira/browse/CRM-13336
* CRM-13336-more-improvements:
http://issues.civicrm.org/jira/browse/CRM-13336-more-improvements

commit | commitdiff | tree

Pratik Joshi [Fri, 6 Sep 2013 07:09:14 +0000 (12:39 +0530)]

CRM-13336 more improvements : remove action links on contact summary page while in print mode

----------------------------------------
* CRM-13336: remove inline edit from contact summary in print mode
http://issues.civicrm.org/jira/browse/CRM-13336
* CRM-13336-more-improvements:
http://issues.civicrm.org/jira/browse/CRM-13336-more-improvements

commit | commitdiff | tree

Tim Otten [Thu, 5 Sep 2013 23:12:38 +0000 (16:12 -0700)]

Merge pull request #1611 from eileenmcnaughton/master

another test tweak

commit | commitdiff | tree

Tim Otten [Thu, 5 Sep 2013 21:43:25 +0000 (14:43 -0700)]

Merge pull request #1610 from eileenmcnaughton/master

minor test fixes

Update version to 4.4.beta2

commit | commitdiff | tree

Tim Otten [Thu, 5 Sep 2013 21:03:00 +0000 (14:03 -0700)]

Merge pull request #1608 from totten/master-mailer-hook-cleanup2

CRM_Core_Config - Typo

commit | commitdiff | tree

Tim Otten [Thu, 5 Sep 2013 21:02:30 +0000 (14:02 -0700)]

CRM_Core_Config - Typo

commit | commitdiff | tree

Coleman Watts [Thu, 5 Sep 2013 17:56:11 +0000 (13:56 -0400)]

User friendly search builder operator labels

commit | commitdiff | tree

Tim Otten [Thu, 5 Sep 2013 19:24:40 +0000 (12:24 -0700)]

Merge pull request #1607 from totten/master-mailer-hook-cleanup

CRM-11958 - Cleanup

commit | commitdiff | tree

Tim Otten [Thu, 5 Sep 2013 19:20:36 +0000 (12:20 -0700)]

CRM-11958 - hook_civicrm_alterMailer - Cleanup comments/formatting

----------------------------------------
* CRM-11958: New hook implementation for altering outgoing mail configuration
http://issues.civicrm.org/jira/browse/CRM-11958

commit | commitdiff | tree

Tim Otten [Thu, 5 Sep 2013 19:16:21 +0000 (12:16 -0700)]

CRM-11958 - hook_civicrm_alterMailer - Cleanup hook definition

----------------------------------------
* CRM-11958: New hook implementation for altering outgoing mail configuration
http://issues.civicrm.org/jira/browse/CRM-11958

commit | commitdiff | tree

Kurund Jalmi [Thu, 5 Sep 2013 12:42:41 +0000 (05:42 -0700)]

Merge pull request #1604 from ravishnair/CRM-13327

-- CRM-13327 added event badge formats

commit | commitdiff | tree

Kurund Jalmi [Thu, 5 Sep 2013 12:41:30 +0000 (05:41 -0700)]

Merge pull request #1602 from ravishnair/CRM-13325

-- CRM-13325 added 'data-crm-custom' attribute to "link" custom field

commit | commitdiff | tree

Kurund Jalmi [Thu, 5 Sep 2013 12:41:10 +0000 (05:41 -0700)]

Merge pull request #1603 from pratik-joshi/CRM-13337

CRM-13337

commit | commitdiff | tree

Ravish Nair [Thu, 5 Sep 2013 12:34:23 +0000 (18:04 +0530)]

-- CRM-13327 added event badge formats

----------------------------------------
* CRM-13327: Add support for 3 additional event badge formats AND remove Name Badge labels from Label Formats admin
http://issues.civicrm.org/jira/browse/CRM-13327

commit | commitdiff | tree

Pratik Joshi [Thu, 5 Sep 2013 11:39:15 +0000 (17:09 +0530)]

CRM-13337

----------------------------------------
* CRM-13337: Advanced search: improve form validation
http://issues.civicrm.org/jira/browse/CRM-13337

commit | commitdiff | tree

Ravish Nair [Thu, 5 Sep 2013 10:06:16 +0000 (15:36 +0530)]

-- CRM-13325 added attribute to "link" custom field

----------------------------------------
* CRM-13325: Custom field HTML should indicate group+field name
http://issues.civicrm.org/jira/browse/CRM-13325

commit | commitdiff | tree

Kurund Jalmi [Thu, 5 Sep 2013 09:20:52 +0000 (02:20 -0700)]

Merge pull request #1599 from totten/master-mailer-hook

CRM-11958 - Add hook_civicrm_alterMailer (with unit-test)

commit | commitdiff | tree

Kurund Jalmi [Thu, 5 Sep 2013 09:20:38 +0000 (02:20 -0700)]

Merge pull request #1600 from eileenmcnaughton/master

CRM-13252 attempt to replicate in test, Also add (passing) test on return params

commit | commitdiff | tree

Kurund Jalmi [Thu, 5 Sep 2013 09:20:12 +0000 (02:20 -0700)]

Merge pull request #1601 from pratik-joshi/CRM-13336

CRM-13336 : disable inline edit on contact summary view page while in print mode

commit | commitdiff | tree

Kurund Jalmi [Thu, 5 Sep 2013 09:19:42 +0000 (02:19 -0700)]

Merge pull request #1581 from vivekarora/CRM-13325

CRM-13325 - Added Attributes

CRM-13252 attempt to replicate multiple phone create

commit | commitdiff | tree

Pratik Joshi [Thu, 5 Sep 2013 08:33:12 +0000 (14:03 +0530)]

CRM-13336 : disable inline edit on contact summary view page while in print mode

----------------------------------------
* CRM-13336: remove inline edit from contact summary in print mode
http://issues.civicrm.org/jira/browse/CRM-13336

commit | commitdiff | tree

Kurund Jalmi [Thu, 5 Sep 2013 07:31:16 +0000 (00:31 -0700)]

Merge pull request #1598 from yashodha/CRM-13342

worked on CRM-13342

commit | commitdiff | tree

Tim Otten [Thu, 5 Sep 2013 07:12:11 +0000 (00:12 -0700)]

CRM-11958 - Add hook_civicrm_alterMailer (with unit-test)

----------------------------------------
* CRM-11958: New hook implementation for altering outgoing mail configuration
http://issues.civicrm.org/jira/browse/CRM-11958

rename test class as it turns out deceased contacts ARE returned by default

commit | commitdiff | tree

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.

commit | commitdiff | tree

Chris Burgess [Wed, 4 Sep 2013 22:24:50 +0000 (10:24 +1200)]

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

commit | commitdiff | tree

Xavier Dutoit [Wed, 4 Sep 2013 09:44:49 +0000 (11:44 +0200)]

add error_message on curl error+json_decode error

Merge pull request #1595 from colemanw/master

Fix convertToPseudoNames for CRM-13318

commit | commitdiff | tree

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

commit | commitdiff | tree

Kurund Jalmi [Wed, 4 Sep 2013 17:39:43 +0000 (10:39 -0700)]

Merge pull request #1594 from yashodha/notice-fixes

notice fix

commit | commitdiff | tree

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

commit | commitdiff | tree

Kurund Jalmi [Wed, 4 Sep 2013 17:38:32 +0000 (10:38 -0700)]

Merge pull request #1590 from ravishnair/webtestfix

-- webtest fixes

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

deepak-srivastava [Wed, 4 Sep 2013 12:03:55 +0000 (05:03 -0700)]

Merge pull request #1591 from deepak-srivastava/logs

CRM-13335

commit | commitdiff | tree

Deepak Srivastava [Wed, 4 Sep 2013 12:00:48 +0000 (17:30 +0530)]

commit | commitdiff | tree

Kurund Jalmi [Wed, 4 Sep 2013 11:23:36 +0000 (04:23 -0700)]

Merge pull request #1588 from monishdeb/WebTestFixes

Webtest fix

commit | commitdiff | tree

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

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

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

commit | commitdiff | tree

monishdeb [Wed, 4 Sep 2013 10:47:04 +0000 (16:17 +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

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

commit | commitdiff | tree

Ravish Nair [Wed, 4 Sep 2013 10:06:07 +0000 (15:36 +0530)]

commit | commitdiff | tree

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-...

commit | commitdiff | tree

vivekarora [Wed, 4 Sep 2013 06:43:57 +0000 (12:13 +0530)]

CRM-13325 - Corrected code formatting

----------------------------------------
* CRM-13325: Custom field HTML should indicate group+field name
http://issues.civicrm.org/jira/browse/CRM-13325

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

CRM-13234 make profile.submit transactional

commit | commitdiff | tree

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

CRM-13332 print to error log if eWay hits an error

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

vivekarora [Tue, 3 Sep 2013 13:30:28 +0000 (19:00 +0530)]

CRM-13325 - Added Attribute

----------------------------------------
* CRM-13325: Custom field HTML should indicate group+field name
http://issues.civicrm.org/jira/browse/CRM-13325

commit | commitdiff | tree

Kurund Jalmi [Tue, 3 Sep 2013 12:41:22 +0000 (05:41 -0700)]

Merge pull request #1579 from pratik-joshi/CRM-13324

Crm 13324

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Kurund Jalmi [Tue, 3 Sep 2013 10:41:16 +0000 (03:41 -0700)]

Merge pull request #1578 from monishdeb/CRM-13286

CRM-13286 fix

commit | commitdiff | tree

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

commit | commitdiff | tree

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

export fixes to respect search criteria

commit | commitdiff | tree

Kurund Jalmi [Tue, 3 Sep 2013 09:12:37 +0000 (02:12 -0700)]

Merge pull request #1576 from monishdeb/WebTestFixes

Webtest Fixes

commit | commitdiff | tree

monishdeb [Tue, 3 Sep 2013 09:04:17 +0000 (14:34 +0530)]

commit | commitdiff | tree

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

commit | commitdiff | tree

monishdeb [Tue, 3 Sep 2013 07:32:47 +0000 (13:02 +0530)]

CRM testfixes related to Report

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

Deepak Srivastava [Mon, 2 Sep 2013 14:10:51 +0000 (19:40 +0530)]

CRM-12490 - test fixes

commit | commitdiff | tree

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

commit | commitdiff | tree

vivekarora [Mon, 2 Sep 2013 13:45:44 +0000 (19:15 +0530)]

commit | commitdiff | tree

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

fixed target contact import (CRM-13315)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Deepak Srivastava [Mon, 2 Sep 2013 09:39:31 +0000 (15:09 +0530)]

CRM-12490 - order-by fatal error fix

Merge pull request #1567 from colemanw/master

Fix faulty contact tests

commit | commitdiff | tree

Coleman Watts [Sun, 1 Sep 2013 21:51:02 +0000 (17:51 -0400)]

Fix faulty contact tests

Merge pull request #1566 from colemanw/master

Fix return defaults CRM-13318

commit | commitdiff | tree

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