civicrm-core.git
7 years agoCRM-20207 Added invocation for selectWhereClause hook in activity SQL
Edsel [Thu, 2 Mar 2017 11:48:08 +0000 (17:18 +0530)]
CRM-20207 Added invocation for selectWhereClause hook in activity SQL

----------------------------------------
* CRM-20207: Introduce selectWhereClause hook for activity results on activity tab contact summary page
  https://issues.civicrm.org/jira/browse/CRM-20207

7 years agoMerge pull request #10106 from eileenmcnaughton/index
Eileen McNaughton [Wed, 5 Apr 2017 04:25:04 +0000 (16:25 +1200)]
Merge pull request #10106 from eileenmcnaughton/index

CRM-20312 Add indices to DAO classes

7 years ago CRM-20312 regenerated DAOS with indexes
Aidan Saunders [Wed, 5 Apr 2017 03:05:06 +0000 (15:05 +1200)]
 CRM-20312 regenerated DAOS with indexes

7 years agoCRM-20312 Add indices to DAO classes
Aidan Saunders [Tue, 4 Apr 2017 22:56:29 +0000 (10:56 +1200)]
CRM-20312 Add indices to DAO classes

7 years agoMerge pull request #10108 from eileenmcnaughton/localizable
Eileen McNaughton [Wed, 5 Apr 2017 02:14:17 +0000 (14:14 +1200)]
Merge pull request #10108 from eileenmcnaughton/localizable

CRM-20312 add field localisation data to DAO.  …

7 years agoCRM-20312 regenerated DAO with localisation
Aidan Saunders [Wed, 5 Apr 2017 01:27:34 +0000 (13:27 +1200)]
CRM-20312 regenerated DAO with localisation

7 years agoCRM-20312 add field localisation data to DAO.
Aidan Saunders [Wed, 5 Apr 2017 01:19:50 +0000 (13:19 +1200)]
CRM-20312 add field localisation data to DAO.

Towards index reconciliation

7 years agoMerge pull request #10107 from eileenmcnaughton/index_tidy
Eileen McNaughton [Wed, 5 Apr 2017 00:38:24 +0000 (12:38 +1200)]
Merge pull request #10107 from eileenmcnaughton/index_tidy

Minor spelling & casing  tidy ups

7 years agoMinor spelling & casing tidy ups
Aidan Saunders [Tue, 4 Apr 2017 23:09:41 +0000 (11:09 +1200)]
Minor spelling & casing  tidy ups

7 years agoMerge pull request #9616 from ErichBSchulz/feature/drupal_boot_no_exit
Tim Otten [Tue, 4 Apr 2017 19:05:35 +0000 (12:05 -0700)]
Merge pull request #9616 from ErichBSchulz/feature/drupal_boot_no_exit

Feature/drupal boot no exit

7 years agoMerge pull request #10036 from jitendrapurohit/CRM-20329
Monish Deb [Tue, 4 Apr 2017 12:24:39 +0000 (17:54 +0530)]
Merge pull request #10036 from jitendrapurohit/CRM-20329

CRM-20329: Backend Membership with Payment set to Failed results in M…

7 years agoMerge pull request #10101 from eileenmcnaughton/contribution
Eileen McNaughton [Tue, 4 Apr 2017 06:54:09 +0000 (18:54 +1200)]
Merge pull request #10101 from eileenmcnaughton/contribution

CRM-20379 move payment details above less important info

7 years agoMerge pull request #10100 from seamuslee001/CRM-19961-schema
Eileen McNaughton [Tue, 4 Apr 2017 06:02:57 +0000 (18:02 +1200)]
Merge pull request #10100 from seamuslee001/CRM-19961-schema

CRM-19961 Schema changes to make sms provider multisite aware

7 years agoCRM-20379 move payment details above less important info
eileen [Tue, 4 Apr 2017 05:49:12 +0000 (17:49 +1200)]
CRM-20379 move payment details above less important info

7 years agoMerge pull request #9371 from seamuslee001/CRM-19633
Eileen McNaughton [Tue, 4 Apr 2017 05:23:01 +0000 (17:23 +1200)]
Merge pull request #9371 from seamuslee001/CRM-19633

CRM-19633 Allow for Contribution pages to be viewed from any domain in a multisite setup

7 years agoCRM-19961 Schema changes to make sms provider multisite aware
Seamus Lee [Tue, 4 Apr 2017 04:51:31 +0000 (14:51 +1000)]
CRM-19961 Schema changes to make sms provider multisite aware

7 years agoAlter var and comment as per Eileen
Seamus Lee [Tue, 4 Apr 2017 04:27:48 +0000 (14:27 +1000)]
Alter var and comment as per Eileen

7 years agoEnsure we clear out the cache just to be sure
Seamus Lee [Thu, 10 Nov 2016 20:25:30 +0000 (07:25 +1100)]
Ensure we clear out the cache just to be sure

Fix docblock

7 years agoRetrieve all pamyent processors if we have had an id passed in as most likely coming...
Seamus Lee [Thu, 10 Nov 2016 20:23:36 +0000 (07:23 +1100)]
Retrieve all pamyent processors if we have had an id passed in as most likely coming from a contribution form

7 years agoMerge pull request #9724 from civicrm/michaelmcandrew-CRM-19921
Eileen McNaughton [Tue, 4 Apr 2017 04:20:53 +0000 (16:20 +1200)]
Merge pull request #9724 from civicrm/michaelmcandrew-CRM-19921

CRM-19921

7 years agoMerge pull request #9960 from colemanw/CRM-20029
Eileen McNaughton [Tue, 4 Apr 2017 03:20:47 +0000 (15:20 +1200)]
Merge pull request #9960 from colemanw/CRM-20029

CRM-20029 - Copy custom files when duplicating an event

7 years agoMerge pull request #10040 from jaapjansma/CRM-20333
Eileen McNaughton [Tue, 4 Apr 2017 03:16:34 +0000 (15:16 +1200)]
Merge pull request #10040 from jaapjansma/CRM-20333

Fixed CRM-20333: search menu visible even when a user does not has access to any contacts.

7 years agoMerge pull request #10094 from mattwire/updatesubscription_fatal
Eileen McNaughton [Mon, 3 Apr 2017 22:21:31 +0000 (10:21 +1200)]
Merge pull request #10094 from mattwire/updatesubscription_fatal

CRM-20374 Be a bit more friendly rather than crashing with fatal when we can't …

7 years agoMerge pull request #10097 from jmcclelland/CRM-20378
Eileen McNaughton [Mon, 3 Apr 2017 22:05:40 +0000 (10:05 +1200)]
Merge pull request #10097 from jmcclelland/CRM-20378

Crm 20378 - simplify SurveyDetail report - improve line breaks in PDF, etc.

7 years agoCRM-20378 - populate select aliases so totals in parens work
Jamie McClelland [Mon, 3 Apr 2017 20:26:12 +0000 (16:26 -0400)]
CRM-20378 - populate select aliases so totals in parens work

Without populating this variable, we get empty () when grouping.

7 years agoCRM-20378 - use Form.php to handle page breaks
Jamie McClelland [Mon, 3 Apr 2017 20:23:09 +0000 (16:23 -0400)]
CRM-20378 - use Form.php to handle page breaks

The only reason to override postProcess is for the page breaks
and for the custom cover sheet. We can handle the cover sheet
in compileContent and Form.php handles the page breaks for us.

7 years agoMerge pull request #10049 from twomice/CRM-19400_osm_tileserver
Eileen McNaughton [Mon, 3 Apr 2017 19:54:09 +0000 (07:54 +1200)]
Merge pull request #10049 from twomice/CRM-19400_osm_tileserver

CRM-19400: Use Carto tileserver for OpenStreetMap.

7 years agoBe a bit more friendly rather than crashing with fatal when we can't update the subsc...
Matthew Wire [Mon, 3 Apr 2017 14:15:41 +0000 (15:15 +0100)]
Be a bit more friendly rather than crashing with fatal when we can't update the subscription

7 years agoMerge pull request #10091 from eileenmcnaughton/trans
Eileen McNaughton [Mon, 3 Apr 2017 07:46:37 +0000 (19:46 +1200)]
Merge pull request #10091 from eileenmcnaughton/trans

CRM-20371 set is_transaction on best-effort attempt to create members…

7 years agoCRM-20371 set is_transaction on best-effort attempt to create membership payment
eileenmcnaugton [Mon, 3 Apr 2017 04:10:41 +0000 (16:10 +1200)]
CRM-20371 set is_transaction on best-effort attempt to create membership payment

7 years agoMerge pull request #10090 from fuzionnz/CRM-19967-contact_query_docs
Eileen McNaughton [Mon, 3 Apr 2017 01:23:08 +0000 (13:23 +1200)]
Merge pull request #10090 from fuzionnz/CRM-19967-contact_query_docs

CRM-19967 contact query docs

7 years agoTheoretically harmless docs fixes and rearrangement of MODE_* contstants.
Chris Burgess [Fri, 3 Feb 2017 19:13:50 +0000 (08:13 +1300)]
Theoretically harmless docs fixes and rearrangement of MODE_* contstants.

7 years agoLink to CRM-19967 in function docs.
Chris Burgess [Sun, 2 Apr 2017 22:11:33 +0000 (10:11 +1200)]
Link to CRM-19967 in function docs.

7 years agoCRM-19967: Proposed docs improvements.
Chris Burgess [Fri, 3 Feb 2017 19:12:56 +0000 (08:12 +1300)]
CRM-19967: Proposed docs improvements.

Conflicts:
CRM/Contact/BAO/Query.php

7 years agoMerge pull request #10088 from lcdservices/CRM-20369
Eileen McNaughton [Sun, 2 Apr 2017 05:28:33 +0000 (17:28 +1200)]
Merge pull request #10088 from lcdservices/CRM-20369

CRM-20369

7 years agoCRM-20369 code cleanup
Brian Shaughnessy [Sun, 2 Apr 2017 02:25:52 +0000 (22:25 -0400)]
CRM-20369 code cleanup

7 years agoCRM-20369 mailing detail report
Brian Shaughnessy [Sun, 2 Apr 2017 02:18:17 +0000 (22:18 -0400)]
CRM-20369 mailing detail report

7 years agoCRM-20369 mailing opened report
Brian Shaughnessy [Sun, 2 Apr 2017 02:15:15 +0000 (22:15 -0400)]
CRM-20369 mailing opened report

7 years agoCRM-20369 mailing summary report
Brian Shaughnessy [Sun, 2 Apr 2017 02:12:49 +0000 (22:12 -0400)]
CRM-20369 mailing summary report

7 years agoCRM-20369 mailing clicks report
Brian Shaughnessy [Sun, 2 Apr 2017 02:11:37 +0000 (22:11 -0400)]
CRM-20369 mailing clicks report

7 years agoCRM-20369 mailing bounce report
Brian Shaughnessy [Sun, 2 Apr 2017 01:59:56 +0000 (21:59 -0400)]
CRM-20369 mailing bounce report

7 years agoMerge pull request #10058 from colemanw/CRM-20345
colemanw [Sat, 1 Apr 2017 04:13:35 +0000 (00:13 -0400)]
Merge pull request #10058 from colemanw/CRM-20345

CRM-20345 - Case API - Sort by client & addtimeline action

7 years agoCRM-20345 - CRM_Utils_SQL_Select::orderBy() (#4)
Tim Otten [Sat, 1 Apr 2017 01:59:44 +0000 (18:59 -0700)]
CRM-20345 - CRM_Utils_SQL_Select::orderBy() (#4)

* CRM-20345 - CRM_Utils_Array::crmArraySortByField - Add test. Allow multiple fields.

* CRM-20345 - CRM_Utils_SQL_Select::orderBy - Use more deterministic ordering

The technique of computing default `$weight = count($this->orderBys)`
addresses a valid point: we need to preserve ordering for existing callers
who don't specify weights -- while also allowing weights.

However, it feels weird in my gut. Not sure why -- maybe it's something like this:

```php
// A1: Non-deterministic ordering
$select->orderBy('alpha', 1);
$select->orderBy('beta');
$select->orderBy('delta', 2);
$select->orderBy('gamma', 3);

// A2: Deterministic ordering
$select->orderBy('alpha', 10);
$select->orderBy('beta');
$select->orderBy('delta', 20);
$select->orderBy('gamma', 30);

// B1: Deterministic ordering
$select->orderBy('alpha');
$select->orderBy('beta');
$select->orderBy('delta');
$select->orderBy('gamma');

// B2: Non-deterministic ordering
$select->orderBy('alpha', 1);
$select->orderBy('beta', 1);
$select->orderBy('delta', 1);
$select->orderBy('gamma', 1);
```

As a reader, I would expect A1/A2 to be the same, and I would expect B1/B2
to be the same.  But they're not.  If there's a collision in the `weight`s,
the ordering becomes non-deterministic (depending on obscure details or
happenstance of the PHP runtime).

Of course, there's no right answer: in A1/A2, you can plausibly put `beta`
before `alpha` or after `alpha` or after `gamma`.  But it should be
determinstic so that it always winds up in the same place.

7 years agoMerge pull request #10086 from JMAConsulting/CRM-20367
colemanw [Sat, 1 Apr 2017 00:00:17 +0000 (20:00 -0400)]
Merge pull request #10086 from JMAConsulting/CRM-20367

CRM-20367: Add wrapper function for adding and dropping Index in Upgrder

7 years agoCRM-20367: Add wrapper function for adding and dropping Index in Upgrader
deb.monish [Fri, 31 Mar 2017 19:49:27 +0000 (01:19 +0530)]
CRM-20367: Add wrapper function for adding and dropping Index in Upgrader

7 years agoMerge pull request #10083 from JMAConsulting/CRM-19715-2
Eileen McNaughton [Thu, 30 Mar 2017 23:24:04 +0000 (12:24 +1300)]
Merge pull request #10083 from JMAConsulting/CRM-19715-2

CRM-19715, added upgrade script to delete current_period_opening_bala…

7 years agoCRM-19715, added upgrade script to delete current_period_opening_balance and opening_...
Pradeep Nayak [Thu, 30 Mar 2017 21:56:50 +0000 (03:26 +0530)]
CRM-19715, added upgrade script to delete current_period_opening_balance and opening_balance if they are <> 0

----------------------------------------
* CRM-19715: Remove Close Accounting Period code
  https://issues.civicrm.org/jira/browse/CRM-19715

7 years agoMerge pull request #10006 from JMAConsulting/CRM-20022
Monish Deb [Thu, 30 Mar 2017 05:13:25 +0000 (10:43 +0530)]
Merge pull request #10006 from JMAConsulting/CRM-20022

CRM-20022 Extended function to support multiple batch labels

7 years agoMerge pull request #10055 from jitendrapurohit/CRM-20344
Eileen McNaughton [Thu, 30 Mar 2017 01:54:22 +0000 (14:54 +1300)]
Merge pull request #10055 from jitendrapurohit/CRM-20344

CRM-20344: Make 'Member Since' displayed on membership tabs for Inac…

7 years agoCRM-20345 - Don't be tripped up by deleted contacts or inactive relationships
Coleman Watts [Thu, 30 Mar 2017 00:29:24 +0000 (20:29 -0400)]
CRM-20345 - Don't be tripped up by deleted contacts or inactive relationships

7 years agoMerge pull request #10041 from mlutfy/master-crm20336
Eileen McNaughton [Wed, 29 Mar 2017 23:15:24 +0000 (12:15 +1300)]
Merge pull request #10041 from mlutfy/master-crm20336

CRM-20336: Failed contributions should be set as failed, not left as pending

7 years agoMerge pull request #10065 from colemanw/CRM-19778
Eileen McNaughton [Wed, 29 Mar 2017 22:46:39 +0000 (11:46 +1300)]
Merge pull request #10065 from colemanw/CRM-19778

CRM-19778 - Improve layout of caseType config UI

7 years agoMerge pull request #9974 from JMAConsulting/CRM-19715-2
Eileen McNaughton [Wed, 29 Mar 2017 22:44:21 +0000 (11:44 +1300)]
Merge pull request #9974 from JMAConsulting/CRM-19715-2

CRM-19715 (IIDA-96), removed opening_balance and current_period_openi…

7 years agoMerge pull request #10071 from eileenmcnaughton/dedup_4
Eileen McNaughton [Wed, 29 Mar 2017 22:42:59 +0000 (11:42 +1300)]
Merge pull request #10071 from eileenmcnaughton/dedup_4

CRM-20357 remove unused Finder::dupesOfContact function.

7 years agoCRM-20336: Failed contributions should be set as failed, not left as pending (cleanup)
Mathieu Lutfy [Wed, 29 Mar 2017 22:10:56 +0000 (18:10 -0400)]
CRM-20336: Failed contributions should be set as failed, not left as pending (cleanup)

7 years agoCRM-19715 (IIDA-96), removed opening_balance and current_period_opening_balance field...
Pradeep Nayak [Mon, 13 Mar 2017 14:22:22 +0000 (19:52 +0530)]
CRM-19715 (IIDA-96), removed opening_balance and current_period_opening_balance field from civicrm_financial_account table and code

----------------------------------------
* CRM-19715:
  https://issues.civicrm.org/jira/browse/CRM-19715

CRM-19715, added DAO changes

----------------------------------------
* CRM-19715: Remove Close Accounting Period code
  https://issues.civicrm.org/jira/browse/CRM-19715

CRM-19715, removed upgrade code to drop fields from civicrm_financial_account table

----------------------------------------
* CRM-19715: Remove Close Accounting Period code
  https://issues.civicrm.org/jira/browse/CRM-19715

7 years agoMerge pull request #9985 from JMAConsulting/CRM-19715-4
Eileen McNaughton [Wed, 29 Mar 2017 21:25:22 +0000 (10:25 +1300)]
Merge pull request #9985 from JMAConsulting/CRM-19715-4

CRM-19715 (IIDA-96), Removed Close Accounting Period Activity Type

7 years agoCRM-20336: Failed contributions should be set as failed, not left as pending (more...
Mathieu Lutfy [Wed, 29 Mar 2017 20:33:35 +0000 (16:33 -0400)]
CRM-20336: Failed contributions should be set as failed, not left as pending (more test fixes).

7 years agoMerge pull request #10077 from JMAConsulting/CRM-19715-5
Eileen McNaughton [Wed, 29 Mar 2017 20:23:02 +0000 (09:23 +1300)]
Merge pull request #10077 from JMAConsulting/CRM-19715-5

CRM-19715, fixed api test so that its not affected by any deletion of…

7 years agoMerge pull request #10078 from colemanw/Icons
Eileen McNaughton [Wed, 29 Mar 2017 20:21:58 +0000 (09:21 +1300)]
Merge pull request #10078 from colemanw/Icons

Icons for attachments

7 years agoMerge pull request #10069 from eileenmcnaughton/dedup_2
Eileen McNaughton [Wed, 29 Mar 2017 20:18:30 +0000 (09:18 +1300)]
Merge pull request #10069 from eileenmcnaughton/dedup_2

Towards CRM-20328 remove another call to the duplicate code

7 years agoMerge pull request #10070 from eileenmcnaughton/dedup_3
Eileen McNaughton [Wed, 29 Mar 2017 20:17:58 +0000 (09:17 +1300)]
Merge pull request #10070 from eileenmcnaughton/dedup_3

CRM-20328 code rationalisation on calling dedupe code

7 years agoMerge pull request #10046 from JMAConsulting/CRM-20332
Eileen McNaughton [Wed, 29 Mar 2017 20:08:58 +0000 (09:08 +1300)]
Merge pull request #10046 from JMAConsulting/CRM-20332

CRM-20332 Added support for third column of actions list to be modifi…

7 years agoMerge pull request #8525 from twomice/CRM-18251b
Eileen McNaughton [Wed, 29 Mar 2017 19:57:41 +0000 (08:57 +1300)]
Merge pull request #8525 from twomice/CRM-18251b

CRM-18251 - Domain stats and VersionCheck

7 years agoCRM-20336: Failed contributions should be set as failed, not left as pending (fix...
Mathieu Lutfy [Wed, 29 Mar 2017 19:50:54 +0000 (15:50 -0400)]
CRM-20336: Failed contributions should be set as failed, not left as pending (fix the test).

7 years agoIcons for attachments
Coleman Watts [Wed, 29 Mar 2017 18:11:36 +0000 (14:11 -0400)]
Icons for attachments

7 years agoMerge pull request #9729 from eileenmcnaughton/cust_date
colemanw [Wed, 29 Mar 2017 16:28:51 +0000 (12:28 -0400)]
Merge pull request #9729 from eileenmcnaughton/cust_date

CRM-20012, CRM-19490 (now merged & closed), CRM-18387(merged& closed), CRM-20011 (in separate pr), CRM-15948(resolved by arlready-merged-part), CRM-19911 profile date fixes & code improvement

7 years agoCRM-19715, Removed Close Accounting Period Activity Type
Pradeep Nayak [Wed, 15 Mar 2017 07:07:24 +0000 (12:37 +0530)]
CRM-19715, Removed Close Accounting Period Activity Type

----------------------------------------
* CRM-19715: Remove Close Accounting Period code
  https://issues.civicrm.org/jira/browse/CRM-19715

CRM-19715, updated sql to delete activity type if not present

----------------------------------------
* CRM-19715: Remove Close Accounting Period code
  https://issues.civicrm.org/jira/browse/CRM-19715

CRM-19715, removed cruft

----------------------------------------
* CRM-19715: Remove Close Accounting Period code
  https://issues.civicrm.org/jira/browse/CRM-19715

7 years agoCRM-19715, fixed api test so that its not affected by any deletion of activity types...
Pradeep Nayak [Wed, 29 Mar 2017 14:53:02 +0000 (20:23 +0530)]
CRM-19715, fixed api test so that its not affected by any deletion of activity types from core

----------------------------------------
* CRM-19715: Remove Close Accounting Period code
  https://issues.civicrm.org/jira/browse/CRM-19715

7 years agoMerge pull request #10064 from eileenmcnaughton/dedup_tidy
Eileen McNaughton [Wed, 29 Mar 2017 10:18:03 +0000 (23:18 +1300)]
Merge pull request #10064 from eileenmcnaughton/dedup_tidy

Towards CRM-20328 remove duplicate code, towards taking extension fro…

7 years agoCRM-20328 further fix on deprected duplicate code.
eileen [Wed, 29 Mar 2017 07:34:24 +0000 (20:34 +1300)]
CRM-20328 further fix on deprected duplicate code.

Remove parameters only passed in in unit tests. This deprecated function is called from
only one place, so reduce parameters & testing to reflect. Remove test
that duplicates other test aside from deprecated paramter

7 years agoMerge pull request #10076 from eileenmcnaughton/master
Eileen McNaughton [Wed, 29 Mar 2017 06:58:06 +0000 (19:58 +1300)]
Merge pull request #10076 from eileenmcnaughton/master

Merge to master from 4.7.18rc

7 years agoMerge branch '4.7.18-rc' of https://github.com/civicrm/civicrm-core
eileen [Wed, 29 Mar 2017 06:55:44 +0000 (19:55 +1300)]
Merge branch '4.7.18-rc' of https://github.com/civicrm/civicrm-core

7 years agoEmpty merge commit to mark 4.7.18-rc merged.
eileen [Wed, 29 Mar 2017 06:54:25 +0000 (19:54 +1300)]
Empty merge commit to mark 4.7.18-rc merged.

Somehow we lost the merged marker with a cherry pick.

Have used merge -s ours d46d3ea to grab these as empty-but-merged

7 years agoMerge pull request #10061 from eileenmcnaughton/fatal
Eileen McNaughton [Wed, 29 Mar 2017 06:46:38 +0000 (19:46 +1300)]
Merge pull request #10061 from eileenmcnaughton/fatal

CRM-20347 Fatal error on delete participant record with related contr…

7 years agoMerge from 4.7.18rc to master (#10075)
Eileen McNaughton [Wed, 29 Mar 2017 06:46:07 +0000 (19:46 +1300)]
Merge from 4.7.18rc to master (#10075)

* Minor test tidy up.

(this is actually because we need a commit to do a merge to master after the same commit was merged to both).

* CRM-20342: add 'view' Api action

* CRM-19385 revert changes to order by id on prevnext_cache.

After PR #10019 was merged @bhahumanists reported on #9801 that smart group ordering was broken. The
report is lacking detail and I could not replicate it, but am reverting the search changes for safety.

After this revert sites can still experiment with dropping/altering the primary key on
-civicrm_cache
-civicrm_group_contact_cache
-civicrm_acl_cache

But not civicrm_prevnext_cache.

Although I could not replicate the search issue it seems to me that our Ubuntu test suite
is failing where the other one is not on search-related items, suggesting that
for some reason Ubuntu does not default to the natural search order, due to
some config or other difference

7 years agoMerge pull request #10073 from eileenmcnaughton/4.7.18-rc
Eileen McNaughton [Wed, 29 Mar 2017 06:31:58 +0000 (19:31 +1300)]
Merge pull request #10073 from eileenmcnaughton/4.7.18-rc

CRM-19385 revert changes to order by id on prevnext_cache.

7 years agoCRM-20347 fix for fatal on view records from participant
eileen [Wed, 29 Mar 2017 06:26:56 +0000 (19:26 +1300)]
CRM-20347 fix for fatal on view records from participant

7 years agoMerge pull request #10074 from eileenmcnaughton/master
Eileen McNaughton [Wed, 29 Mar 2017 06:03:39 +0000 (19:03 +1300)]
Merge pull request #10074 from eileenmcnaughton/master

Merge from 4.7.18rc

7 years agoFix merge head on master.
eileen [Wed, 29 Mar 2017 05:58:08 +0000 (18:58 +1300)]
Fix merge head on master.

Master is treating some 4.7.18-rc commits as unmerged. This just marks as merged : Merge commit '58025217985f3c8cf'

7 years agoCRM-19385 revert changes to order by id on prevnext_cache.
eileen [Wed, 29 Mar 2017 05:51:24 +0000 (18:51 +1300)]
CRM-19385 revert changes to order by id on prevnext_cache.

After PR #10019 was merged @bhahumanists reported on #9801 that smart group ordering was broken. The
report is lacking detail and I could not replicate it, but am reverting the search changes for safety.

After this revert sites can still experiment with dropping/altering the primary key on
-civicrm_cache
-civicrm_group_contact_cache
-civicrm_acl_cache

But not civicrm_prevnext_cache.

Although I could not replicate the search issue it seems to me that our Ubuntu test suite
is failing where the other one is not on search-related items, suggesting that
for some reason Ubuntu does not default to the natural search order, due to
some config or other difference

7 years agoCRM-20345 - Allow weight to be specified for an orderBy
Coleman Watts [Wed, 29 Mar 2017 04:48:38 +0000 (00:48 -0400)]
CRM-20345 - Allow weight to be specified for an orderBy

Functions wishing to extend & override an api sort properties can use the placeholder (1)
to maintain sort param order.

7 years agoCRM-20345 - Fix retrieval of primary client
Coleman Watts [Wed, 29 Mar 2017 03:22:00 +0000 (23:22 -0400)]
CRM-20345 - Fix retrieval of primary client

7 years agoCRM-20345 - Remove undefined variable
Coleman Watts [Wed, 29 Mar 2017 02:53:45 +0000 (22:53 -0400)]
CRM-20345 - Remove undefined variable

7 years agoCRM-20355 - Add Case.addtimeline action
Coleman Watts [Wed, 29 Mar 2017 01:28:57 +0000 (21:28 -0400)]
CRM-20355 - Add Case.addtimeline action

7 years agoCRM-20345 - Add integration point for extending api.Case.get
Coleman Watts [Mon, 27 Mar 2017 19:51:26 +0000 (15:51 -0400)]
CRM-20345 - Add integration point for extending api.Case.get

This could be a good addition every api.get function.

7 years agoCRM-20345 - Case API - Sort by client
Coleman Watts [Mon, 27 Mar 2017 19:46:08 +0000 (15:46 -0400)]
CRM-20345 - Case API - Sort by client

7 years agoCRM-20357 remove unused Finder::dupesOfContact function.
eileen [Wed, 29 Mar 2017 01:57:55 +0000 (14:57 +1300)]
CRM-20357 remove unused Finder::dupesOfContact function.

I can find no evidence this function is used anywhere

7 years agoTowards CRM-20328 remove another call to the duplicate code
eileen [Tue, 28 Mar 2017 21:01:36 +0000 (10:01 +1300)]
Towards CRM-20328 remove another call to the duplicate code

7 years agoCRM-20328 code rationalisation on calling dedupe code
eileen [Tue, 28 Mar 2017 21:28:54 +0000 (10:28 +1300)]
CRM-20328 code rationalisation on calling dedupe code

7 years agoTowards CRM-20328 remove over-loading from checkRegistration function
eileen [Tue, 28 Mar 2017 20:57:02 +0000 (09:57 +1300)]
Towards CRM-20328 remove over-loading from checkRegistration function

7 years agoTowards CRM-20328 extract dedupe code to function
eileen [Tue, 28 Mar 2017 20:53:01 +0000 (09:53 +1300)]
Towards CRM-20328 extract dedupe code to function

7 years agoTowards CRM-20328 remove duplicate code, towards taking extension from core
eileen [Mon, 27 Mar 2017 01:06:27 +0000 (14:06 +1300)]
Towards CRM-20328 remove duplicate code, towards taking extension from core

7 years agoMerge pull request #10067 from twomice/CRM-20350_dont_escape_quotes
Eileen McNaughton [Tue, 28 Mar 2017 20:17:57 +0000 (09:17 +1300)]
Merge pull request #10067 from twomice/CRM-20350_dont_escape_quotes

CRM-20350: Don't escape double-quotes in icalendar.

7 years agoMerge pull request #9987 from JMAConsulting/CRM-20273
Eileen McNaughton [Tue, 28 Mar 2017 20:14:12 +0000 (09:14 +1300)]
Merge pull request #9987 from JMAConsulting/CRM-20273

CRM-20273 Added credit card type field for contribution details report

7 years agoCRM-20350: Don't escape double-quotes in icalendar.
Allen Shaw [Tue, 28 Mar 2017 16:51:43 +0000 (11:51 -0500)]
CRM-20350: Don't escape double-quotes in icalendar.

7 years agoCRM-19778 - Improve layout of caseType config UI
Coleman Watts [Tue, 28 Mar 2017 13:08:19 +0000 (09:08 -0400)]
CRM-19778 - Improve layout of caseType config UI

7 years agoCRM-20332 Modified function to prevent tampering with original menu
Edsel [Mon, 27 Mar 2017 12:34:47 +0000 (18:04 +0530)]
CRM-20332 Modified function to prevent tampering with original menu

----------------------------------------
* CRM-20332: Refactor summaryActions hook to allow user-defined actions in third column
  https://issues.civicrm.org/jira/browse/CRM-20332

7 years agoCRM-20332 Added support for third column of actions list to be modified by hook summa...
Edsel [Fri, 24 Mar 2017 12:57:17 +0000 (18:27 +0530)]
CRM-20332 Added support for third column of actions list to be modified by hook summaryActions

----------------------------------------
* CRM-20332: Refactor summaryActions hook to allow user-defined actions in third column
  https://issues.civicrm.org/jira/browse/CRM-20332

7 years agoCRM-20273 Fixed report to read from card type rather than credit card type
Edsel [Wed, 15 Mar 2017 12:10:02 +0000 (17:40 +0530)]
CRM-20273 Fixed report to read from card type rather than credit card type