civicrm-core.git
7 years agoExtension.download API - Allow downloading without installing
Tim Otten [Sat, 25 Feb 2017 02:12:51 +0000 (19:12 -0700)]
Extension.download API - Allow downloading without installing

The current `download` action does both download and install. This option
preserves the default behavior but allows one to opt-out of installation.

7 years agoMerge pull request #9894 from JKingsnorth/CRM-20175
colemanw [Fri, 24 Feb 2017 17:53:14 +0000 (12:53 -0500)]
Merge pull request #9894 from JKingsnorth/CRM-20175

CRM-20175 Increase pager support

7 years agoCRM-20175 Increase pager support
JKingsnorth [Fri, 24 Feb 2017 11:58:07 +0000 (11:58 +0000)]
CRM-20175 Increase pager support

7 years agoMerge pull request #9892 from totten/master-depr
colemanw [Fri, 24 Feb 2017 07:52:05 +0000 (02:52 -0500)]
Merge pull request #9892 from totten/master-depr

MailingGroup API - Tighten up deprecations

7 years agoMailingGroup API - Tighten up deprecations
Tim Otten [Fri, 24 Feb 2017 06:13:06 +0000 (23:13 -0700)]
MailingGroup API - Tighten up deprecations

The `MailingGroup.php` includes some very different APIs, e.g.
 * Several 'event'(subscribue/resubscribe) APIs
 * Some CRUD APIs for mailing data

The deprecation applies to the 'event' (subscribe/resubscribe) APIs --
because those can be done another way.  However, the CRUD for `MailingGroup`
records is the only way to do access that data.

7 years agoMerge pull request #9885 from eileenmcnaughton/search
Eileen McNaughton [Fri, 24 Feb 2017 02:49:51 +0000 (15:49 +1300)]
Merge pull request #9885 from eileenmcnaughton/search

CRM-19815, CRM-19830 make pseudoconstant handling more generic in order to improve performance

7 years agoTowards CRM-19815 make pseudoconstant handling more generic.
eileen [Thu, 23 Feb 2017 04:56:17 +0000 (17:56 +1300)]
Towards CRM-19815 make pseudoconstant handling more generic.

Using metadata pseudoconstants we can remove joins on the option_value table, which hur performance. This patch
only opens it up within the context of the Contact table. It is intended to open the code up to
allow us to extend the performance advantage of dropping the bad join to other entities.

The following fields have metadata links to the
option_value table:
 gender_id
 prefix_id
 suffix_id
 preferred_communication_method
 communication_style_id
 preferred_language

The general pattern for the api is to return (eg) communication_style_id = 1, communication_style = 'Formal', where communication_style is the db name of the option group for communication_style_id.

preferred_communication_method is the exception. For api calls it returns an array of ids like all other api calls.
However, it returns a string of names for non-api calls on that field, allowing us to avoid handling it in a number of other places.

I added tests to ensure no change on the api inputs & outputs and searched these fields through search builder & advanced
search + export. I also checked profile search listings. They are not using the convert routine & have some e-notices that
pre-existed, but no regression I could see.

7 years agoMerge pull request #9887 from JKingsnorth/CRM-20170
Eileen McNaughton [Thu, 23 Feb 2017 12:41:07 +0000 (01:41 +1300)]
Merge pull request #9887 from JKingsnorth/CRM-20170

CRM-20170 Fix participant count in summary report for free events

7 years agoMerge pull request #9884 from seamuslee001/CRM-20144-examples
Eileen McNaughton [Thu, 23 Feb 2017 11:33:56 +0000 (00:33 +1300)]
Merge pull request #9884 from seamuslee001/CRM-20144-examples

CRM-20144 (NFC) Update tests and example

7 years agoCRM-20170 Fix participant count in summary report for free events
JKingsnorth [Thu, 23 Feb 2017 11:22:48 +0000 (11:22 +0000)]
CRM-20170 Fix participant count in summary report for free events

7 years agoRevert changes to test and re-generate example from better test
Seamus Lee [Thu, 23 Feb 2017 10:35:12 +0000 (21:35 +1100)]
Revert changes to test and re-generate example from better test

7 years agoCRM-20144 (NFC) Update tests and example
Seamus Lee [Thu, 23 Feb 2017 06:50:57 +0000 (17:50 +1100)]
CRM-20144 (NFC) Update tests and example

7 years agoMerge pull request #9867 from seamuslee001/CRM-20144
Eileen McNaughton [Thu, 23 Feb 2017 06:30:01 +0000 (19:30 +1300)]
Merge pull request #9867 from seamuslee001/CRM-20144

CRM-20144 Fix contact.get api break where groups no longer returned i…

7 years agoMerge pull request #9876 from JMAConsulting/CRM-20158
Eileen McNaughton [Thu, 23 Feb 2017 02:51:16 +0000 (15:51 +1300)]
Merge pull request #9876 from JMAConsulting/CRM-20158

CRM-20158, added card_type and pan_truncation field

7 years agoMerge pull request #9882 from colemanw/Display
colemanw [Thu, 23 Feb 2017 02:38:01 +0000 (21:38 -0500)]
Merge pull request #9882 from colemanw/Display

Display error message for activity processing

7 years agoMerge pull request #9883 from colemanw/ApiExplorer
colemanw [Thu, 23 Feb 2017 02:36:00 +0000 (21:36 -0500)]
Merge pull request #9883 from colemanw/ApiExplorer

ApiExplorer - Fix js error

7 years agoApiExplorer - Fix js error
Coleman Watts [Thu, 23 Feb 2017 02:33:55 +0000 (19:33 -0700)]
ApiExplorer - Fix js error

7 years agoDisplay error message for activity processing
Coleman Watts [Wed, 22 Feb 2017 23:30:44 +0000 (16:30 -0700)]
Display error message for activity processing

7 years agoFix legacy test
Seamus Lee [Wed, 22 Feb 2017 20:59:34 +0000 (07:59 +1100)]
Fix legacy test

7 years agoAdd support for some legacy handling of group param as well that maybe out in the...
Seamus Lee [Wed, 22 Feb 2017 20:25:22 +0000 (07:25 +1100)]
Add support for some legacy handling of group param as well that maybe out in the wild

7 years agoCRM-20158, added card_type and pan_truncation field
Pradeep Nayak [Wed, 22 Feb 2017 20:08:26 +0000 (01:38 +0530)]
CRM-20158, added card_type and pan_truncation field

----------------------------------------
* CRM-20158: Store card type and last 4 digits of credit card
  https://issues.civicrm.org/jira/browse/CRM-20158

7 years agoMerge pull request #9871 from eileenmcnaughton/rev
Eileen McNaughton [Wed, 22 Feb 2017 01:44:48 +0000 (14:44 +1300)]
Merge pull request #9871 from eileenmcnaughton/rev

More test output on intermittant error

7 years agoAdd delay in test to resolve concurrent changes
eileen [Wed, 22 Feb 2017 01:04:26 +0000 (14:04 +1300)]
Add delay in test to resolve concurrent changes

7 years agoTidy up checks as per discussion with Eileen and add new test of array format
Seamus Lee [Wed, 22 Feb 2017 00:00:39 +0000 (11:00 +1100)]
Tidy up checks as per discussion with Eileen and add new test of array format

7 years agoFix up re-setting of the array in the OIK format
Seamus Lee [Tue, 21 Feb 2017 21:26:22 +0000 (08:26 +1100)]
Fix up re-setting of the  array in the OIK format

7 years agoCRM-20144 move special handling to API layer from BAO
Seamus Lee [Tue, 21 Feb 2017 21:17:17 +0000 (08:17 +1100)]
CRM-20144 move special handling to API layer from BAO

remove accidentally generated files

7 years agoCRM-20144 Fix contact.get api break where groups no longer returned if using title...
Seamus Lee [Tue, 21 Feb 2017 09:44:06 +0000 (20:44 +1100)]
CRM-20144 Fix contact.get api break where groups no longer returned if using title in params

7 years agoMerge pull request #9862 from eileenmcnaughton/rev
colemanw [Mon, 20 Feb 2017 18:54:51 +0000 (13:54 -0500)]
Merge pull request #9862 from eileenmcnaughton/rev

CRM-20061 Add tables as a parameter on the revert api

7 years agoCRM-20061 Add tables as a parameter on the revert api
eileen [Mon, 20 Feb 2017 01:30:48 +0000 (14:30 +1300)]
CRM-20061 Add tables as a parameter on the revert api

7 years agoMerge pull request #9459 from colemanw/CRM-19693
Eileen McNaughton [Mon, 20 Feb 2017 01:58:12 +0000 (14:58 +1300)]
Merge pull request #9459 from colemanw/CRM-19693

CRM-19693 - Don't show options for disabled components

7 years agoMerge pull request #9858 from ajdavis/paypal-ipn-business-name
Eileen McNaughton [Sun, 19 Feb 2017 19:27:11 +0000 (08:27 +1300)]
Merge pull request #9858 from ajdavis/paypal-ipn-business-name

CRM-20048 Parse "business" not "receiver_email" from IPN

7 years agoMerge pull request #9844 from colemanw/CRM-20034
colemanw [Sun, 19 Feb 2017 18:44:50 +0000 (13:44 -0500)]
Merge pull request #9844 from colemanw/CRM-20034

CRM-20034 - CRM-20034 - Support OR grouping of api get params

7 years agoMerge pull request #9856 from seamuslee001/CRM-19657-2
Eileen McNaughton [Sat, 18 Feb 2017 23:35:49 +0000 (12:35 +1300)]
Merge pull request #9856 from seamuslee001/CRM-19657-2

CRM-19657 Fall back to system wide information if no default from email can be …

7 years agoMerge pull request #9770 from seamuslee001/CRM-19960
Eileen McNaughton [Sat, 18 Feb 2017 22:43:55 +0000 (11:43 +1300)]
Merge pull request #9770 from seamuslee001/CRM-19960

CRM-19960 Hide page title when is supposed to be removed

7 years agoCRM-20048 Parse "business" not "receiver_email" from IPN
A. Jesse Jiryu Davis [Sat, 18 Feb 2017 03:20:48 +0000 (22:20 -0500)]
CRM-20048 Parse "business" not "receiver_email" from IPN

7 years agoCRM-19816 - Support activity tag joins and activity attachments
Coleman Watts [Fri, 17 Feb 2017 19:06:31 +0000 (14:06 -0500)]
CRM-19816 - Support activity tag joins and activity attachments

7 years agoFall back to system wide information if no default from email can be found and no...
Seamus Lee [Fri, 17 Feb 2017 21:52:26 +0000 (08:52 +1100)]
Fall back to system wide information if no default from email can be found and no contribution page can be used and no receipt from is passed in and add test to prove it

7 years agoMerge pull request #9853 from eileenmcnaughton/cont_test
Eileen McNaughton [Fri, 17 Feb 2017 05:29:26 +0000 (18:29 +1300)]
Merge pull request #9853 from eileenmcnaughton/cont_test

Remove mispelt param.

7 years agoRemove mispelt param.
eileen [Thu, 16 Feb 2017 22:47:31 +0000 (11:47 +1300)]
Remove mispelt param.

Fixing this upsets test, because it should be calculated so trying removal against tests

7 years agoMerge pull request #9808 from seamuslee001/CRM-19972
Eileen McNaughton [Thu, 16 Feb 2017 12:21:33 +0000 (01:21 +1300)]
Merge pull request #9808 from seamuslee001/CRM-19972

CRM-19972 Add in post upgrade message about the addition of manage ta…

7 years agoMerge pull request #9833 from francescbassas/patch-9
Eileen McNaughton [Thu, 16 Feb 2017 12:20:19 +0000 (01:20 +1300)]
Merge pull request #9833 from francescbassas/patch-9

CRM-20013 Localization for participant status on Event Income Report …

7 years agoMerge pull request #9823 from JKingsnorth/CRM-19999
Eileen McNaughton [Thu, 16 Feb 2017 10:23:28 +0000 (23:23 +1300)]
Merge pull request #9823 from JKingsnorth/CRM-19999

CRM-19999 Soften event error message on registration

7 years agoCRM-19999 Soften event error message on registration
JKingsnorth [Fri, 10 Feb 2017 16:46:51 +0000 (16:46 +0000)]
CRM-19999 Soften event error message on registration

7 years agoMerge pull request #9842 from seamuslee001/CRM-19657
Eileen McNaughton [Thu, 16 Feb 2017 07:12:49 +0000 (20:12 +1300)]
Merge pull request #9842 from seamuslee001/CRM-19657

CRM-19657 Try to use domain from email rather than user email for from address …

7 years agoMerge pull request #9846 from eileenmcnaughton/performance2
Eileen McNaughton [Thu, 16 Feb 2017 07:11:33 +0000 (20:11 +1300)]
Merge pull request #9846 from eileenmcnaughton/performance2

CRM-19184 remove old old old suppress group functionality by defining…

7 years agoCRM-19657 Fix issue where domain address wasn't being used for recurring contribution...
Seamus Lee [Thu, 16 Feb 2017 00:51:42 +0000 (11:51 +1100)]
CRM-19657 Fix issue where domain address wasn't being used for recurring contribution emails but logged in was.

7 years agoMerge pull request #9845 from eileenmcnaughton/cust_date_under
Eileen McNaughton [Thu, 16 Feb 2017 04:59:52 +0000 (17:59 +1300)]
Merge pull request #9845 from eileenmcnaughton/cust_date_under

[NFC] Date metadata fixes towards CRM-19490, CRM-18387, CRM-20012, CRM-20011, CRM-15948, CRM-19911

7 years agoCRM-19184 remove old old old suppress group functionality by defining 'CIVICRM_GROUPTREE'
eileen [Sun, 1 Jan 2017 22:10:56 +0000 (11:10 +1300)]
CRM-19184 remove old old old suppress group functionality by defining 'CIVICRM_GROUPTREE'

7 years agoMerge pull request #9807 from eileenmcnaughton/perf
Eileen McNaughton [Thu, 16 Feb 2017 04:40:23 +0000 (17:40 +1300)]
Merge pull request #9807 from eileenmcnaughton/perf

CRM-19934 improvement on acl cache.

7 years agoAPI Explorer - add icons to tabs
Coleman Watts [Thu, 16 Feb 2017 03:44:26 +0000 (22:44 -0500)]
API Explorer - add icons to tabs

7 years agoCRM-20034 - Expose OR grouping to api explorer
Coleman Watts [Thu, 16 Feb 2017 03:33:03 +0000 (22:33 -0500)]
CRM-20034 - Expose OR grouping to api explorer

7 years ago[NFC] towards CRM-19840 & others, load date metadata for custom & core profile fields.
eileen [Thu, 16 Feb 2017 03:41:26 +0000 (16:41 +1300)]
[NFC] towards CRM-19840 & others, load date metadata for custom & core profile fields.

This is further NFC change towards CRM-19840 and a range of other date fixes. It ensures that date data is available on date fields
allowing us to reduce code elsewhere

7 years agoCRM-20034 - Support OR grouping of api get params
Coleman Watts [Thu, 16 Feb 2017 03:32:36 +0000 (22:32 -0500)]
CRM-20034 - Support OR grouping of api get params

7 years ago[NFC] towards CRM-19840 & others, load more useful metadata.
eileen [Thu, 16 Feb 2017 03:16:43 +0000 (16:16 +1300)]
[NFC] towards CRM-19840 & others, load more useful metadata.

The importable fields function is not returning all possibly useful fields, it is filtering them by criteria that are
a bit unreliable. They are not being used here for filtering so we should get the full library in all cases.

7 years ago[NFC] towards CRM-19840 & other date fixes.
eileen [Thu, 16 Feb 2017 03:07:35 +0000 (16:07 +1300)]
[NFC] towards CRM-19840 & other date fixes.

Enhance the information available about dates. Based on the date format a format string in php and in 'our posix' should be returned.
(as long as we set the context to 'input' our of cautiousness. min & max year should be calculated for all types, not just credit cards

7 years agoMerge pull request #9843 from eileenmcnaughton/test_clean
Eileen McNaughton [Thu, 16 Feb 2017 03:26:09 +0000 (16:26 +1300)]
Merge pull request #9843 from eileenmcnaughton/test_clean

[NFC] towards CRM-19490 - code cleanup only.

7 years agoMerge pull request #9841 from colemanw/CRM-19816
colemanw [Thu, 16 Feb 2017 03:03:50 +0000 (22:03 -0500)]
Merge pull request #9841 from colemanw/CRM-19816

CRM-19816 - Improved activity api params

7 years ago[NFC] towards CRM-19490 - code cleanup only.
eileen [Thu, 16 Feb 2017 02:45:47 +0000 (15:45 +1300)]
[NFC] towards CRM-19490 - code cleanup only.

Removing unused variables & a bit of cruft in the test

7 years agoCRM-19816 - Retrieve activity tags
Coleman Watts [Wed, 15 Feb 2017 19:09:39 +0000 (14:09 -0500)]
CRM-19816 - Retrieve activity tags

7 years agoAPI Explorer: Don't show non-joinable fields as joinable
Coleman Watts [Wed, 15 Feb 2017 17:45:19 +0000 (12:45 -0500)]
API Explorer: Don't show non-joinable fields as joinable

7 years agoCRM-19816 - Standardize contact_id field in activity api
Coleman Watts [Wed, 15 Feb 2017 17:05:14 +0000 (12:05 -0500)]
CRM-19816 - Standardize contact_id field in activity api

7 years agoMerge pull request #9837 from eileenmcnaughton/bounce
Eileen McNaughton [Wed, 15 Feb 2017 21:31:57 +0000 (10:31 +1300)]
Merge pull request #9837 from eileenmcnaughton/bounce

CRM-20016 Add tests for bounce processor job & fix mysql error

7 years agoFix Operator
Seamus Lee [Wed, 15 Feb 2017 20:40:30 +0000 (07:40 +1100)]
Fix Operator

7 years agoMerge pull request #9838 from JMAConsulting/CRM-20022
Eileen McNaughton [Wed, 15 Feb 2017 08:55:11 +0000 (21:55 +1300)]
Merge pull request #9838 from JMAConsulting/CRM-20022

CRM-20022 IIDA-58 Added Batch Title to columns, grouping and filter

7 years agoCRM-16189 IIDA-58 Added Batch Title to columns, grouping and filter
Edsel [Thu, 9 Feb 2017 13:12:15 +0000 (18:42 +0530)]
CRM-16189 IIDA-58 Added Batch Title to columns, grouping and filter

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

CRM-16189-44 Changes to filters, group bys

CRM-16189 IIDA-58 Prevented loading all batches for report

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

7 years agoCRM-20016 fix mysql error on processing bounces
eileen [Wed, 15 Feb 2017 05:25:40 +0000 (18:25 +1300)]
CRM-20016 fix mysql error on processing bounces

7 years agoMerge pull request #8548 from fuzionnz/CRM-18811
Eileen McNaughton [Wed, 15 Feb 2017 05:33:50 +0000 (18:33 +1300)]
Merge pull request #8548 from fuzionnz/CRM-18811

CRM-18811: Permit spaces in table and column aliases.

7 years agoCRM-20016 preliminary work - add basis for unit testing and failing unit test.
eileen [Wed, 15 Feb 2017 01:57:01 +0000 (14:57 +1300)]
CRM-20016 preliminary work - add basis for unit testing and failing unit test.

In writing the test I identified the transation was not rolling back due
to the api not following our crud format. I fixed it to 'fail' because
we should not be passing despite mysql errors & ... we should fix the errors...

The BAO code in fact holds transaction handling to ensure that a fail causes a fail - but
we were bypassing it without passing in the 'is_transactional' param.

7 years agoMerge pull request #9829 from h-c-c/CRM-20010
Eileen McNaughton [Wed, 15 Feb 2017 00:32:58 +0000 (13:32 +1300)]
Merge pull request #9829 from h-c-c/CRM-20010

CRM-20010 period_type should be required for parity with UI

7 years agoMerge pull request #9834 from lcdservices/CRM-20015
colemanw [Tue, 14 Feb 2017 21:58:40 +0000 (16:58 -0500)]
Merge pull request #9834 from lcdservices/CRM-20015

CRM-20015 escape output before generating docx

7 years agoMerge pull request #9774 from JMAConsulting/CRM-19964
Eileen McNaughton [Tue, 14 Feb 2017 20:15:16 +0000 (09:15 +1300)]
Merge pull request #9774 from JMAConsulting/CRM-19964

CRM-19964 Event registration creates contribution without line item

7 years agoCRM-20015 fix constant case
Brian Shaughnessy [Tue, 14 Feb 2017 13:27:19 +0000 (08:27 -0500)]
CRM-20015 fix constant case

7 years agoCRM-20010 period_type should be required for parity with UI
Peter Hartmann [Sat, 11 Feb 2017 06:38:21 +0000 (01:38 -0500)]
CRM-20010 period_type should be required for parity with UI

7 years agoMerge pull request #9831 from yashodha/CRM-19982
Eileen McNaughton [Mon, 13 Feb 2017 22:01:13 +0000 (11:01 +1300)]
Merge pull request #9831 from yashodha/CRM-19982

CRM-19982: Can't enter dates in 4.7.16. Can only enter characters in …

7 years agoMerge pull request #9832 from yashodha/CRM-19950
Eileen McNaughton [Mon, 13 Feb 2017 20:20:13 +0000 (09:20 +1300)]
Merge pull request #9832 from yashodha/CRM-19950

CRM-19950 - more clean up

7 years agoCRM-20015 escape output before generating docx
Brian Shaughnessy [Mon, 13 Feb 2017 18:51:28 +0000 (13:51 -0500)]
CRM-20015 escape output before generating docx

7 years agoCRM-20013 Localization for participant status on Event Income Report (Summary)
francescbassas [Mon, 13 Feb 2017 15:16:42 +0000 (16:16 +0100)]
CRM-20013 Localization for participant status on Event Income Report (Summary)

7 years agoCRM-19950 - more clean up
yashodha [Mon, 13 Feb 2017 14:12:20 +0000 (19:42 +0530)]
CRM-19950 - more clean up

7 years agoCRM-19982: Can't enter dates in 4.7.16. Can only enter characters in word birth
yashodha [Mon, 13 Feb 2017 10:58:01 +0000 (16:28 +0530)]
CRM-19982: Can't enter dates in 4.7.16. Can only enter characters in word birth

7 years agoMerge pull request #9826 from seamuslee001/CRM-20007
Eileen McNaughton [Mon, 13 Feb 2017 04:20:55 +0000 (17:20 +1300)]
Merge pull request #9826 from seamuslee001/CRM-20007

CRM-20007 Add test to prove that repeatTransaction does not use the P…

7 years agoMerge pull request #9830 from eileenmcnaughton/cust_date_nfc
Eileen McNaughton [Mon, 13 Feb 2017 04:20:24 +0000 (17:20 +1300)]
Merge pull request #9830 from eileenmcnaughton/cust_date_nfc

[nfc] refactoring towards CRM-19490

7 years agoMinor test tidy up
eileen [Mon, 13 Feb 2017 03:11:10 +0000 (16:11 +1300)]
Minor test tidy up

7 years agoe-notice fix
eileen [Mon, 13 Feb 2017 03:09:32 +0000 (16:09 +1300)]
e-notice fix

7 years agoCRM-19490 Use fields.tpl for common code.
eileen [Sun, 12 Feb 2017 22:03:03 +0000 (11:03 +1300)]
CRM-19490 Use fields.tpl for common code.

The preview.tpl should leverage other profile rendering of fields rather than being copy & paste. This allows the date changes to filter through. I have sacrificed the table for this - but we are ditching table somewhat. Arguably we should change the container id to crm-container in
order to get a more front-end visual of the fields.

7 years agoCRM-19490 use clear variable name rather than 'n'
eileen [Sun, 12 Feb 2017 21:46:45 +0000 (10:46 +1300)]
CRM-19490 use clear variable name rather than 'n'

7 years agoCRM-19490 Extract fields iteration to re-use it from preview.tpl
eileen [Wed, 8 Feb 2017 06:56:47 +0000 (19:56 +1300)]
CRM-19490 Extract fields iteration to re-use it from preview.tpl

7 years agoCRM-20007 Fix issue where contribution not getting correct payment instrument set
Seamus Lee [Sun, 12 Feb 2017 21:03:59 +0000 (08:03 +1100)]
CRM-20007 Fix issue where contribution not getting correct payment instrument set

7 years agoSet original contribution to be paid by Debit Card as well to prove that its using...
Seamus Lee [Sun, 12 Feb 2017 09:23:16 +0000 (20:23 +1100)]
Set original contribution to be paid by Debit Card as well to prove that its using default payment instrument

7 years agoCRM-20007 Add test to prove that repeatTransaction does not use the Payment Procesors...
Seamus Lee [Sun, 12 Feb 2017 01:08:39 +0000 (12:08 +1100)]
CRM-20007 Add test to prove that repeatTransaction does not use the Payment Procesors Payment Instrument when creating contributions

7 years agoMerge pull request #9816 from yashodha/CRM-19883
Eileen McNaughton [Fri, 10 Feb 2017 00:59:16 +0000 (13:59 +1300)]
Merge pull request #9816 from yashodha/CRM-19883

CRM-19883 - fix display in report rows

7 years agoMerge pull request #9810 from yashodha/CRM-19950
Eileen McNaughton [Fri, 10 Feb 2017 00:54:28 +0000 (13:54 +1300)]
Merge pull request #9810 from yashodha/CRM-19950

CRM-19950 : Wrong param passed to checkPermission function

7 years agoCRM-19883 - fix display in report rows
yashodha [Thu, 9 Feb 2017 09:41:19 +0000 (15:11 +0530)]
CRM-19883 - fix display in report rows

7 years agoCRM-19950 : Wrong param passed to checkPermission function
yashodha [Thu, 9 Feb 2017 04:01:02 +0000 (09:31 +0530)]
CRM-19950 : Wrong param passed to checkPermission function

7 years agoMerge remote-tracking branch 'origin/4.7.16-rc' into master-4716
Tim Otten [Thu, 9 Feb 2017 02:07:38 +0000 (18:07 -0800)]
Merge remote-tracking branch 'origin/4.7.16-rc' into master-4716

7 years agoCRM-19972 Add in post upgrade message about the addition of manage tags permission
Seamus Lee [Mon, 6 Feb 2017 00:19:37 +0000 (11:19 +1100)]
CRM-19972 Add in post upgrade message about the addition of manage tags permission

7 years agoCRM-19934 improvement on acl cache.
eileen [Thu, 9 Feb 2017 01:44:41 +0000 (14:44 +1300)]
CRM-19934 improvement on acl cache.

This change means that when we are checking the allow function we do not add the harmful
OR to the query.

The 'view my contact' & 'edit my contact' permissions have already been checked for.

Adding them into the ACL query with an OR causes serious performance issues, as
elsewhere commented. We can & should avoid it here

7 years agoMerge pull request #9679 from seamuslee001/CRM-18464
Tim Otten [Thu, 9 Feb 2017 01:26:53 +0000 (17:26 -0800)]
Merge pull request #9679 from seamuslee001/CRM-18464

CRM-18464 use safe drop foreign key function to resolve upgrade error…

7 years agoMerge pull request #9797 from seamuslee001/CRM-19979
Eileen McNaughton [Thu, 9 Feb 2017 00:07:23 +0000 (13:07 +1300)]
Merge pull request #9797 from seamuslee001/CRM-19979

CRM-19979 Fix issue where contacts cannot be removed from group or deleted if in status of pending

7 years agoMerge pull request #9805 from civicrm/eileenmcnaughton-patch-1
Eileen McNaughton [Wed, 8 Feb 2017 21:35:39 +0000 (10:35 +1300)]
Merge pull request #9805 from civicrm/eileenmcnaughton-patch-1

I have added myself a second time - under WMF

7 years agoI have added myself a second time - under WMF
Eileen McNaughton [Wed, 8 Feb 2017 21:35:17 +0000 (10:35 +1300)]
I have added myself a second time - under WMF

I think it is appropriate that WMF get credit for the fixes I do while working for them