civicrm-core.git
8 years agoMerge pull request #7654 from yashodha/contributors-update
Yashodha Chaku [Mon, 25 Jan 2016 13:13:39 +0000 (18:43 +0530)]
Merge pull request #7654 from yashodha/contributors-update

update contributor list from github

8 years agoupdate contributor list from github
yashodha [Mon, 25 Jan 2016 09:26:10 +0000 (14:56 +0530)]
update contributor list from github

8 years agoMerge pull request #7603 from jitendrapurohit/CRM-17810
Monish Deb [Mon, 25 Jan 2016 09:11:20 +0000 (14:41 +0530)]
Merge pull request #7603 from jitendrapurohit/CRM-17810

CRM-17810 Add pager to custom data tab

8 years agoMerge pull request #7636 from jitendrapurohit/CRM-17839
Yashodha Chaku [Mon, 25 Jan 2016 05:33:45 +0000 (11:03 +0530)]
Merge pull request #7636 from jitendrapurohit/CRM-17839

CRM-17839 -- unable to edit custom data in tab if inline set already …

8 years agoMerge pull request #7649 from eileenmcnaughton/CRM-17350
Eileen McNaughton [Mon, 25 Jan 2016 05:02:38 +0000 (18:02 +1300)]
Merge pull request #7649 from eileenmcnaughton/CRM-17350

CRM-17350 - Allowing editing of tags by ACL

8 years agoCRM-17350 add unit test for tag api create permission
eileenmcnaughton [Mon, 25 Jan 2016 01:08:06 +0000 (01:08 +0000)]
CRM-17350 add unit test for tag api create permission

8 years agoCRM-17350 fix previous entity acl fix to make check_permissions optional
eileenmcnaughton [Mon, 25 Jan 2016 03:13:02 +0000 (03:13 +0000)]
CRM-17350 fix previous entity acl fix to make check_permissions optional

8 years agoCRM-17350 - Allowing editing of tags when you don't have 'edit all contacts' permission
Jon goldberg [Fri, 9 Oct 2015 01:21:58 +0000 (21:21 -0400)]
CRM-17350 - Allowing editing of tags when you don't have 'edit all contacts' permission

Conflicts:
CRM/Core/DAO/permissions.php

8 years agoMerge pull request #7650 from eileenmcnaughton/tests
Eileen McNaughton [Mon, 25 Jan 2016 02:55:37 +0000 (15:55 +1300)]
Merge pull request #7650 from eileenmcnaughton/tests

CRM-17350 preliminary test clean up for entity-tag acl permission fix

8 years agoMerge pull request #7647 from colemanw/CRM-17645
colemanw [Mon, 25 Jan 2016 02:24:06 +0000 (21:24 -0500)]
Merge pull request #7647 from colemanw/CRM-17645

CRM-17645 - Tests and better joins for selectWhereClause

8 years agoCRM-17350 preliminary test clean up for entity-tag acl permission fix
eileenmcnaughton [Mon, 25 Jan 2016 02:20:00 +0000 (02:20 +0000)]
CRM-17350 preliminary test clean up for entity-tag acl permission fix

8 years agoCRM-17645 - Tests and better joins for selectWhereClause
Coleman Watts [Sun, 24 Jan 2016 22:12:48 +0000 (17:12 -0500)]
CRM-17645 - Tests and better joins for selectWhereClause

8 years agoMerge pull request #7643 from lcdservices/CRM-17865
Eileen McNaughton [Sun, 24 Jan 2016 20:53:19 +0000 (09:53 +1300)]
Merge pull request #7643 from lcdservices/CRM-17865

CRM-17865: set participant custom field defaults on additional reg form

8 years agoMerge pull request #7646 from joshgowans/patch-1
Eileen McNaughton [Sun, 24 Jan 2016 20:52:53 +0000 (09:52 +1300)]
Merge pull request #7646 from joshgowans/patch-1

Update success.tpl

8 years agoUpdate success.tpl
joshgowans [Sun, 24 Jan 2016 17:29:16 +0000 (10:29 -0700)]
Update success.tpl

Looks like the upgrade message was already changed to reflect 4.7. Made a few very minor updates in the message.

8 years agoMerge pull request #7640 from eileenmcnaughton/lybunt
Eileen McNaughton [Sat, 23 Jan 2016 21:28:47 +0000 (10:28 +1300)]
Merge pull request #7640 from eileenmcnaughton/lybunt

CRM-17837 Improve Lybunt report. …

8 years agoCRM-17865: set participant custom field defaults on additional reg form
Brian Shaughnessy [Sat, 23 Jan 2016 19:37:13 +0000 (14:37 -0500)]
CRM-17865: set participant custom field defaults on additional reg form

8 years agoMerge pull request #7639 from colemanw/CRM-17857
colemanw [Sat, 23 Jan 2016 17:14:12 +0000 (12:14 -0500)]
Merge pull request #7639 from colemanw/CRM-17857

CRM-17857 - Update api explorer to exclude participant joins

8 years agoCRM-17837 Improve Lybunt report.
eileen [Tue, 19 Jan 2016 18:56:21 +0000 (07:56 +1300)]
CRM-17837 Improve Lybunt report.

Add tests for lynbunt results, get custom data working for contacts in it, remove non-working address group bys,
fix query to be more efficient on a large dataset

8 years agoCRM-17857 - Update api explorer to exclude participant joins
Coleman Watts [Sat, 23 Jan 2016 03:23:25 +0000 (22:23 -0500)]
CRM-17857 - Update api explorer to exclude participant joins

8 years agoMerge pull request #7635 from jitendrapurohit/CRM-17844
Yashodha Chaku [Fri, 22 Jan 2016 14:33:46 +0000 (20:03 +0530)]
Merge pull request #7635 from jitendrapurohit/CRM-17844

CRM-17844 -- Registering 'as someone else' still affects logged-in user

8 years agoMerge pull request #7619 from joeyisking/Adding_class_2_text_field
Yashodha Chaku [Fri, 22 Jan 2016 14:14:38 +0000 (19:44 +0530)]
Merge pull request #7619 from joeyisking/Adding_class_2_text_field

CRM-17840 - Can't see outline of Full-text Search text field

8 years agoMerge pull request #7633 from jitendrapurohit/caseupgrade
Monish Deb [Fri, 22 Jan 2016 13:15:49 +0000 (18:45 +0530)]
Merge pull request #7633 from jitendrapurohit/caseupgrade

DB Error on enabling case component after multilingual upgrade to 4.7

8 years agoCRM-17844 -- Registering 'as someone else' still affects logged-in user
jitendrapurohit [Fri, 22 Jan 2016 10:38:26 +0000 (16:08 +0530)]
CRM-17844 -- Registering 'as someone else' still affects logged-in user

8 years agoMerge pull request #7634 from yashodha/CRM-17796
Yashodha Chaku [Fri, 22 Jan 2016 10:00:56 +0000 (15:30 +0530)]
Merge pull request #7634 from yashodha/CRM-17796

CRM-17796: profile search limit by group doesn't use the correct ID

8 years agoCRM-17796: profile search limit by group doesn't use the correct ID
yashodha [Fri, 22 Jan 2016 06:56:48 +0000 (12:26 +0530)]
CRM-17796: profile search limit by group doesn't use the correct ID

----------------------------------------
* CRM-17796: profile search limit by group doesn't use the correct ID
  https://issues.civicrm.org/jira/browse/CRM-17796

8 years agoCRM-17839 -- unable to edit custom data in tab if inline set already exists
jitendrapurohit [Fri, 22 Jan 2016 06:18:23 +0000 (11:48 +0530)]
CRM-17839 -- unable to edit custom data in tab if inline set already exists

8 years agoadditiopnal fix
jitendrapurohit [Fri, 22 Jan 2016 05:30:08 +0000 (11:00 +0530)]
additiopnal fix

8 years agoDB Error on enabling case component after multilingual upgrade to 4.7
jitendrapurohit [Tue, 22 Dec 2015 12:26:42 +0000 (17:56 +0530)]
DB Error on enabling case component after multilingual upgrade to 4.7

8 years agoCRM-17837 / CRM-17680 fix core Lybunt to sort by the sort field (and add last year...
eileen [Mon, 7 Dec 2015 09:45:07 +0000 (22:45 +1300)]
CRM-17837 / CRM-17680 fix core Lybunt to sort by the sort field (and add last year field to the list)

Bug: T119911

Change-Id: I0dd1ce2375b9aeb66368fc6f2ced650dde039b64

8 years agoMerge pull request #7631 from eileenmcnaughton/CRM-17837
Eileen McNaughton [Fri, 22 Jan 2016 03:14:41 +0000 (16:14 +1300)]
Merge pull request #7631 from eileenmcnaughton/CRM-17837

CRM-17837 report improvements (Lybunt & general)

8 years agoCRM-17837 Add communication preference fields to standard available contact info
eileen [Fri, 22 Jan 2016 02:12:49 +0000 (15:12 +1300)]
CRM-17837 Add communication preference fields to standard available contact info

Change-Id: Ic97e906b9f2513c6e87564fc3c1a222afa25f091

8 years agoAdd additional of customFieldTableJoins to be calculated for filters separately to...
eileen [Fri, 22 Jan 2016 02:10:38 +0000 (15:10 +1300)]
Add additional of customFieldTableJoins to be calculated for filters separately to select queries

This means that if the report runs 2 queries, one to get the filtered list of subjects and a second to render the appropriate fields for them the first query (likely to be bigger) can avoid joining in tables that are only used for rendering results

Change-Id: Iee0078054abe8b5e63435e66f9215fc2fd9cd62f

Change-Id: Ic4e9ed36cf1a186aeeb1c44d59661e8971612022

8 years agoMerge pull request #7630 from julialongtin/master
colemanw [Fri, 22 Jan 2016 02:21:39 +0000 (21:21 -0500)]
Merge pull request #7630 from julialongtin/master

Work around infinite memory consumption bug. CRM-17853

8 years agoCRM-17837 don't show linkable fields as links if the base url is not passed in.
eileen [Fri, 22 Jan 2016 02:08:03 +0000 (15:08 +1300)]
CRM-17837 don't show linkable fields as links if the base url is not passed in.

On some reports it may not be appropriate to have linkable urls. This currently applies to the lybunt - as the link is going through to the contribute/detail report which doesn't take the same filters - although making it self-linking might make sense this seems like a logical change to the parent function

Change-Id: I969c92755cb053181a53acb5d829d6d9a0554e06

p

Change-Id: I267409dced4602b028baa9c3beeaf8be70a712c3

8 years agoCRM-17837 move summary columns to the right hand side when using rollup.
eileen [Fri, 22 Jan 2016 02:04:22 +0000 (15:04 +1300)]
CRM-17837 move summary columns to the right hand side when using rollup.

Basically it just looks 'odd' to have calculated summary columns and then have custom fields to the right of them in a report

Change-Id: If46675141028bf362c3b3c2b509d9cd30fb25651

8 years agoCRM-17645 - Call hook for cases
Coleman Watts [Fri, 22 Jan 2016 00:33:47 +0000 (19:33 -0500)]
CRM-17645 - Call hook for cases

8 years agoMerge pull request #7629 from colemanw/CRM-17645
colemanw [Thu, 21 Jan 2016 22:45:43 +0000 (17:45 -0500)]
Merge pull request #7629 from colemanw/CRM-17645

CRM-17645 - Declare permissions for CaseType api

8 years agoWork around infinite memory consumption bug. CRM-17853
Julia Longtin [Thu, 21 Jan 2016 22:18:33 +0000 (22:18 +0000)]
Work around infinite memory consumption bug. CRM-17853

When handling an Unhandled exception, the default error handler path uses debug_var to handle outputting debug information. When calling debug_var, no print argument is passed. Without a print argument, debug_var uses print_r to dump a passed in variable's contents. This consumes all memory, and leads to a crash (500). passing a different option to debug_var works around the issue.

8 years agoPermissions code cleanup
Coleman Watts [Thu, 21 Jan 2016 22:01:49 +0000 (17:01 -0500)]
Permissions code cleanup

8 years agoCRM-17645 - Support either 'access my' or 'access all' cases in api permissions
Coleman Watts [Thu, 21 Jan 2016 20:34:57 +0000 (15:34 -0500)]
CRM-17645 - Support either 'access my' or 'access all' cases in api permissions

8 years agoCRM-17645 - Declare permissions for CaseType api
Coleman Watts [Thu, 21 Jan 2016 20:26:59 +0000 (15:26 -0500)]
CRM-17645 - Declare permissions for CaseType api

8 years agoUpdate version to 4.7.0
CiviCRM [Thu, 21 Jan 2016 12:28:23 +0000 (04:28 -0800)]
Update version to 4.7.0

8 years agoMerge pull request #7627 from yashodha/version-fix
Yashodha Chaku [Thu, 21 Jan 2016 09:08:48 +0000 (14:38 +0530)]
Merge pull request #7627 from yashodha/version-fix

Update version to 4.7.beta8

8 years agoUpdate version to 4.7.beta8
yashodha [Thu, 21 Jan 2016 07:56:57 +0000 (13:26 +0530)]
Update version to 4.7.beta8

8 years agoMerge pull request #7622 from totten/master-api-setting-default-c
Eileen McNaughton [Thu, 21 Jan 2016 04:58:03 +0000 (17:58 +1300)]
Merge pull request #7622 from totten/master-api-setting-default-c

CRM-17830 - Setting Form - Remove redundant default check

8 years agoMerge pull request #7583 from JMAConsulting/CRM-16259-6
Eileen McNaughton [Thu, 21 Jan 2016 04:56:46 +0000 (17:56 +1300)]
Merge pull request #7583 from JMAConsulting/CRM-16259-6

 CRM-16259, added payment api

8 years agoMerge pull request #7623 from eileenmcnaughton/CRM-17850
Eileen McNaughton [Thu, 21 Jan 2016 03:23:22 +0000 (16:23 +1300)]
Merge pull request #7623 from eileenmcnaughton/CRM-17850

CRM-17850 allow payment processors to control which recurring fields can be edited

8 years agoCRM-17645 - Prevent adding case acl clause inappropriately
Coleman Watts [Thu, 21 Jan 2016 02:50:34 +0000 (21:50 -0500)]
CRM-17645 - Prevent adding case acl clause inappropriately

8 years agoMerge pull request #7624 from totten/master-phpunit
Tim Otten [Thu, 21 Jan 2016 02:08:58 +0000 (18:08 -0800)]
Merge pull request #7624 from totten/master-phpunit

tools/scripts/phpunit - Delegate to `phpunit` from `PATH`

8 years agoCRM-17645 - Ensure utils file is included
Coleman Watts [Thu, 21 Jan 2016 02:08:30 +0000 (21:08 -0500)]
CRM-17645 - Ensure utils file is included

8 years agoCRM-17850 cleanup based on feedback
eileenmcnaughton [Thu, 21 Jan 2016 02:04:37 +0000 (02:04 +0000)]
CRM-17850 cleanup based on feedback

8 years agoCRM-17850 implement getEditableRecurringScheduleFields for Dummy processor
eileenmcnaughton [Thu, 21 Jan 2016 02:00:13 +0000 (02:00 +0000)]
CRM-17850 implement getEditableRecurringScheduleFields for Dummy processor

This is purely to give visibility of the option to enable appropriate fields for editing

8 years agoCRM-17850 Allow payment processors to determine which edit fields are exposed
eileenmcnaughton [Thu, 21 Jan 2016 01:02:18 +0000 (01:02 +0000)]
CRM-17850 Allow payment processors to determine which edit fields are exposed

8 years agophpunit.xml.dist - Update test suites
Tim Otten [Thu, 21 Jan 2016 01:29:15 +0000 (17:29 -0800)]
phpunit.xml.dist - Update test suites

Not sure how this is different, but it seems more accurate.

8 years agotools/scripts/phpunit - Delegate to `phpunit` from `PATH`
Tim Otten [Thu, 21 Jan 2016 01:27:40 +0000 (17:27 -0800)]
tools/scripts/phpunit - Delegate to `phpunit` from `PATH`

Embedding a copy of PHPUnit within CiviCRM makes it really confusing when testing
extensions. For example, if an extension author tries to use `phpunit` directly, he'll
conflicts between his copy and the embedded copy.

The work-around has been to *always* use the embedded copy, but this is still confusing
because bootstrapping becomes complicated.

The goal here is to remove Civi's embedded copy of PHPUnit to avoid conflicts.

To preserve compatibility with existing test-documentation and test-scripts
(Jenkins), we leave behind a stub script in `tools/scripts/phpunit`.

8 years agoCRM-17830 - Setting Form - Remove redundant default check
Tim Otten [Wed, 20 Jan 2016 23:49:05 +0000 (15:49 -0800)]
CRM-17830 - Setting Form - Remove redundant default check

Default values should already be merged within SettingsBag (which sits
under-the-hood, beneath Setting::getItem and Setting API). Don't see why
we need to explicitly check default in this form.

8 years agoMerge pull request #7474 from JMAConsulting/CRM-16259-3
Tim Otten [Wed, 20 Jan 2016 23:06:54 +0000 (15:06 -0800)]
Merge pull request #7474 from JMAConsulting/CRM-16259-3

--CRM-16259, added function to allocate line item proportinally

8 years agoUse better function for retrieving payment processor for recurring
eileenmcnaughton [Wed, 20 Jan 2016 22:21:33 +0000 (22:21 +0000)]
Use better function for retrieving payment processor for recurring

8 years agoUpdated class to use crm-form-text
Joseph Martin [Wed, 20 Jan 2016 22:19:47 +0000 (09:19 +1100)]
Updated class to use crm-form-text

8 years agoCRM-16259, round off of amount
Pradeep Nayak [Wed, 20 Jan 2016 21:34:09 +0000 (03:04 +0530)]
CRM-16259, round off of amount

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years agoCRM-16259, fixed jenkins Checkstyle Warnings
Pradeep Nayak [Thu, 14 Jan 2016 09:44:55 +0000 (15:14 +0530)]
CRM-16259, fixed jenkins Checkstyle Warnings

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years agoCRM-16259, fixed unit test
Pradeep Nayak [Thu, 14 Jan 2016 09:37:03 +0000 (15:07 +0530)]
CRM-16259, fixed unit test

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years ago-- CRM-16259, added unit test for assignProportionalLineItems()
Pradeep Nayak [Tue, 12 Jan 2016 12:10:07 +0000 (17:40 +0530)]
-- CRM-16259, added unit test for assignProportionalLineItems()

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years agoCRM-16259, used api calling instead save()
Pradeep Nayak [Tue, 12 Jan 2016 11:03:45 +0000 (16:33 +0530)]
CRM-16259, used api calling instead save()

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years ago--CRM-16259, removed white space
Pradeep Nayak [Fri, 18 Dec 2015 14:10:09 +0000 (19:40 +0530)]
--CRM-16259, removed white space

8 years ago--CRM-16259, added function to allocate line item proportinally
Pradeep Nayak [Wed, 16 Dec 2015 13:49:52 +0000 (19:19 +0530)]
--CRM-16259, added function to allocate line item proportinally

8 years agoCRM-16259, removed cruft code
Pradeep Nayak [Wed, 20 Jan 2016 21:03:37 +0000 (02:33 +0530)]
CRM-16259, removed cruft code

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years agoCRM-16259, added api test for update action
Pradeep Nayak [Wed, 20 Jan 2016 20:50:21 +0000 (02:20 +0530)]
CRM-16259, added api test for update action

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years agoCRM-16259, removed cruft code
Pradeep Nayak [Wed, 20 Jan 2016 20:04:08 +0000 (01:34 +0530)]
CRM-16259, removed cruft code

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years agoCRM-16259, removed extra space
Pradeep Nayak [Wed, 20 Jan 2016 14:23:45 +0000 (19:53 +0530)]
CRM-16259, removed extra space

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years ago--CRM-16259, updated test for testCreatePaymentLineItems
Pradeep Nayak [Wed, 20 Jan 2016 14:10:46 +0000 (19:40 +0530)]
--CRM-16259, updated test for testCreatePaymentLineItems

8 years ago--CRM-16259, added more assert rules
Pradeep Nayak [Wed, 20 Jan 2016 12:53:59 +0000 (18:23 +0530)]
--CRM-16259, added more assert rules

8 years ago--CRM-16259, updated api test for get action
Pradeep Nayak [Wed, 20 Jan 2016 12:28:50 +0000 (17:58 +0530)]
--CRM-16259, updated api test for get action

8 years agoCRM-16259, update api test for create action
Pradeep Nayak [Wed, 20 Jan 2016 12:23:32 +0000 (17:53 +0530)]
CRM-16259, update api test for create action

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years agoCRM-16259, added api test for delete action
Pradeep Nayak [Wed, 20 Jan 2016 11:13:29 +0000 (16:43 +0530)]
CRM-16259, added api test for delete action

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years agoUpdate version to 4.7.0
CiviCRM [Wed, 20 Jan 2016 11:12:46 +0000 (03:12 -0800)]
Update version to 4.7.0

8 years agoCRM-16259, ignore foreach iteration when financial trxn id is null in api result
Pradeep Nayak [Wed, 20 Jan 2016 11:12:37 +0000 (16:42 +0530)]
CRM-16259, ignore foreach iteration when financial trxn id is null in api result

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years agoCRM-16259, fixed Jenkins style check error
Pradeep Nayak [Wed, 20 Jan 2016 11:08:25 +0000 (16:38 +0530)]
CRM-16259, fixed Jenkins style check error

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years agouse rowCallback
jitendrapurohit [Wed, 20 Jan 2016 10:49:08 +0000 (16:19 +0530)]
use rowCallback

8 years agoCRM-16259, get particiant id if contribution is related to event
Pradeep Nayak [Wed, 20 Jan 2016 10:41:03 +0000 (16:11 +0530)]
CRM-16259, get particiant id if contribution is related to event

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years agoCRM-16259, added api test for cancel action
Pradeep Nayak [Wed, 20 Jan 2016 10:37:08 +0000 (16:07 +0530)]
CRM-16259, added api test for cancel action

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years ago--CRM-16259, added comment block
Pradeep Nayak [Wed, 20 Jan 2016 10:22:58 +0000 (15:52 +0530)]
--CRM-16259, added comment block

8 years agoCRM-16259, fixed notice error
Pradeep Nayak [Wed, 20 Jan 2016 09:10:16 +0000 (14:40 +0530)]
CRM-16259, fixed notice error

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years agoMerge pull request #7604 from rohankatkar/17815
Monish Deb [Wed, 20 Jan 2016 06:14:09 +0000 (11:44 +0530)]
Merge pull request #7604 from rohankatkar/17815

CRM-17815 fix

8 years agoMinor changes
Web Access [Wed, 20 Jan 2016 05:47:23 +0000 (11:17 +0530)]
Minor changes

8 years agoAdditional fix for CRM-17815 and alignment fixes
Web Access [Tue, 19 Jan 2016 12:58:57 +0000 (18:28 +0530)]
Additional fix for CRM-17815 and alignment fixes

8 years agoCRM-17815 fix
Web Access [Fri, 15 Jan 2016 09:40:53 +0000 (15:10 +0530)]
CRM-17815 fix

8 years agoCRM-17840 - Can't see outline of Full-text Search text field
Joseph Martin [Wed, 20 Jan 2016 05:09:18 +0000 (16:09 +1100)]
CRM-17840 - Can't see outline of Full-text Search text field

8 years agoMerge pull request #7618 from eileenmcnaughton/CRM-17837
Eileen McNaughton [Wed, 20 Jan 2016 02:50:02 +0000 (15:50 +1300)]
Merge pull request #7618 from eileenmcnaughton/CRM-17837

CRM-17837 Report class, various minor tweaks to support increasing te…

8 years agoCRM-17837 Report class, various minor tweaks to support increasing test coverage
eileen [Tue, 19 Jan 2016 21:33:18 +0000 (10:33 +1300)]
CRM-17837 Report class, various minor tweaks to support increasing test coverage

8 years agoMerge pull request #7617 from eileenmcnaughton/CRM-17837
Eileen McNaughton [Tue, 19 Jan 2016 23:20:01 +0000 (12:20 +1300)]
Merge pull request #7617 from eileenmcnaughton/CRM-17837

CRM-17837 Report class pager function, test/ api access fix

8 years agoMerge pull request #7615 from colemanw/CRM-17429
colemanw [Tue, 19 Jan 2016 21:48:15 +0000 (16:48 -0500)]
Merge pull request #7615 from colemanw/CRM-17429

CRM-17429 - Disable google checkout payment processors

8 years agoReport class, add ts to untranslated string
eileen [Tue, 19 Jan 2016 21:33:18 +0000 (10:33 +1300)]
Report class, add ts to untranslated string

Change-Id: I4c63afabd9d3d0f7c31a07dae4b91f660b8b7466

8 years agoCRM-17837 Report class pager function, test/ api access fix.
eileen [Tue, 19 Jan 2016 21:32:15 +0000 (10:32 +1300)]
CRM-17837 Report class pager function, test/ api access fix.

This minor patch just checks if the get function is callable before calling it. It allows the api calls to not fatal.
The api calls are primarily used in the unit tests at this stage although the original intent was about more flexible charting by retrieving
the data from an api & passing it to 'any' charting library

Change-Id: I8b3e4e9ade3f75ce8bc6e608cb3c7c6e60d127b9

8 years agoMerge pull request #7616 from eileenmcnaughton/CRM-17837
Eileen McNaughton [Tue, 19 Jan 2016 21:06:05 +0000 (10:06 +1300)]
Merge pull request #7616 from eileenmcnaughton/CRM-17837

CRM-17837 store rollup result grand total on the class rather than di…

8 years agoCRM-17837 store rollup result grand total on the class rather than discarding it
eileen [Tue, 19 Jan 2016 19:47:59 +0000 (08:47 +1300)]
CRM-17837 store rollup result grand total on the class rather than discarding it

This makes it available for re-use in the statistics

8 years agoCRM-17429 - Disable google checkout payment processors
Coleman Watts [Tue, 19 Jan 2016 19:34:10 +0000 (14:34 -0500)]
CRM-17429 - Disable google checkout payment processors

8 years agoMerge pull request #7612 from colemanw/CRM-17429
colemanw [Tue, 19 Jan 2016 16:29:34 +0000 (11:29 -0500)]
Merge pull request #7612 from colemanw/CRM-17429

CRM-17429 - Remove Google Checkout payment processor

8 years agomove aaSorting to markup and few fixes
jitendrapurohit [Tue, 19 Jan 2016 11:18:13 +0000 (16:48 +0530)]
move aaSorting to markup and few fixes