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

5 years agoMerge pull request #13569 from colemanw/Fix
colemanw [Mon, 11 Feb 2019 16:56:33 +0000 (11:56 -0500)]
Merge pull request #13569 from colemanw/Fix

Fix contact ID help on advanced search

5 years agoFix contact ID help on advanced search
Coleman Watts [Mon, 11 Feb 2019 14:42:06 +0000 (09:42 -0500)]
Fix contact ID help on advanced search

5 years agoRemove hurty free calls from campaign and case
Seamus Lee [Mon, 11 Feb 2019 07:48:39 +0000 (18:48 +1100)]
Remove hurty free calls from campaign and case

5 years agoMerge pull request #13558 from eileenmcnaughton/balance_test
Seamus Lee [Mon, 11 Feb 2019 07:46:51 +0000 (18:46 +1100)]
Merge pull request #13558 from eileenmcnaughton/balance_test

Add unit test on getContributionBalance fn (#13187)

5 years agoMerge pull request #13560 from seamuslee001/free_activity_member
Seamus Lee [Mon, 11 Feb 2019 05:57:17 +0000 (16:57 +1100)]
Merge pull request #13560 from seamuslee001/free_activity_member

dev/core#562 Remove free calls from Activity and Member sections of CRM

5 years agoMerge pull request #13327 from pradpnayak/SerarchView
Eileen McNaughton [Mon, 11 Feb 2019 05:30:19 +0000 (18:30 +1300)]
Merge pull request #13327 from pradpnayak/SerarchView

Used buildoptions function to get all groups

5 years agoMerge pull request #13404 from pradpnayak/ReportActions
Eileen McNaughton [Mon, 11 Feb 2019 05:11:15 +0000 (18:11 +1300)]
Merge pull request #13404 from pradpnayak/ReportActions

Show Add to group on  create new report after refresh of result

5 years agoAdd unit test on getContributionBalance fn (#13187)
eileen [Mon, 11 Feb 2019 04:27:59 +0000 (17:27 +1300)]
Add unit test on getContributionBalance fn (#13187)

5 years agoRemove free calls from Activity and Member sections of CRM
Seamus Lee [Mon, 11 Feb 2019 01:20:11 +0000 (12:20 +1100)]
Remove free calls from Activity and Member sections of CRM

5 years agoMinor readability cleanup
eileen [Mon, 11 Feb 2019 03:54:14 +0000 (16:54 +1300)]
Minor readability cleanup

5 years agoMerge pull request #13287 from mattwire/eventregister_rename
Eileen McNaughton [Mon, 11 Feb 2019 00:49:16 +0000 (13:49 +1300)]
Merge pull request #13287 from mattwire/eventregister_rename

(REF) Rename variables and adjust variable definitions for Event Register form

5 years agoMerge pull request #13187 from JMAConsulting/payment_function
Eileen McNaughton [Sun, 10 Feb 2019 22:14:42 +0000 (11:14 +1300)]
Merge pull request #13187 from JMAConsulting/payment_function

Optimize CRM_Core_BAO_FinancialTrxn::getTotalPayment

5 years agoPreserve page padding on Joomla upgrade screen
Nicol [Sun, 10 Feb 2019 15:25:17 +0000 (15:25 +0000)]
Preserve page padding on Joomla upgrade screen

Fixes issue where padding was removed from the main Joomla admin screen in this commit - https://github.com/civicrm/civicrm-core/commit/6ada1cee014a8bd99e4778864c32c0c140c7a92e - removing padding on the upgrade screen.

5 years agoPreserves padding on upgrade screen.
Nicol [Sun, 10 Feb 2019 15:19:05 +0000 (15:19 +0000)]
Preserves padding on upgrade screen.

Padding was removed from the Joomla admin screen in this commit - https://github.com/civicrm/civicrm-core/commit/6ada1cee014a8bd99e4778864c32c0c140c7a92e - which removed all padding on the upgrade screen. Fix to add padding to that screen.

5 years agoMerge pull request #13555 from colemanw/loadScript
colemanw [Sat, 9 Feb 2019 05:26:12 +0000 (00:26 -0500)]
Merge pull request #13555 from colemanw/loadScript

CRM.loadScript improvements

5 years agoAdd angular util crmLoadScript
Coleman Watts [Sat, 9 Feb 2019 02:54:40 +0000 (21:54 -0500)]
Add angular util crmLoadScript

5 years agoAppend cache-buster to dynamically loaded scripts
Coleman Watts [Sat, 9 Feb 2019 02:54:20 +0000 (21:54 -0500)]
Append cache-buster to dynamically loaded scripts

5 years agoMerge pull request #13549 from pradpnayak/Qfill
Seamus Lee [Fri, 8 Feb 2019 03:52:22 +0000 (14:52 +1100)]
Merge pull request #13549 from pradpnayak/Qfill

dev/core/issues/700, Show Qill when searched using contact id

5 years agoMerge pull request #13333 from mattwire/buttons_submitOnce
colemanw [Thu, 7 Feb 2019 21:48:24 +0000 (16:48 -0500)]
Merge pull request #13333 from mattwire/buttons_submitOnce

Make submitOnce() button js into a button parameter

5 years agoMerge pull request #13529 from greenpeace-cee/fix-api-entity-permission
Monish Deb [Thu, 7 Feb 2019 13:34:26 +0000 (19:04 +0530)]
Merge pull request #13529 from greenpeace-cee/fix-api-entity-permission

dev/core#690 - Civi\API - Fix entity permission check for trusted calls

5 years agoSet version to 5.12.alpha1
CiviCRM [Thu, 7 Feb 2019 01:49:22 +0000 (01:49 +0000)]
Set version to 5.12.alpha1

5 years agoSet version to 5.11.beta1
CiviCRM [Thu, 7 Feb 2019 01:44:56 +0000 (01:44 +0000)]
Set version to 5.11.beta1

5 years agoMerge pull request #13552 from seamuslee001/master
Tim Otten [Thu, 7 Feb 2019 01:40:32 +0000 (20:40 -0500)]
Merge pull request #13552 from seamuslee001/master

Update 5.10.0.md

5 years agoUpdate 5.10.0.md
Tim Otten [Thu, 7 Feb 2019 00:30:09 +0000 (19:30 -0500)]
Update 5.10.0.md

5 years agoMerge pull request #13550 from civicrm/5.10
Seamus Lee [Wed, 6 Feb 2019 22:10:40 +0000 (09:10 +1100)]
Merge pull request #13550 from civicrm/5.10

5.10

5 years agoMerge pull request #13494 from agh1/5.10.0-releasenotes
Seamus Lee [Wed, 6 Feb 2019 20:47:11 +0000 (12:47 -0800)]
Merge pull request #13494 from agh1/5.10.0-releasenotes

5.10.0 release notes

5 years agoMerge pull request #13544 from pradpnayak/ContactImage
colemanw [Wed, 6 Feb 2019 18:01:47 +0000 (13:01 -0500)]
Merge pull request #13544 from pradpnayak/ContactImage

core/issues/698, send correct MIME type for .jpg files

5 years agodev/core/issues/700, Show Qill when searched using contact id
Pradeep Nayak [Wed, 6 Feb 2019 17:50:15 +0000 (17:50 +0000)]
dev/core/issues/700, Show Qill when searched using contact id

5 years ago5.10.0 release notes: late changes, credits, and last-minute fixes
Andrew Hunt [Wed, 6 Feb 2019 14:49:40 +0000 (09:49 -0500)]
5.10.0 release notes: late changes, credits, and last-minute fixes

5 years agoAdd release-notes/5.9.1.md
Tim Otten [Wed, 16 Jan 2019 22:12:16 +0000 (14:12 -0800)]
Add release-notes/5.9.1.md

5 years ago5.10.0 release notes: bulk of edits
Alice Frumin [Wed, 6 Feb 2019 14:29:08 +0000 (09:29 -0500)]
5.10.0 release notes: bulk of edits

* pulling out misc and organizing lines with gitlab issue numbers

* linking to gitlab issues

* update lines with gitlab issues to have the gitlab titles

* progress

* second pass

* finished first pass of notes

* deleting rows related to merge

* reorganizing sections

5 years ago5.10.0 release notes: added boilerplate
Andrew Hunt [Tue, 22 Jan 2019 19:05:14 +0000 (14:05 -0500)]
5.10.0 release notes: added boilerplate

5 years ago5.10.0 release notes: raw from script
Andrew Hunt [Tue, 22 Jan 2019 19:01:53 +0000 (14:01 -0500)]
5.10.0 release notes: raw from script

5 years agoMerge pull request #13548 from civicrm/5.10
Eileen McNaughton [Wed, 6 Feb 2019 04:19:03 +0000 (17:19 +1300)]
Merge pull request #13548 from civicrm/5.10

5.10 to master

5 years agoMerge pull request #13536 from eileenmcnaughton/export_sc
Monish Deb [Wed, 6 Feb 2019 04:16:32 +0000 (09:46 +0530)]
Merge pull request #13536 from eileenmcnaughton/export_sc

dev/core#651 Fix group by on export soft credits (possible recent regression, clearly wrong).

5 years agoMerge pull request #13547 from eileenmcnaughton/master
Eileen McNaughton [Wed, 6 Feb 2019 02:19:44 +0000 (15:19 +1300)]
Merge pull request #13547 from eileenmcnaughton/master

Re-run gencode for fix on PriceField DAO

5 years agoRe-run gencode for fix on PriceField DAO
eileen [Tue, 5 Feb 2019 22:22:03 +0000 (11:22 +1300)]
Re-run gencode for fix on PriceField DAO

5 years agoMerge pull request #13546 from civicrm/5.10
Eileen McNaughton [Tue, 5 Feb 2019 21:42:08 +0000 (10:42 +1300)]
Merge pull request #13546 from civicrm/5.10

5.10 to master

5 years agoAdded few more mime type that needs over-ride
Pradeep Nayak [Tue, 5 Feb 2019 19:40:36 +0000 (19:40 +0000)]
Added few more mime type that needs over-ride

5 years agoMerge pull request #13403 from pradpnayak/FieldLength
Eileen McNaughton [Tue, 5 Feb 2019 20:27:39 +0000 (09:27 +1300)]
Merge pull request #13403 from pradpnayak/FieldLength

Donot allow to enter more than max length of the field

5 years agodev/core#651 Fix group by on export soft credits (possible recent regression, clearly...
eileen [Tue, 5 Feb 2019 06:04:21 +0000 (19:04 +1300)]
dev/core#651 Fix group by on export soft credits (possible recent regression, clearly wrong).

As pointed out by the reporter the group by is being calculated as if it were a string but it's an array, this fixes.

This code has been touched recently so it might be a recent regression. 5.10 is the first release in a long time where
export is working in some mysql / output configs after a big refactor to get rid of wide temp tables

5 years agocore/issues/698, send correct MIME type for .jpg files
Pradeep Nayak [Tue, 5 Feb 2019 18:06:44 +0000 (18:06 +0000)]
core/issues/698, send correct MIME type for .jpg files

5 years agodev/core#690 - Civi\API - Add a check on entity_table existing
Patrick Figel [Tue, 5 Feb 2019 17:04:07 +0000 (18:04 +0100)]
dev/core#690 - Civi\API - Add a check on entity_table existing

This adds a check in DynamicFKAuthorization to verify that the
entity_table in the API request actually exists as a table.

Additionally, this changes a test case in api_v3_AttachmentTest to
enable permission checking. This is necessary because the change to
DynamicFKAuthorization means trusted API calls can now attach files
to *any* entity unless check_permissions is set, in which case it's
only possible for allowed delegates.

5 years agoCRM/Core - Fix isCoreTable to check for tables instead of classes
Patrick Figel [Tue, 5 Feb 2019 16:58:15 +0000 (17:58 +0100)]
CRM/Core - Fix isCoreTable to check for tables instead of classes

This fixes CRM_Core_DAO_AllCoreTables::isCoreTable to check for the
existence of tables instead of DAO classes. The method is used only
once in core, and the intention there is to look for table names,
so there should not be much risk of breakage.

5 years agoUse addField to generated form fields on Note form
Pradeep Nayak [Tue, 5 Feb 2019 16:14:33 +0000 (16:14 +0000)]
Use addField to generated form fields on Note form

5 years agoMerge pull request #13537 from eileenmcnaughton/cont_comp
Monish Deb [Tue, 5 Feb 2019 13:51:09 +0000 (19:21 +0530)]
Merge pull request #13537 from eileenmcnaughton/cont_comp

dev/core#680 make receive_date required on backoffice contribution form

5 years agoMerge pull request #13390 from MegaphoneJon/core-609
Monish Deb [Tue, 5 Feb 2019 13:50:19 +0000 (19:20 +0530)]
Merge pull request #13390 from MegaphoneJon/core-609

fixes core#609 - view 'Advanced Search' links without 'view all conta…

5 years agodev/core#684 - Case Manager not updating correctly
Jitendra Purohit [Mon, 4 Feb 2019 12:44:50 +0000 (18:14 +0530)]
dev/core#684 - Case Manager not updating correctly

5 years agodev/core#469 Fix Error on action 'Email - schedule/send via CiviMail' with multiple...
eileen [Tue, 5 Feb 2019 09:49:35 +0000 (22:49 +1300)]
dev/core#469 Fix Error on action 'Email - schedule/send via CiviMail' with multiple event names filter

Alternate fix to reverted https://github.com/civicrm/civicrm-core/pull/13250

5 years agodev/core#680 make receive_date required on backoffice contribution form
eileen [Tue, 5 Feb 2019 08:07:16 +0000 (21:07 +1300)]
dev/core#680 make receive_date required on backoffice contribution form
and api

Discussion on https://lab.civicrm.org/dev/core/issues/680#note_13205

5 years agoMerge pull request #13535 from civicrm/5.10
Eileen McNaughton [Tue, 5 Feb 2019 04:19:10 +0000 (17:19 +1300)]
Merge pull request #13535 from civicrm/5.10

5.10 to master

5 years agoMerge pull request #13533 from eileenmcnaughton/prev_next
Eileen McNaughton [Tue, 5 Feb 2019 04:18:40 +0000 (17:18 +1300)]
Merge pull request #13533 from eileenmcnaughton/prev_next

Prev next

5 years agoDisable full group by mode whe groupContacts is TRUE
eileen [Tue, 5 Feb 2019 01:58:53 +0000 (14:58 +1300)]
Disable full group by mode whe groupContacts is TRUE

This prevents an error when using the cache and allows us to move
past this without untangling the messy way other tables are joined back in
for now.

Note it became necessary due to query changes off the cache but the query is no
different in accuracy

5 years agodev/core#695 - Make custom searches slightly less fragile
Aidan Saunders [Mon, 4 Feb 2019 17:50:30 +0000 (17:50 +0000)]
dev/core#695 - Make custom searches slightly less fragile

5 years agodev/core#679 fix loss of search results when including tags or groups.
eileen [Mon, 4 Feb 2019 23:59:51 +0000 (12:59 +1300)]
dev/core#679 fix loss of search results when including tags or groups.

The bug as described was a bit tricksy to replicate as it is inconsistent and the
code is not actually outputting the tags/ groups. I think these are pre-existing issues

I was able to replicate by having 2 search profiles - one with only tags & one one with only groups & switching back & and force on output -  once I replicated I found that there was a regression due to

https://github.com/eileenmcnaughton/civicrm-core/commit/2ca46d4d5a8cd15929ac0939ca2bb380a3de027e#diff-e54381bfdf51e31cab376c71ca0d66ffR4967

whereby the groupBy had been dropped, causing the results to be squashed into a single row

5 years agoMerge pull request #12834 from pradpnayak/preRelHook
Eileen McNaughton [Mon, 4 Feb 2019 23:55:21 +0000 (12:55 +1300)]
Merge pull request #12834 from pradpnayak/preRelHook

Respect pre hook for relationship to alter id in $params

5 years agoMerge pull request #13526 from yashodha/number_widget
Eileen McNaughton [Mon, 4 Feb 2019 23:53:11 +0000 (12:53 +1300)]
Merge pull request #13526 from yashodha/number_widget

use number widget for weight and other numeric fields in more forms

5 years agoMerge pull request #13530 from pradpnayak/FieldLength-Activity
Eileen McNaughton [Mon, 4 Feb 2019 23:52:29 +0000 (12:52 +1300)]
Merge pull request #13530 from pradpnayak/FieldLength-Activity

Used field name defined in DAO file for Activity Subject

5 years agoMerge pull request #13532 from pradpnayak/xmlChanges
Eileen McNaughton [Mon, 4 Feb 2019 23:52:07 +0000 (12:52 +1300)]
Merge pull request #13532 from pradpnayak/xmlChanges

Add html type for civicrm_note.privacy field

5 years agoMerge pull request #13489 from totten/master-ro-cache
Eileen McNaughton [Mon, 4 Feb 2019 23:51:31 +0000 (12:51 +1300)]
Merge pull request #13489 from totten/master-ro-cache

(dev/core#635) Deprecate CRM_Core_BAO_Cache for I/O. Optionally redirect I/O to Redis or Memcache.

5 years agoMerge pull request #13522 from eileenmcnaughton/activity
colemanw [Mon, 4 Feb 2019 22:03:13 +0000 (17:03 -0500)]
Merge pull request #13522 from eileenmcnaughton/activity

Performance fix for alternate getActivity listing function

5 years agoRemove redundant css class from activity subject field
colemanw [Mon, 4 Feb 2019 21:38:42 +0000 (16:38 -0500)]
Remove redundant css class from activity subject field

This is now being automatically assigned thanks to the change in 6e9c7c7

5 years agoMerge pull request #13527 from JMAConsulting/core-693
colemanw [Mon, 4 Feb 2019 21:33:45 +0000 (16:33 -0500)]
Merge pull request #13527 from JMAConsulting/core-693

dev/core#693 : On contact summary page, on submitting a 'New Case' form doesn't redirect to 'Manage Case' screen

5 years agoCRM_Core_BAO_Cache - When delegating to an adapter, don't expect it to return a reference
Tim Otten [Mon, 4 Feb 2019 21:27:09 +0000 (16:27 -0500)]
CRM_Core_BAO_Cache - When delegating to an adapter, don't expect it to return a reference

This is following up on the code-review comments from
https://github.com/civicrm/civicrm-core/pull/13489#discussion_r252070543

5 years agouse name and label to retrive ID
Pradeep Nayak [Mon, 4 Feb 2019 21:04:56 +0000 (21:04 +0000)]
use name and label to retrive ID

5 years agoMerge pull request #13525 from civicrm/5.10
Eileen McNaughton [Mon, 4 Feb 2019 20:19:44 +0000 (09:19 +1300)]
Merge pull request #13525 from civicrm/5.10

5.10

5 years agoAdd html type for civicrm_note.privacy field
Pradeep Nayak [Mon, 4 Feb 2019 19:33:39 +0000 (19:33 +0000)]
Add html type for civicrm_note.privacy field