civicrm-core.git
5 years agoSwitch to greeting for better, more consistent results in tpl, remove print statement
eileen [Wed, 20 Feb 2019 12:38:46 +0000 (01:38 +1300)]
Switch to greeting for better, more consistent results in tpl, remove print statement

5 years agoAdd test for receipt output (test written to pre-change output)
eileen [Wed, 20 Feb 2019 12:05:17 +0000 (01:05 +1300)]
Add test for receipt output (test written to pre-change output)

5 years agoMerge pull request #13659 from francescbassas/patch-16
Seamus Lee [Thu, 21 Feb 2019 23:55:17 +0000 (10:55 +1100)]
Merge pull request #13659 from francescbassas/patch-16

/dev/core#716 - Add decimals in Contribution Amount on Repeat Contrib…

5 years agoMerge pull request #13650 from eileenmcnaughton/order_by
Seamus Lee [Thu, 21 Feb 2019 23:50:21 +0000 (10:50 +1100)]
Merge pull request #13650 from eileenmcnaughton/order_by

[REF] minor code cleanup - do not build order var just to hurt brains

5 years ago/dev/core#716 - Add decimals in Contribution Amount on Repeat Contributions Report
francescbassas [Thu, 21 Feb 2019 22:33:32 +0000 (23:33 +0100)]
/dev/core#716 - Add decimals in Contribution Amount on Repeat Contributions Report

5 years agoMerge pull request #13656 from eileenmcnaughton/search_query
colemanw [Thu, 21 Feb 2019 14:26:14 +0000 (09:26 -0500)]
Merge pull request #13656 from eileenmcnaughton/search_query

[REF] minor cleanup of groupBy definition.

5 years ago[REF] minor cleanup of groupBy definition.
eileen [Thu, 21 Feb 2019 09:33:59 +0000 (22:33 +1300)]
[REF] minor cleanup of groupBy definition.

If you read the code the groupBy statement creation can go with 'its friends'
and the groupBy in the removed line is overwritten. I'll extract this next ....

5 years agoMerge pull request #13655 from eileenmcnaughton/payment_receipt
Monish Deb [Thu, 21 Feb 2019 08:34:46 +0000 (14:04 +0530)]
Merge pull request #13655 from eileenmcnaughton/payment_receipt

Update Payment Notification to use greeting, remove text to 'Please print this confirmation for your records.

5 years agoUpdate Payment Notification to use greeting, to not encourage printing
eileen [Thu, 21 Feb 2019 01:56:56 +0000 (14:56 +1300)]
Update Payment Notification to use greeting, to not encourage printing

These changes are consistent with other changes. I also switched the parameters for when to include
extra detail to deprecate contributeMode

5 years ago[REF] minor code cleanup - do not build order var just to hurt brains
eileen [Wed, 20 Feb 2019 13:33:13 +0000 (02:33 +1300)]
[REF] minor code cleanup - do not build order var just to hurt brains

The order var is basically orderBy prepended by Order by - which is then stripped.

Just don't

5 years agoMerge pull request #13610 from eileenmcnaughton/payment_conf2
Monish Deb [Wed, 20 Feb 2019 11:54:59 +0000 (17:24 +0530)]
Merge pull request #13610 from eileenmcnaughton/payment_conf2

Payment.sendconfirmation api - add further tpl variables.

5 years agoMerge pull request #13642 from eileenmcnaughton/atest
Seamus Lee [Wed, 20 Feb 2019 00:48:15 +0000 (11:48 +1100)]
Merge pull request #13642 from eileenmcnaughton/atest

Authorizenet test - reduce chance of intermittent fails

5 years agoAuthorizenet test - reduce chance of intermittent fails
eileen [Tue, 19 Feb 2019 23:07:26 +0000 (12:07 +1300)]
Authorizenet test - reduce chance of intermittent fails

I just saw this fail https://developer.authorize.net/api/reference/responseCodes.html?code=E00012
It seems we've already added uniqueness but we still hit a fail. Hopefully the timestamp
nature of uniqid + adding an extra degree of randomness will eliminate.

Also removed some deprecated params

5 years agoUpdate status comments
eileen [Fri, 15 Feb 2019 20:57:44 +0000 (09:57 +1300)]
Update status comments

5 years agoPayment.sendconfirmation - add tpl var for fully paid
eileen [Fri, 15 Feb 2019 20:51:51 +0000 (09:51 +1300)]
Payment.sendconfirmation - add tpl var for fully paid

5 years agoAdd thousandseparator variant to test
eileen [Fri, 15 Feb 2019 20:40:54 +0000 (09:40 +1300)]
Add thousandseparator variant to test

5 years agoAdd refund relevant fields & tests to payment.sendconfirmation
eileen [Fri, 15 Feb 2019 20:35:50 +0000 (09:35 +1300)]
Add refund relevant fields & tests to payment.sendconfirmation

5 years agoMerge pull request #13620 from eileenmcnaughton/signuptype
Seamus Lee [Tue, 19 Feb 2019 19:42:21 +0000 (06:42 +1100)]
Merge pull request #13620 from eileenmcnaughton/signuptype

[unused code cleanup] Remove unused 'signupType' url support

5 years agoMerge pull request #13609 from eileenmcnaughton/payment_conf
Monish Deb [Tue, 19 Feb 2019 08:45:55 +0000 (14:15 +0530)]
Merge pull request #13609 from eileenmcnaughton/payment_conf

Payment.sendconfirmation api - add further tpl variables.

5 years agoMerge pull request #13534 from yashodha/dev-696
Eileen McNaughton [Tue, 19 Feb 2019 06:57:28 +0000 (19:57 +1300)]
Merge pull request #13534 from yashodha/dev-696

(dev/core#696) Changes to copied event phone and email reflects in or…

5 years agoMerge pull request #13639 from civicrm/5.11
Eileen McNaughton [Tue, 19 Feb 2019 06:54:27 +0000 (19:54 +1300)]
Merge pull request #13639 from civicrm/5.11

5.11

5 years agoMerge pull request #13636 from eileenmcnaughton/strtolower
Seamus Lee [Tue, 19 Feb 2019 05:46:05 +0000 (16:46 +1100)]
Merge pull request #13636 from eileenmcnaughton/strtolower

Remove another instance of 'lower'

5 years agoMerge pull request #13637 from jitendrapurohit/core737
Seamus Lee [Tue, 19 Feb 2019 05:44:08 +0000 (16:44 +1100)]
Merge pull request #13637 from jitendrapurohit/core737

dev/core#737 - SMS not sent if 'Send Immediately' option is chosen on…

5 years agodev/core#737 - SMS not sent if 'Send Immediately' option is chosen on the last screen
Jitendra Purohit [Tue, 19 Feb 2019 04:02:20 +0000 (09:32 +0530)]
dev/core#737 - SMS not sent if 'Send Immediately' option is chosen on the last screen

5 years agoRemove another instance of 'lower'
eileen [Tue, 19 Feb 2019 03:38:41 +0000 (16:38 +1300)]
Remove another instance of 'lower'

We have removed almost all of these from the code base due to the performance cost
combined with the lack of any upside. Just found another

5 years agoMerge pull request #13630 from eileenmcnaughton/goodbye_mode_and_median_hello_speed
colemanw [Tue, 19 Feb 2019 01:36:17 +0000 (20:36 -0500)]
Merge pull request #13630 from eileenmcnaughton/goodbye_mode_and_median_hello_speed

dev/core#720 Remove median & mode stats from contribution summary in order to improve performance

5 years agoMerge pull request #13629 from eileenmcnaughton/mailing_job_test_use
colemanw [Mon, 18 Feb 2019 17:40:03 +0000 (12:40 -0500)]
Merge pull request #13629 from eileenmcnaughton/mailing_job_test_use

[Test changes] Mailing job test use

5 years agoMerge pull request #13543 from mlutfy/fixDefaultPDFFormat
colemanw [Mon, 18 Feb 2019 17:27:28 +0000 (12:27 -0500)]
Merge pull request #13543 from mlutfy/fixDefaultPDFFormat

Fix html2pdf default PDF format when multiple pdf_format are available.

5 years agoMerge pull request #13631 from colemanw/entityRefs3
Eileen McNaughton [Mon, 18 Feb 2019 07:18:43 +0000 (20:18 +1300)]
Merge pull request #13631 from colemanw/entityRefs3

 EntityRef - standardize on PascalCase for entity name and fix minor bug

5 years agoMerge pull request #13632 from colemanw/CRM_Report_Form_Event
Eileen McNaughton [Mon, 18 Feb 2019 07:18:30 +0000 (20:18 +1300)]
Merge pull request #13632 from colemanw/CRM_Report_Form_Event

[REF] Remove useless class CRM_Report_Form_Event

5 years agoRemove multiple currency handling as it seems to make it format worse
eileen [Mon, 18 Feb 2019 01:17:37 +0000 (14:17 +1300)]
Remove multiple currency handling as it seems to make it format worse

5 years agoDeprecate computeStats off to the one place that still uses it.
eileen [Mon, 18 Feb 2019 00:36:39 +0000 (13:36 +1300)]
Deprecate computeStats off to the one place that still uses it.

We MIGHT have reports calling it so to avoid a fatal we will not remove the function just yet

5 years agoRemove median & mode stats from contribution summary in order to improve performance
eileen [Mon, 18 Feb 2019 00:31:00 +0000 (13:31 +1300)]
Remove median & mode stats from contribution summary in order to improve performance

5 years agoMerge pull request #13579 from mattwire/contributionrecur_metadata
Eileen McNaughton [Mon, 18 Feb 2019 04:31:18 +0000 (17:31 +1300)]
Merge pull request #13579 from mattwire/contributionrecur_metadata

Contribution/ContributionRecur metadata updates for EntityForm

5 years agoRemove useless class CRM_Report_Form_Event
Coleman Watts [Mon, 18 Feb 2019 04:16:36 +0000 (23:16 -0500)]
Remove useless class CRM_Report_Form_Event

5 years agoUse PascalCase with CRM_Core_Form::addEntityRef
Coleman Watts [Mon, 18 Feb 2019 03:55:21 +0000 (22:55 -0500)]
Use PascalCase with CRM_Core_Form::addEntityRef

Although entityRef fields accept either snake_case or CamelCase, let's be consistent.

5 years agoEntityRef: Fix caching filter option lists
Coleman Watts [Mon, 18 Feb 2019 03:46:27 +0000 (22:46 -0500)]
EntityRef: Fix caching filter option lists

The filters objects were getting cloned instead of passed by reference,
which prevented loadEntityRefFilterOptions() from saving the list for reuse.

5 years agoEntityRef - standardize on PascalCase for entity name
Coleman Watts [Mon, 18 Feb 2019 00:56:00 +0000 (19:56 -0500)]
EntityRef - standardize on PascalCase for entity name

5 years agoChange the call used to generate recipients in unit tests
eileen [Mon, 18 Feb 2019 00:26:53 +0000 (13:26 +1300)]
Change the call used to generate recipients in unit tests

Passes in scheduled_date (as the 'real' api call would)

Part of this attempted deprecation #13627

5 years agoMerge pull request #13607 from eileenmcnaughton/cont_summary_extract
colemanw [Mon, 18 Feb 2019 00:23:43 +0000 (19:23 -0500)]
Merge pull request #13607 from eileenmcnaughton/cont_summary_extract

dev/core#720 [REF] refactor out components of contributionSummary function

5 years agoMerge pull request #13628 from colemanw/entityRefs2
Eileen McNaughton [Sun, 17 Feb 2019 23:02:23 +0000 (12:02 +1300)]
Merge pull request #13628 from colemanw/entityRefs2

Standardize format for entityRef create links

5 years agoMove output formatting to the relevant functions
eileen [Sun, 17 Feb 2019 04:16:33 +0000 (17:16 +1300)]
Move output formatting to the relevant functions

5 years agoRemove duplicate setting of variables
eileen [Fri, 15 Feb 2019 03:39:55 +0000 (16:39 +1300)]
Remove duplicate setting of variables

5 years agoMerge pull request #13624 from eileenmcnaughton/minor_pdf_utl_cleanup
Eileen McNaughton [Sun, 17 Feb 2019 22:13:19 +0000 (11:13 +1300)]
Merge pull request #13624 from eileenmcnaughton/minor_pdf_utl_cleanup

[Code cleanup] Remove unused $stationery_path parameter

5 years agoMerge pull request #13626 from eileenmcnaughton/cont_summary_extract1
Eileen McNaughton [Sun, 17 Feb 2019 22:11:23 +0000 (11:11 +1300)]
Merge pull request #13626 from eileenmcnaughton/cont_summary_extract1

[REF] extract cancelled stats to own function

5 years agoStandardize format for entityRef create links
Coleman Watts [Sun, 17 Feb 2019 21:42:26 +0000 (16:42 -0500)]
Standardize format for entityRef create links

5 years agoMerge pull request #13625 from colemanw/entityRefs
Eileen McNaughton [Sun, 17 Feb 2019 21:29:20 +0000 (10:29 +1300)]
Merge pull request #13625 from colemanw/entityRefs

[REF] Move entityRef filters into their respective BAOs

5 years ago[REF] extract cancelled stats to own function
eileen [Fri, 15 Feb 2019 03:32:47 +0000 (16:32 +1300)]
[REF] extract cancelled stats to own function

5 years agoRemove unused parameter
eileen [Sun, 17 Feb 2019 07:57:06 +0000 (20:57 +1300)]
Remove unused  parameter

5 years agoMove entityRef filters into their respective BAOs
Coleman Watts [Sun, 17 Feb 2019 19:20:09 +0000 (14:20 -0500)]
Move entityRef filters into their respective BAOs

5 years agoMerge pull request #13622 from eileenmcnaughton/cont_summary_extract1
colemanw [Sun, 17 Feb 2019 18:01:08 +0000 (13:01 -0500)]
Merge pull request #13622 from eileenmcnaughton/cont_summary_extract1

[REF] extract basic soft credit stats to separate function

5 years agoMerge pull request #13621 from eileenmcnaughton/default_wrong_declared
colemanw [Sun, 17 Feb 2019 17:59:55 +0000 (12:59 -0500)]
Merge pull request #13621 from eileenmcnaughton/default_wrong_declared

[code cleanup] Default wrong declared

5 years agoMerge pull request #13619 from eileenmcnaughton/unused_pending_param
colemanw [Sun, 17 Feb 2019 17:58:55 +0000 (12:58 -0500)]
Merge pull request #13619 from eileenmcnaughton/unused_pending_param

[REF] Remove unused function parameter

5 years agoMerge pull request #13623 from eileenmcnaughton/comment
colemanw [Sun, 17 Feb 2019 17:37:56 +0000 (12:37 -0500)]
Merge pull request #13623 from eileenmcnaughton/comment

Remove long block of commented out code from 4 years ago

5 years agoMerge pull request #13601 from alexymik/patch-1
Eileen McNaughton [Sun, 17 Feb 2019 07:39:47 +0000 (20:39 +1300)]
Merge pull request #13601 from alexymik/patch-1

Always load recaptcha JS over HTTPS

5 years agoMerge pull request #13499 from mattwire/profilecontact_nocontactid_subtype
Eileen McNaughton [Sun, 17 Feb 2019 07:34:03 +0000 (20:34 +1300)]
Merge pull request #13499 from mattwire/profilecontact_nocontactid_subtype

If a profile is used to create a contact with a subtype the contact will not have any existing subtypes

5 years agoRemove long block of commented out code from 4 years ago
eileen [Sun, 17 Feb 2019 05:26:21 +0000 (18:26 +1300)]
Remove long block of commented out code from 4 years ago

5 years ago[REF] extract basic soft credit stats to separate function
eileen [Fri, 15 Feb 2019 03:26:24 +0000 (16:26 +1300)]
[REF] extract basic soft credit stats to separate function

5 years agoAs previously commented this array is never used.
eileen [Sun, 17 Feb 2019 05:18:33 +0000 (18:18 +1300)]
As previously commented this array is never used.

I did a codebase grep on ->defaults & am pretty confident here....

5 years agoMerge pull request #13618 from eileenmcnaughton/test_info
colemanw [Sun, 17 Feb 2019 05:18:27 +0000 (00:18 -0500)]
Merge pull request #13618 from eileenmcnaughton/test_info

[Test support] Add extra output info when getsingle fails as this seems to be common  in intermittant fails

5 years agoMerge pull request #13616 from eileenmcnaughton/cont_summary_extract1
colemanw [Sun, 17 Feb 2019 05:16:36 +0000 (00:16 -0500)]
Merge pull request #13616 from eileenmcnaughton/cont_summary_extract1

[REF] extract add median to stats

5 years agoRemove unused 'signupType' url support
eileen [Sun, 17 Feb 2019 05:05:04 +0000 (18:05 +1300)]
Remove unused 'signupType' url support

The use of this was removed in https://github.com/civicrm/civicrm-core/pull/911
on the basis it didn't work.

This is just cleanup not done then.

(Note we shouldn't comment stuff out we should remove it as a rule)

5 years agoRemove unused function parameter
eileen [Sun, 17 Feb 2019 04:01:19 +0000 (17:01 +1300)]
Remove unused function parameter

The function getContributionParams was created as part of a larger refactoring/
code cleanup effort. One of those goals was to get to a point
where contributions are always created with a pending status and are later
confirmed when a payment is added.

It if only called from one place and TRUE is always passed for
so we no longer need the  parameter in this function, remove it

5 years agoAdd extra output info when getsingle fails as this seems to be common in intermittant...
eileen [Sun, 17 Feb 2019 03:41:35 +0000 (16:41 +1300)]
Add extra output info when getsingle fails as this seems to be common in intermittant fails

5 years agoMerge pull request #13617 from eileenmcnaughton/no_dead_service_tests
Eileen McNaughton [Sun, 17 Feb 2019 03:36:03 +0000 (16:36 +1300)]
Merge pull request #13617 from eileenmcnaughton/no_dead_service_tests

Remove tests that no longer work due to dead service

5 years ago[REF] extract add median to stats
eileen [Fri, 15 Feb 2019 02:03:27 +0000 (15:03 +1300)]
[REF] extract add median to stats

5 years agoRemove tests that no longer work due to dead service
eileen [Sun, 17 Feb 2019 01:42:47 +0000 (14:42 +1300)]
Remove tests that no longer work due to dead service

5 years agoMerge pull request #13606 from eileenmcnaughton/profile_perf
colemanw [Sun, 17 Feb 2019 01:01:57 +0000 (20:01 -0500)]
Merge pull request #13606 from eileenmcnaughton/profile_perf

Fix (sometimes serious) performance problem on submitting profiles for specified contacts

5 years agoMerge pull request #13614 from eileenmcnaughton/cont_summary_extract1
Eileen McNaughton [Sun, 17 Feb 2019 00:53:52 +0000 (13:53 +1300)]
Merge pull request #13614 from eileenmcnaughton/cont_summary_extract1

[REF] extract calculation of mode stat

5 years agoMerge pull request #13615 from civicrm/5.11
Eileen McNaughton [Sat, 16 Feb 2019 23:34:22 +0000 (12:34 +1300)]
Merge pull request #13615 from civicrm/5.11

5.11 to master

5 years agoMerge pull request #13613 from colemanw/openCampaignWidget
Eileen McNaughton [Sat, 16 Feb 2019 23:33:06 +0000 (12:33 +1300)]
Merge pull request #13613 from colemanw/openCampaignWidget

Auto-open campaign widget and sort by start date

5 years agoMerge pull request #13373 from MegaphoneJon/core-580-2
colemanw [Sat, 16 Feb 2019 22:47:08 +0000 (17:47 -0500)]
Merge pull request #13373 from MegaphoneJon/core-580-2

fixes core#580 - view all groups when appropriately permissioned

5 years agoMerge pull request #13612 from colemanw/l10n.js
Eileen McNaughton [Sat, 16 Feb 2019 22:23:22 +0000 (11:23 +1300)]
Merge pull request #13612 from colemanw/l10n.js

Move l10n.js to coreResourcesList

5 years ago[REF] extract calculation of mode stat
eileen [Fri, 15 Feb 2019 01:41:04 +0000 (14:41 +1300)]
[REF] extract calculation of mode stat

5 years agoAuto-open campaign widget and sort by start date
Coleman Watts [Sat, 16 Feb 2019 21:25:18 +0000 (16:25 -0500)]
Auto-open campaign widget and sort by start date

5 years agoMove l10n.js to coreResourcesList
Coleman Watts [Sat, 16 Feb 2019 20:13:01 +0000 (15:13 -0500)]
Move l10n.js to coreResourcesList

This change allows core resources to be added to the list AFTER l10n variables
have been initialized. This is needed by crm.menubar.js.

Another upshot of this change is that extensions will be able to add items to the list
as fully-formed urls.

5 years agoMerge pull request #13425 from mfb/utf8mb4
colemanw [Sat, 16 Feb 2019 19:47:37 +0000 (14:47 -0500)]
Merge pull request #13425 from mfb/utf8mb4

Add install and runtime status warnings if MySQL utf8mb4 is not supported

5 years agoMerge pull request #13608 from eileenmcnaughton/cont_summary_extract1
colemanw [Sat, 16 Feb 2019 19:21:00 +0000 (14:21 -0500)]
Merge pull request #13608 from eileenmcnaughton/cont_summary_extract1

[REF] extract calculation of basic stats

5 years agoMerge pull request #13587 from eileenmcnaughton/acl_location
colemanw [Sat, 16 Feb 2019 19:14:48 +0000 (14:14 -0500)]
Merge pull request #13587 from eileenmcnaughton/acl_location

[REF] Move addSelectWhere-like function to be located on BAO_Contribution

5 years agoMerge pull request #13563 from eileenmcnaughton/fn_fix_payment_by_type
Monish Deb [Sat, 16 Feb 2019 07:32:52 +0000 (13:02 +0530)]
Merge pull request #13563 from eileenmcnaughton/fn_fix_payment_by_type

[REF] Fix silly function to do less handling of non-existent scenarios

5 years agoMerge pull request #13611 from seamuslee001/exception_api
Eileen McNaughton [Sat, 16 Feb 2019 06:53:47 +0000 (19:53 +1300)]
Merge pull request #13611 from seamuslee001/exception_api

Add in Exception API to support the refactor of Dedupe Exception Page

5 years agoAdd in Exception API to support the refactor of Dedupe Exception Page
Alok Patel [Sat, 16 Feb 2019 02:05:38 +0000 (13:05 +1100)]
Add in Exception API to support the refactor of Dedupe Exception Page

5 years agoAdd location & relevant tests to payment.sendconfrimation
eileen [Fri, 15 Feb 2019 18:48:39 +0000 (07:48 +1300)]
Add location & relevant tests to payment.sendconfrimation

5 years agoPayment.sendconfirmation api - add further tpl variables.
eileen [Fri, 15 Feb 2019 18:07:18 +0000 (07:07 +1300)]
Payment.sendconfirmation api - add further tpl variables.

This is a continuance of the introduction of this api

5 years agoMerge pull request #13591 from mfb/683-incorrectly-encoded-state-and-country-names
Mathieu Lu [Fri, 15 Feb 2019 16:30:39 +0000 (11:30 -0500)]
Merge pull request #13591 from mfb/683-incorrectly-encoded-state-and-country-names

fixes dev/core#683 Incorrectly encoded state and country names

5 years ago[REF] extract calculation of basic stats
eileen [Fri, 15 Feb 2019 00:57:12 +0000 (13:57 +1300)]
[REF] extract calculation of basic stats

5 years agoMerge pull request #13605 from eileenmcnaughton/cont_summary
Seamus Lee [Fri, 15 Feb 2019 06:08:27 +0000 (17:08 +1100)]
Merge pull request #13605 from eileenmcnaughton/cont_summary

dev/core#720 add unit test, remove legacy code style.

5 years agoFix (sometimes serious) performance problem on submitting profiles for specified...
eileen [Fri, 15 Feb 2019 04:00:54 +0000 (17:00 +1300)]
Fix (sometimes serious) performance problem on submitting profiles for specified contacts.

->_id is set when the contact id is known - e.g in edit, in contactlayouteditor profile
blocks. However, current logic still retrieves duplicates and then... does nothing
with them if ->_id is set. By moving the if up higher we can save the server from
doing unnecesary queries. Note that if you submit a tag profile with no other fields in it
the query is server-destroyingly bad with this

5 years agoMerge pull request #13600 from eileenmcnaughton/profile_perf
Eileen McNaughton [Fri, 15 Feb 2019 03:51:49 +0000 (16:51 +1300)]
Merge pull request #13600 from eileenmcnaughton/profile_perf

[REF] extract chunk of code to a separate function

5 years agodev/core#720 add unit test, remove legacy code style.
eileen [Thu, 14 Feb 2019 22:50:56 +0000 (11:50 +1300)]
dev/core#720 add unit test, remove legacy code style.

This PR adds tests to the summaryQuery code in preparation for changes.

The one non-test change is to remove the & from summaryContribution fn.

It is only called from one place in the code & that place does not return as reference.

```
  /**
   * @return mixed
   */
  public function getSummary() {
    return $this->_query->summaryContribution($this->_context);
  }
```

5 years agoMerge pull request #13432 from francescbassas/patch-16
Yashodha Chaku [Fri, 15 Feb 2019 02:33:52 +0000 (08:03 +0530)]
Merge pull request #13432 from francescbassas/patch-16

dev/core#657 - Add filter for country on Repeat Contributions Report

5 years agoMove addSelectWhere-like function to be located on BAO_Contribution using correct...
eileen [Wed, 13 Feb 2019 03:45:11 +0000 (16:45 +1300)]
Move addSelectWhere-like function to be located on BAO_Contribution using correct name.

Since the contribution api uses the BAO_Query object I think it will not call this, nor reports AFAIK
However, this should cause the v4 api to apply these.

5 years ago[REF] extract chunk of code to a separate function
eileen [Thu, 14 Feb 2019 20:42:00 +0000 (09:42 +1300)]
[REF] extract chunk of code to a separate function

5 years agoMerge pull request #13602 from civicrm/5.11
Eileen McNaughton [Thu, 14 Feb 2019 23:29:19 +0000 (12:29 +1300)]
Merge pull request #13602 from civicrm/5.11

5.11 to master

5 years agoMerge pull request #13599 from seamuslee001/5.11
Seamus Lee [Thu, 14 Feb 2019 22:26:45 +0000 (09:26 +1100)]
Merge pull request #13599 from seamuslee001/5.11

Add in release notes for 5.10.2

5 years agoUpdate 5.10.2.md
Tim Otten [Thu, 14 Feb 2019 22:14:38 +0000 (14:14 -0800)]
Update 5.10.2.md

5 years agoUpdate 5.10.2.md
Tim Otten [Thu, 14 Feb 2019 22:14:19 +0000 (14:14 -0800)]
Update 5.10.2.md

Minor copy-edits:
* Punctuation to match other point-release docs
* Use consistent reverse-alpha in credits
* Add some more authors+reviewers from Github

5 years agoAlways load recaptcha JS over HTTPS
Alexy Mikhailichenko [Thu, 14 Feb 2019 22:12:19 +0000 (17:12 -0500)]
Always load recaptcha JS over HTTPS

5 years agoMerge pull request #13593 from eileenmcnaughton/acl_regression
Seamus Lee [Thu, 14 Feb 2019 21:45:19 +0000 (08:45 +1100)]
Merge pull request #13593 from eileenmcnaughton/acl_regression

dev/core#721 Fix regression on refreshing group_contact cache before checking acls

5 years agoMerge pull request #13592 from yashodha/dev-705
Eileen McNaughton [Thu, 14 Feb 2019 21:32:58 +0000 (10:32 +1300)]
Merge pull request #13592 from yashodha/dev-705

(dev/core#705) Disabling Alphabetical Pager is not respected for cont…