civicrm-core.git
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 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 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…

5 years agoAdd in release notes for 5.10.2
Seamus Lee [Thu, 14 Feb 2019 20:34:43 +0000 (07:34 +1100)]
Add in release notes for 5.10.2

Update release notes as per Eileen's comment

Add in notes on merge of dev/core#715 fix

5 years agoFix regression on refreshing group_contact cache before checking acls
eileen [Thu, 14 Feb 2019 05:37:14 +0000 (18:37 +1300)]
Fix regression on refreshing group_contact cache before checking acls

We seem to be checking if the cache needs a rebuild and IF SO doing 2 actions
1) rebuilding it
2) permitting access to contacts related to it

When really it should do only 1) above - this patch changes as such

This seems to be whackamole off https://github.com/civicrm/civicrm-core/pull/12344
going too far one way & https://github.com/civicrm/civicrm-core/pull/13448
fixing but adding this new variant

5 years agoMerge pull request #13561 from eileenmcnaughton/payment_conf
Eileen McNaughton [Thu, 14 Feb 2019 20:17:05 +0000 (09:17 +1300)]
Merge pull request #13561 from eileenmcnaughton/payment_conf

Add new Payment.sendconfirmation api

5 years agoUpdate Repeat.php
francescbassas [Thu, 14 Feb 2019 11:27:17 +0000 (12:27 +0100)]
Update Repeat.php
Add basic contact fields and filters on Repeat Contributions Report

5 years agoMerge pull request #13517 from alifrumin/contribsearchsoftcredit
Yashodha Chaku [Thu, 14 Feb 2019 11:10:27 +0000 (16:40 +0530)]
Merge pull request #13517 from alifrumin/contribsearchsoftcredit

Find Contributions columns/headers not aligned when "Contributions OR Soft Credits?" filter set to "Soft Credits Only"

5 years ago(dev/core#705) Disabling Alphabetical Pager is not respected for contribution pages.
yashodha [Thu, 14 Feb 2019 04:40:19 +0000 (10:10 +0530)]
(dev/core#705) Disabling Alphabetical Pager is not respected for contribution pages.

5 years agofixes dev/core#683 Incorrectly encoded state and country names
mark burdett [Thu, 14 Feb 2019 00:06:51 +0000 (16:06 -0800)]
fixes dev/core#683 Incorrectly encoded state and country names

5 years agoAdd new Payment.sendconfirmation api
eileen [Mon, 11 Feb 2019 03:39:55 +0000 (16:39 +1300)]
Add new Payment.sendconfirmation api

This adds a new api Payment.sendconfirmation intended to be an equivalent of
Contribution.sendconfirmation.

The key thing this needs to be able to do is to load up all
related information to assign to the template - this is not all covered in this
PR & until it is functionally equivalent to AdditionalPayment::sendEmail
we can't switch over but since it's new functionality we should be able to
merge & keep working on it.

Note that there is discussion on the PR this relates to (#13330) about what should
happen if 'Payment.create' api accepts 'is_email_receipt'. I think the most logical
outcome is that receipts would go out if it caused the contribution to be completed
(ie. we pass is_email_receipt into completetransaction api).

However, I don't feel like that is 'settled' yet - separating into a second api
(Payment.sendnotification) means we will have 2 generic function which can be called
from multiple places in the code rather than 2 functions tightly tied to the form layer.
I think it's OK if it is 2 not one

5 years agoMerge pull request #13571 from eileenmcnaughton/book
Eileen McNaughton [Wed, 13 Feb 2019 23:22:14 +0000 (12:22 +1300)]
Merge pull request #13571 from eileenmcnaughton/book

dev/report#7 fix trxn_date on bookkeeping report

5 years agoMerge pull request #13528 from jitendrapurohit/dev-684
Eileen McNaughton [Wed, 13 Feb 2019 22:39:42 +0000 (11:39 +1300)]
Merge pull request #13528 from jitendrapurohit/dev-684

dev/core#684 - Case Manager not updating correctly

5 years agoMerge pull request #13539 from eileenmcnaughton/email_task
Eileen McNaughton [Wed, 13 Feb 2019 22:26:12 +0000 (11:26 +1300)]
Merge pull request #13539 from eileenmcnaughton/email_task

dev/core#469 Fix Error on action 'Email - schedule/send via CiviMail' with multiple event names filter

5 years agoMerge pull request #13584 from eileenmcnaughton/user_dash_use_api
Seamus Lee [Wed, 13 Feb 2019 20:33:42 +0000 (07:33 +1100)]
Merge pull request #13584 from eileenmcnaughton/user_dash_use_api

[REF} User api rather than selector for rendering contributions on user dashboard

5 years agoMerge pull request #13538 from eileenmcnaughton/dedupe_birth
Eileen McNaughton [Wed, 13 Feb 2019 20:26:45 +0000 (09:26 +1300)]
Merge pull request #13538 from eileenmcnaughton/dedupe_birth

dev/core#397 Dedupe for Individual Birth Date Results in Error

5 years agoMerge pull request #13557 from vingle/patch-5
Eileen McNaughton [Wed, 13 Feb 2019 20:21:17 +0000 (09:21 +1300)]
Merge pull request #13557 from vingle/patch-5

Improves styling on Joomla! upgrade screen

5 years agoMerge pull request #13573 from pradpnayak/GroupInlineEdit
Eileen McNaughton [Wed, 13 Feb 2019 19:30:06 +0000 (08:30 +1300)]
Merge pull request #13573 from pradpnayak/GroupInlineEdit

dev/core/issues/714, Inline edit should be disabled if user doesn't have edit group permission

5 years agoSwitch userDashboard from using selector object to using the api to get contributions...
eileen [Wed, 13 Feb 2019 01:21:57 +0000 (14:21 +1300)]
Switch userDashboard from using selector object to using the api to get contributions to display.

Note that preliminary tests for this were written & merged some time ago.

Reasons for the change are

1) readability - most devs are much more comfortable with reading the api code than the selector
2) performance - the contribute selector code is deeply unperformant - mostly due to the summary function which in
this case is somewhat mitigated by the limit of 12 but we are still doing something slow for no reason
3) test stability - the test for this turned out to have poor stability & hopefully this will help
4) preliminary cleanup - there are 2 existing PRs that attempt to add new buttons to this & moving towards
a cleaner tpl / php layer will help with those. In addition there is a serious performance issue to
address on the contribution summary function. Reducing use of that function should help with the cleanup effort

5 years agoMerge pull request #13523 from eileenmcnaughton/def_country
Eileen McNaughton [Wed, 13 Feb 2019 18:04:30 +0000 (07:04 +1300)]
Merge pull request #13523 from eileenmcnaughton/def_country

dev/core#691 Make default country optional on setting form

5 years agoAttempt to fix unrelated test fail
eileen [Wed, 13 Feb 2019 18:03:39 +0000 (07:03 +1300)]
Attempt to fix unrelated test fail

This test keeps failing on an unrelated test - perhaps  ['cid'] is
being set & somehow retained - could explain other intermittents

5 years agoMerge pull request #13583 from eileenmcnaughton/user_dash
Eileen McNaughton [Wed, 13 Feb 2019 17:51:33 +0000 (06:51 +1300)]
Merge pull request #13583 from eileenmcnaughton/user_dash

[REF] switch from (undeclared) class property to local variable.

5 years agoMerge pull request #13562 from eileenmcnaughton/payment_test
Eileen McNaughton [Wed, 13 Feb 2019 08:09:01 +0000 (21:09 +1300)]
Merge pull request #13562 from eileenmcnaughton/payment_test

[REF] Minor readability cleanup

5 years agoMerge pull request #13342 from mattwire/activity_submitonce
Eileen McNaughton [Wed, 13 Feb 2019 04:44:13 +0000 (17:44 +1300)]
Merge pull request #13342 from mattwire/activity_submitonce

Remove activitystatus js. Add submitOnce handler for activity create

5 years agodev/core#691 Make default country optional on setting form
eileen [Mon, 4 Feb 2019 02:06:37 +0000 (15:06 +1300)]
dev/core#691 Make default country optional on setting form

This includes removing the default of 'United States'.... ahem!

5 years agoMerge pull request #13580 from colemanw/noMoreFourTwo
Eileen McNaughton [Wed, 13 Feb 2019 01:48:35 +0000 (14:48 +1300)]
Merge pull request #13580 from colemanw/noMoreFourTwo

Bump minimum upgradable ver to 4.2.9

5 years agoMerge pull request #13585 from civicrm/5.11
Eileen McNaughton [Wed, 13 Feb 2019 01:46:33 +0000 (14:46 +1300)]
Merge pull request #13585 from civicrm/5.11

5.11 to master

5 years agoMerge pull request #13581 from colemanw/dev/core#715
Eileen McNaughton [Wed, 13 Feb 2019 01:46:07 +0000 (14:46 +1300)]
Merge pull request #13581 from colemanw/dev/core#715

dev/core#715 - Fix delete action on RelationshipType form

5 years agoREF minor code readability improvements
eileen [Wed, 13 Feb 2019 00:31:44 +0000 (13:31 +1300)]
REF minor code readability improvements

5 years ago[REF] switch from (undeclared) class property to local variable.
eileen [Wed, 13 Feb 2019 00:23:28 +0000 (13:23 +1300)]
[REF] switch from (undeclared) class property to local variable.

We either needed to declare the variable on the class & make it a local variable. Switching
to a local var reflects the fact it is never accessed from outside thie function & improves readability.

grepping for _userOptions returns nothing after this.

I also removed an extraneous config singleton call. I can't see a strong case that either of
these changes will affect the intermittent fails but ... maybe?

5 years agodev/core#715 - Fix delete action on RelationshipType form
Coleman Watts [Tue, 12 Feb 2019 17:08:48 +0000 (12:08 -0500)]
dev/core#715 - Fix delete action on RelationshipType form

5 years agoMerge pull request #13577 from mattwire/codecleanup
Eileen McNaughton [Tue, 12 Feb 2019 19:54:29 +0000 (08:54 +1300)]
Merge pull request #13577 from mattwire/codecleanup

Fix typo and space

5 years agoCRM-17238, Dedupe for Individual Birth Date Results in Error
Pradeep Nayak [Thu, 15 Nov 2018 18:20:35 +0000 (23:50 +0530)]
CRM-17238, Dedupe for Individual Birth Date Results in Error

dev/core#397 fix fatal error on birth_date dedupe

5 years agoBump minimum upgradable ver to 4.2.9
Coleman Watts [Tue, 12 Feb 2019 16:12:34 +0000 (11:12 -0500)]
Bump minimum upgradable ver to 4.2.9

5 years agoCode cleanup
Matthew Wire (MJW Consulting) [Tue, 12 Feb 2019 10:53:04 +0000 (10:53 +0000)]
Code cleanup

5 years agoRemove unused variable from getPartialPaymentWithType
eileen [Mon, 11 Feb 2019 04:35:56 +0000 (17:35 +1300)]
Remove unused variable from getPartialPaymentWithType

5 years agoMerge pull request #13576 from civicrm/5.11
Eileen McNaughton [Tue, 12 Feb 2019 02:23:48 +0000 (15:23 +1300)]
Merge pull request #13576 from civicrm/5.11

5.11 to master

5 years agoMerge pull request #13575 from seamuslee001/5_10_1_release_notes_11
Eileen McNaughton [Tue, 12 Feb 2019 02:23:03 +0000 (15:23 +1300)]
Merge pull request #13575 from seamuslee001/5_10_1_release_notes_11

Release notes for 5.10.1 release

5 years agoMerge pull request #13572 from eileenmcnaughton/cc_511
Seamus Lee [Mon, 11 Feb 2019 22:46:38 +0000 (09:46 +1100)]
Merge pull request #13572 from eileenmcnaughton/cc_511

Fix regression whereby making receive_date required breaks back offic…

5 years agoRelease notes for 5.10.1 release
Seamus Lee [Mon, 11 Feb 2019 21:09:03 +0000 (08:09 +1100)]
Release notes for 5.10.1 release

5 years agodev/report#7 fix trxn_date on bookkeeping report
eileen [Mon, 11 Feb 2019 20:19:33 +0000 (09:19 +1300)]
dev/report#7 fix trxn_date on bookkeeping report

5 years agoMerge pull request #13564 from seamuslee001/remove_free_campaign_case
Eileen McNaughton [Mon, 11 Feb 2019 20:50:13 +0000 (09:50 +1300)]
Merge pull request #13564 from seamuslee001/remove_free_campaign_case

Remove hurty free calls from campaign and case

5 years agoFix regression whereby making receive_date required breaks back office cc
eileen [Mon, 11 Feb 2019 20:16:22 +0000 (09:16 +1300)]
Fix regression whereby making receive_date required breaks back office cc

Regression from https://lab.civicrm.org/dev/core/issues/680
led to https://civicrm.stackexchange.com/questions/28410/unable-to-take-credit-card-payment-after-civi-update

5 years agodev/core/issues/714, Inline edit should be disabled if user doesn't have edit group...
Pradeep Nayak [Mon, 11 Feb 2019 20:43:23 +0000 (20:43 +0000)]
dev/core/issues/714, Inline edit should be disabled if user doesn't have edit group permission

5 years agoRemove activitystatus js. Add submitOnce handler for activity create
Matthew Wire (MJW Consulting) [Fri, 21 Dec 2018 12:11:24 +0000 (12:11 +0000)]
Remove activitystatus js. Add submitOnce handler for activity create