civicrm-core.git
6 years agoMerge pull request #11961 from colemanw/CRM-21843
Eileen McNaughton [Mon, 9 Apr 2018 19:41:19 +0000 (07:41 +1200)]
Merge pull request #11961 from colemanw/CRM-21843

CRM-21843 - Fix export of case activities

6 years agoMerge pull request #11958 from mlutfy/d8-bootstrap-user
colemanw [Mon, 9 Apr 2018 16:17:29 +0000 (12:17 -0400)]
Merge pull request #11958 from mlutfy/d8-bootstrap-user

Drupal8 loadBootStrap: fix user variable

6 years agoMerge pull request #11902 from mukeshcompucorp/fix-template-structure-issues
colemanw [Mon, 9 Apr 2018 13:53:47 +0000 (09:53 -0400)]
Merge pull request #11902 from mukeshcompucorp/fix-template-structure-issues

Fix template for widget

6 years agoCRM-21843 - Fix export of case activities
Coleman Watts [Mon, 9 Apr 2018 13:12:12 +0000 (09:12 -0400)]
CRM-21843 - Fix export of case activities

6 years agoMerge pull request #11377 from lcdservices/CRM-21523
colemanw [Mon, 9 Apr 2018 12:10:30 +0000 (08:10 -0400)]
Merge pull request #11377 from lcdservices/CRM-21523

CRM-21523 add form rule for repetition fields in scheduled reminder form

6 years agoMerge pull request #11959 from eileenmcnaughton/api_in_test
Eileen McNaughton [Mon, 9 Apr 2018 09:25:09 +0000 (21:25 +1200)]
Merge pull request #11959 from eileenmcnaughton/api_in_test

[nfc]  Consistently specify whether to clean money when calling from test suite

6 years agoMerge pull request #11957 from seamuslee001/core_53
Seamus Lee [Mon, 9 Apr 2018 08:49:07 +0000 (18:49 +1000)]
Merge pull request #11957 from seamuslee001/core_53

dev/Core#53 Add in stats to AB tests and add in clickthrough and open…

6 years agoConsistently specify whether to clean money when calling from test suite
eileen [Mon, 9 Apr 2018 04:39:30 +0000 (16:39 +1200)]
Consistently specify whether to clean money when calling from test suite

6 years agodev/Core#53 Add in stats to AB tests and add in clickthrough and opened % stats to...
Seamus Lee [Sat, 7 Apr 2018 22:22:52 +0000 (08:22 +1000)]
dev/Core#53 Add in stats to AB tests and add in clickthrough and opened % stats to mailing reports

Update Test following changes in stats function

Fixes following on from review

Further divide by zero fixes

6 years agoDrupal8 loadBootStrap: fix user variable.
Mathieu Lutfy [Mon, 9 Apr 2018 02:44:50 +0000 (22:44 -0400)]
Drupal8 loadBootStrap: fix user variable.

6 years agoCRM-21523 add form rule for repetition fields in scheduled reminder form
Brian Shaughnessy [Tue, 5 Dec 2017 20:27:47 +0000 (15:27 -0500)]
CRM-21523 add form rule for repetition fields in scheduled reminder form

6 years agoMerge pull request #11950 from mattwire/cust_data_tpl_extract
Eileen McNaughton [Thu, 5 Apr 2018 22:52:34 +0000 (10:52 +1200)]
Merge pull request #11950 from mattwire/cust_data_tpl_extract

Extract custom data edit template code to shared template

6 years agoMerge pull request #11900 from eileenmcnaughton/ref
Seamus Lee [Thu, 5 Apr 2018 20:37:36 +0000 (06:37 +1000)]
Merge pull request #11900 from eileenmcnaughton/ref

Simple function extraction on editing Address (within main contact edit)

6 years agoExtract custom data edit template code to shared template
Matthew Wire [Thu, 5 Apr 2018 16:44:03 +0000 (17:44 +0100)]
Extract custom data edit template code to shared template

6 years agoSet version to 5.2.alpha1
CiviCRM [Thu, 5 Apr 2018 06:57:04 +0000 (06:57 +0000)]
Set version to 5.2.alpha1

6 years agoSet version to 5.1.beta1
CiviCRM [Thu, 5 Apr 2018 06:51:50 +0000 (06:51 +0000)]
Set version to 5.1.beta1

6 years agoMerge pull request #11942 from civicrm/5.0
Eileen McNaughton [Wed, 4 Apr 2018 23:05:17 +0000 (11:05 +1200)]
Merge pull request #11942 from civicrm/5.0

5.0 merge to master

6 years agoMerge pull request #11924 from JMAConsulting/dev-42
Tim Otten [Wed, 4 Apr 2018 22:16:38 +0000 (15:16 -0700)]
Merge pull request #11924 from JMAConsulting/dev-42

(dev/mail/6) Fix recipient calculation when system has mixed records. Add multilingual test.

6 years agoMerge pull request #11941 from civicrm/5.0
Eileen McNaughton [Wed, 4 Apr 2018 19:06:35 +0000 (07:06 +1200)]
Merge pull request #11941 from civicrm/5.0

5.0 to master

6 years agoMerge pull request #11940 from agh1/5.0.0-release-notes-update
Eileen McNaughton [Wed, 4 Apr 2018 19:05:58 +0000 (07:05 +1200)]
Merge pull request #11940 from agh1/5.0.0-release-notes-update

5.0.0 release notes: last-minute change merged

6 years ago5.0.0 release notes: René Olivo works for CompuCorp
Andrew Hunt [Wed, 4 Apr 2018 16:06:10 +0000 (12:06 -0400)]
5.0.0 release notes: René Olivo works for CompuCorp

6 years ago5.0.0 release notes: last-minute change merged
Andrew Hunt [Wed, 4 Apr 2018 15:17:26 +0000 (11:17 -0400)]
5.0.0 release notes: last-minute change merged

6 years agoMerge pull request #11934 from eileenmcnaughton/fees
Monish Deb [Wed, 4 Apr 2018 14:41:11 +0000 (20:11 +0530)]
Merge pull request #11934 from eileenmcnaughton/fees

Fix fatal error when selecting a $0 price option in change fee selection

6 years agoMerge pull request #11930 from agh1/translate-phone-extension
Eileen McNaughton [Wed, 4 Apr 2018 13:13:44 +0000 (01:13 +1200)]
Merge pull request #11930 from agh1/translate-phone-extension

Phone: standardize appearance and translation of extension label

6 years agoMerge pull request #11884 from eileenmcnaughton/hold
Eileen McNaughton [Wed, 4 Apr 2018 13:04:33 +0000 (01:04 +1200)]
Merge pull request #11884 from eileenmcnaughton/hold

Tidy up on_hold handling in holdEmail function.

6 years agoMerge pull request #11935 from civicrm/5.0
Eileen McNaughton [Wed, 4 Apr 2018 10:16:33 +0000 (22:16 +1200)]
Merge pull request #11935 from civicrm/5.0

5.0 to master

6 years ago5.0.0 release notes (#11931)
Andrew Hunt [Wed, 4 Apr 2018 10:15:56 +0000 (06:15 -0400)]
5.0.0 release notes (#11931)

* 5.0.0 release notes: raw from script

* 5.0.0 release notes: starting from the top

* 5.0.0 release notes: finished features next steps start with bugs

* 5.0.0 release notes: a few more bugs

* 5.0.0 release notes: cleaning up

* 5.0.0 release notes: fixed up features and bugs sections

* 5.0.0 release notes: updated contributors and boilerplate

* 5.0.0 release notes: late changes to RC

6 years agoMerge pull request #11666 from eileenmcnaughton/validate_json
Monish Deb [Wed, 4 Apr 2018 09:11:52 +0000 (14:41 +0530)]
Merge pull request #11666 from eileenmcnaughton/validate_json

 CRM-21753 add json validation for incoming criteria

6 years agoMerge pull request #11865 from seamuslee001/core_dev_18
Eileen McNaughton [Wed, 4 Apr 2018 05:54:15 +0000 (17:54 +1200)]
Merge pull request #11865 from seamuslee001/core_dev_18

Fix Core/Dev 18# where logging fails if the AUTO INCREMENT column is …

6 years agoFix fatal error when selecting a /bin/bash price option.
eileen [Wed, 4 Apr 2018 05:52:14 +0000 (17:52 +1200)]
Fix fatal error when selecting a /bin/bash price option.

The code for creating a new price option creates a new financial transaction but when choosing a /bin/bash price option
it fails as the api does not accept /bin/bash EntityFinancialTrxn, skip if /bin/bash

6 years agoMerge pull request #11933 from civicrm/5.0
Eileen McNaughton [Wed, 4 Apr 2018 05:42:39 +0000 (17:42 +1200)]
Merge pull request #11933 from civicrm/5.0

5.0 to master

6 years agoMerge pull request #11932 from colemanw/8
Eileen McNaughton [Wed, 4 Apr 2018 05:42:10 +0000 (17:42 +1200)]
Merge pull request #11932 from colemanw/8

Core/8 - Fix fatal error on Print/Merge Document for cases

6 years agoPhone: standardize appearance and translation of extension label
Andrew Hunt [Wed, 4 Apr 2018 01:59:23 +0000 (21:59 -0400)]
Phone: standardize appearance and translation of extension label

6 years agoCore/8 - Fix fatal error on Print/Merge Document for cases
Coleman Watts [Tue, 3 Apr 2018 14:52:08 +0000 (10:52 -0400)]
Core/8 - Fix fatal error on Print/Merge Document for cases

Conflicts:
CRM/Case/Form/Task.php

6 years agoMerge pull request #11929 from civicrm/5.0
Eileen McNaughton [Wed, 4 Apr 2018 01:36:46 +0000 (13:36 +1200)]
Merge pull request #11929 from civicrm/5.0

5.0 merge to master

6 years agoMerge pull request #11928 from seamuslee001/case_pre_process_task
Eileen McNaughton [Wed, 4 Apr 2018 01:36:15 +0000 (13:36 +1200)]
Merge pull request #11928 from seamuslee001/case_pre_process_task

Re Add CRM_Case_Form_Task::PreProcessCommon()

6 years agoRe Add CRM_Case_Form_Task::PreProcessCommon()
Seamus Lee [Tue, 3 Apr 2018 21:44:07 +0000 (07:44 +1000)]
Re Add CRM_Case_Form_Task::PreProcessCommon()

Simplify down and use parent PreProcess function

6 years agoMerge pull request #11927 from samuelsov/NFC-taxts
Eileen McNaughton [Tue, 3 Apr 2018 23:00:46 +0000 (11:00 +1200)]
Merge pull request #11927 from samuelsov/NFC-taxts

(NFC) make (includes taxes) translation work

6 years ago(NFC) make (includes taxes) translation work
Samuel Vanhove [Tue, 3 Apr 2018 20:49:48 +0000 (16:49 -0400)]
(NFC) make (includes taxes) translation work

6 years agoMerge pull request #11885 from eileenmcnaughton/report_filter_eq
colemanw [Tue, 3 Apr 2018 13:03:38 +0000 (09:03 -0400)]
Merge pull request #11885 from eileenmcnaughton/report_filter_eq

Handle eq (equals) operator in the report url

6 years ago(dev/mail/6) additional fix and added unit test
deb.monish [Tue, 3 Apr 2018 06:37:55 +0000 (12:07 +0530)]
(dev/mail/6) additional fix and added unit test

6 years agoMerge pull request #11921 from civicrm/5.0
Eileen McNaughton [Mon, 2 Apr 2018 19:30:28 +0000 (07:30 +1200)]
Merge pull request #11921 from civicrm/5.0

5.0 merge to master

6 years agoMerge pull request #11917 from eileenmcnaughton/cont_report
Eileen McNaughton [Mon, 2 Apr 2018 19:28:39 +0000 (07:28 +1200)]
Merge pull request #11917 from eileenmcnaughton/cont_report

CRM-21831 & dev/report/issues/1 Fix regressions in contribution detail report relating to soft credits

6 years agoMerge pull request #11919 from eileenmcnaughton/top
Eileen McNaughton [Mon, 2 Apr 2018 19:27:50 +0000 (07:27 +1200)]
Merge pull request #11919 from eileenmcnaughton/top

Fix fatal on topDonor report

6 years agoMerge pull request #11918 from eileenmcnaughton/export
Monish Deb [Mon, 2 Apr 2018 10:53:34 +0000 (16:23 +0530)]
Merge pull request #11918 from eileenmcnaughton/export

Extract fetchRelationshipDetails function

6 years agoFix fatal on topDonor report
eileen [Mon, 2 Apr 2018 08:46:09 +0000 (20:46 +1200)]
Fix fatal on topDonor report

6 years agoMerge pull request #11814 from eileenmcnaughton/report
Yashodha Chaku [Mon, 2 Apr 2018 04:25:30 +0000 (09:55 +0530)]
Merge pull request #11814 from eileenmcnaughton/report

CRM-21677 - Report improvements

6 years agoExtract fetchRelationshipDetails function
eileen [Sun, 1 Apr 2018 23:17:36 +0000 (11:17 +1200)]
Extract fetchRelationshipDetails function

6 years agoMerge pull request #11914 from seamuslee001/CRM-21244-doc
Eileen McNaughton [Sun, 1 Apr 2018 22:51:46 +0000 (10:51 +1200)]
Merge pull request #11914 from seamuslee001/CRM-21244-doc

CRM-21244 Update documetnation so it makes sense when setting is disabled

6 years agoFix bugs in contribution detail report relating to soft credits
eileen [Sun, 1 Apr 2018 22:36:01 +0000 (10:36 +1200)]
Fix bugs in contribution detail report relating to soft credits

6 years agoMerge pull request #11915 from civicrm/5.0
Eileen McNaughton [Sun, 1 Apr 2018 21:52:11 +0000 (09:52 +1200)]
Merge pull request #11915 from civicrm/5.0

5.0

6 years agoMerge pull request #11906 from JMAConsulting/dev-42
Eileen McNaughton [Sun, 1 Apr 2018 21:50:04 +0000 (09:50 +1200)]
Merge pull request #11906 from JMAConsulting/dev-42

(dev/mail/6) On multilingual mode, choosing mailing group doesn't affect recipient count and list

6 years agoMerge pull request #11905 from seamuslee001/CRM-21244-consistancy
Monish Deb [Sun, 1 Apr 2018 11:57:37 +0000 (17:27 +0530)]
Merge pull request #11905 from seamuslee001/CRM-21244-consistancy

CRM-21244 Ensure consistancy with previous behavior where user emails …

6 years agoMerge pull request #11909 from mattwire/membershiptype_comments
Seamus Lee [Sun, 1 Apr 2018 04:12:52 +0000 (14:12 +1000)]
Merge pull request #11909 from mattwire/membershiptype_comments

NFC Minor comments cleanup on MembershipType

6 years agoMerge pull request #11668 from elisseck/CRM-21763
Seamus Lee [Sat, 31 Mar 2018 22:26:06 +0000 (08:26 +1000)]
Merge pull request #11668 from elisseck/CRM-21763

CRM-21763 Util to subtract currencies using integers for precision

6 years agoMerge pull request #11911 from JMAConsulting/dev-7
Seamus Lee [Sat, 31 Mar 2018 22:08:58 +0000 (08:08 +1000)]
Merge pull request #11911 from JMAConsulting/dev-7

(dev/mail/7) On 'New Mailing' review page, it doesn't show recipients count

6 years agoUpdate documetnation so it makes sense when setting is disabled
Seamus Lee [Sat, 31 Mar 2018 21:27:27 +0000 (07:27 +1000)]
Update documetnation so it makes sense when setting is disabled

6 years agoCRM-2144 Ensure consistancy with previous behavior where user emails are first then...
Seamus Lee [Sat, 31 Mar 2018 00:23:57 +0000 (11:23 +1100)]
CRM-2144 Ensure consistancy with previous behavior where user emails are first then system from emails.

Add unit test to try to verify order of emails

Fix issue where email was not being used as array key causing wrong email to be used

6 years ago(dev/mail/7) On 'New Mailing' review page, it doesn't show recipients count
deb.monish [Sat, 31 Mar 2018 11:58:02 +0000 (17:28 +0530)]
(dev/mail/7) On 'New Mailing' review page, it doesn't show recipients count

6 years ago(dev/mail/6) On multilingual mode, choosing mailing group doesn't affect recipient...
deb.monish [Sat, 31 Mar 2018 09:49:45 +0000 (15:19 +0530)]
(dev/mail/6) On multilingual mode, choosing mailing group doesn't affect recipient count and list

6 years agoMinor comments cleanup on MembershipType
Matthew Wire [Sat, 31 Mar 2018 10:16:17 +0000 (11:16 +0100)]
Minor comments cleanup on MembershipType

6 years agoMerge pull request #11904 from totten/5.0-preview-regr
Monish Deb [Sat, 31 Mar 2018 07:25:06 +0000 (12:55 +0530)]
Merge pull request #11904 from totten/5.0-preview-regr

(dev/mail/5) "New Mailing" - Previews should not schedule real blasts

6 years agoCRM-21677 - Report improvements
yashodha [Thu, 18 Jan 2018 10:41:16 +0000 (16:11 +0530)]
CRM-21677 - Report improvements

CRM-21677 - fix DB error and more clean up

CRM-21677 - generalised function

minor fix

CRM-21677 - keep the naming consistent

style fix

6 years agoMerge pull request #11898 from eileenmcnaughton/min_report
Eileen McNaughton [Sat, 31 Mar 2018 02:29:26 +0000 (15:29 +1300)]
Merge pull request #11898 from eileenmcnaughton/min_report

CRM-21677 reduce unnecessary joins in reports

6 years ago(dev/mail/5) "New Mailing" - Previews should not schedule real blasts
Tim Otten [Fri, 30 Mar 2018 22:02:42 +0000 (15:02 -0700)]
(dev/mail/5) "New Mailing" - Previews should not schedule real blasts

In `CRM_Mailing_BAO_Mailing::create` and `Mailing.create` API, there is a
(*ahem*) special behavior where setting the `scheduled_date` will
immediately trigger scheduling.  One shouldn't submit `scheduled_date` for a
preview.

This was not symptomatic before #11142/v4.7.31 because all preview
operations were wrapped in a transaction and rolled back.  But now previews
are allowed to have side-effects, so we need some other means to prevent.

This copies the workaround from `crmMailingMgr.save()` and applies
it to `crmMailingMgr.preview()` (etal).

6 years agoFix template for widget
Mukesh Ram [Fri, 30 Mar 2018 13:48:07 +0000 (19:18 +0530)]
Fix template for widget

6 years agoMerge pull request #11878 from mattwire/CRM-21791_financial_batch_pseudoconstant
Eileen McNaughton [Fri, 30 Mar 2018 00:13:05 +0000 (13:13 +1300)]
Merge pull request #11878 from mattwire/CRM-21791_financial_batch_pseudoconstant

CRM-21791 Use name for comparison instead of label (alternative)

6 years agoSimple function extraction on editing Address (within main contact edit
eileen [Thu, 29 Mar 2018 11:17:21 +0000 (00:17 +1300)]
Simple function extraction on editing Address (within main contact edit

6 years agoCRM-21677 reduce unnecessary joins in reports
eileen [Thu, 29 Mar 2018 08:48:39 +0000 (21:48 +1300)]
CRM-21677 reduce unnecessary joins in reports

6 years agoMerge pull request #11889 from eileenmcnaughton/min_report
Eileen McNaughton [Thu, 29 Mar 2018 08:11:48 +0000 (21:11 +1300)]
Merge pull request #11889 from eileenmcnaughton/min_report

CRM-21677 reduce unnecessary joins in reports

6 years agoMerge pull request #11890 from otetard/bugfix/fix-deceases-membership-processing
Eileen McNaughton [Thu, 29 Mar 2018 08:07:06 +0000 (21:07 +1300)]
Merge pull request #11890 from otetard/bugfix/fix-deceases-membership-processing

Fix CRM-19920 regression: “Deceased” status could be translated.

6 years agoFix CRM-19920 regression: “Deceased” status could be translated.
Olivier Tétard [Wed, 28 Mar 2018 12:21:27 +0000 (14:21 +0200)]
Fix CRM-19920 regression: “Deceased” status could be translated.

Find “Deceased” `status_id` by using `CRM_Core_PseudoConstant::getKey()` and check use this status is enabled by using this `status_id` instead of its label (which could be translated).

6 years agoMerge pull request #11703 from eileenmcnaughton/export
Monish Deb [Thu, 29 Mar 2018 05:46:13 +0000 (11:16 +0530)]
Merge pull request #11703 from eileenmcnaughton/export

Remove cloning hack from export and add unit tests

6 years agoMerge pull request #11895 from totten/master-ext-check
Eileen McNaughton [Thu, 29 Mar 2018 02:23:08 +0000 (15:23 +1300)]
Merge pull request #11895 from totten/master-ext-check

CRM_Utils_Check - Soften messages for read-only extensionsDir

6 years agoCRM_Utils_Check_Component_Env::checkExtensions - Fix typo
Tim Otten [Wed, 28 Mar 2018 22:33:57 +0000 (15:33 -0700)]
CRM_Utils_Check_Component_Env::checkExtensions - Fix typo

6 years agoCRM_Utils_Check_Component_Env - Soften messages for read-only extDir
Tim Otten [Wed, 28 Mar 2018 21:59:27 +0000 (14:59 -0700)]
CRM_Utils_Check_Component_Env - Soften messages for read-only extDir

There are competing schools of thought on whether extension folders should be web-writable:

* Sometimes, the most active (or the only) admins are web-based. Making the folder writeable lets them keep extensions up-to-date through the web UI.
  This includes applying security-fixes for extensions. Thus, sites with writeable extdir are harder to attack (more secure).
* Sometimes, the most active (or the only) admins don't use the web-based admin UI, and they don't trust any web-based users to do administration.
  They don't want the folder to be writeable.
* If there's a flaw that allows writing to the filesystem, it could be escalated to writing+executing code. Thus, sites with read-only
  extdir are harder to attack (more secure).

This commit tries to accept each scenario as valid -- but communicate
better.  Instead of flatly describing the read-only dir as erroreous,
present a warning with some choice/trade-off.

6 years agoCRM_Utils_Check_Component_Env - Remove redundant check for extensionsDir
Tim Otten [Wed, 28 Mar 2018 21:39:13 +0000 (14:39 -0700)]
CRM_Utils_Check_Component_Env - Remove redundant check for extensionsDir

When you have a non-writeable extensions directory, *two* status checks will
copmlain about it (`checkDirsWritable`, `checkExtensions`).  Between the two,
`checkExtensions` is smarter.

6 years agoMerge pull request #11891 from nielosz/Add-activities-to-recent-items
Eileen McNaughton [Wed, 28 Mar 2018 20:15:08 +0000 (09:15 +1300)]
Merge pull request #11891 from nielosz/Add-activities-to-recent-items

CRM-21434: Add activities to recent items stack

6 years agoMerge pull request #11888 from mattwire/formrule_typo
Seamus Lee [Wed, 28 Mar 2018 19:11:51 +0000 (06:11 +1100)]
Merge pull request #11888 from mattwire/formrule_typo

NFC Fix function name typo

6 years agoCRM-21763 add money util to subtract currency floats with precisely and implement...
Eli Lisseck [Wed, 14 Feb 2018 20:40:05 +0000 (12:40 -0800)]
CRM-21763 add money util to subtract currency floats with precisely and implement in CRM_Core_BAO_FinancialTrxn::getPartialPaymentWithType

6 years agoAdd items to recents items
Niels Heinemann [Wed, 28 Mar 2018 12:49:06 +0000 (14:49 +0200)]
Add items to recents items

6 years agoMerge pull request #11886 from eileenmcnaughton/varName
Eileen McNaughton [Wed, 28 Mar 2018 10:34:03 +0000 (23:34 +1300)]
Merge pull request #11886 from eileenmcnaughton/varName

[NFC] Fix mispelled variable and simplify a couple of other vars

6 years agoCRM-21677 reduce unnecessary joins in reports
eileen [Wed, 28 Mar 2018 10:30:54 +0000 (23:30 +1300)]
CRM-21677 reduce unnecessary joins in reports

6 years agoMerge pull request #11880 from eileenmcnaughton/min_report
Eileen McNaughton [Wed, 28 Mar 2018 10:24:00 +0000 (23:24 +1300)]
Merge pull request #11880 from eileenmcnaughton/min_report

 CRM-21677 reduce unnecessary joins in Case, Grant, Survey reports

6 years agoFix function name typo
Matthew Wire [Wed, 28 Mar 2018 09:36:57 +0000 (10:36 +0100)]
Fix function name typo

6 years ago CRM-21677 reduce unnecessary joins in Case, Grant, Survey reports
eileen [Mon, 26 Mar 2018 21:10:18 +0000 (10:10 +1300)]
 CRM-21677 reduce unnecessary joins in Case, Grant, Survey reports

6 years ago[NFC] Fix mispelled variable and simplify a couple of other vars
eileen [Wed, 28 Mar 2018 07:30:53 +0000 (20:30 +1300)]
[NFC] Fix mispelled variable and simplify a couple of other vars

6 years agoMerge pull request #11882 from eileenmcnaughton/report_filter
Eileen McNaughton [Wed, 28 Mar 2018 07:15:58 +0000 (20:15 +1300)]
Merge pull request #11882 from eileenmcnaughton/report_filter

Fix report form isTableSelected to treat relative date filters as filters

6 years agoHandle eq (equals) operator in the report url
eileen [Wed, 28 Mar 2018 04:44:41 +0000 (17:44 +1300)]
Handle eq (equals) operator in the report url

6 years agoTidy up on_hold handling in holdEmail function.
eileen [Wed, 28 Mar 2018 01:56:31 +0000 (14:56 +1300)]
Tidy up on_hold handling in holdEmail function.

Follow up on https://github.com/civicrm/civicrm-core/pull/11807

6 years agoMerge pull request #11807 from lyyana/patch-1
Eileen McNaughton [Wed, 28 Mar 2018 01:45:50 +0000 (14:45 +1300)]
Merge pull request #11807 from lyyana/patch-1

"hold_date" not updated if civimail_multiple_bulk_emails is true + test

6 years agoMerge pull request #11336 from eileenmcnaughton/live
Seamus Lee [Wed, 28 Mar 2018 00:48:37 +0000 (11:48 +1100)]
Merge pull request #11336 from eileenmcnaughton/live

CRM-21489 document new constant in civicrm.settings.php

6 years agoMerge pull request #11863 from eileenmcnaughton/payment_view
colemanw [Tue, 27 Mar 2018 19:54:33 +0000 (15:54 -0400)]
Merge pull request #11863 from eileenmcnaughton/payment_view

Tweak layout on contribution view screen to make payments clearer

6 years agoCRM-21753 - addition of json validation
eileen [Wed, 14 Feb 2018 06:27:43 +0000 (19:27 +1300)]
CRM-21753 - addition of json validation

Per https://github.com/civicrm/civicrm-core/pull/11658

the dedupe code has a mechanism to handle a nuanced array of criteria.

This PR is purely to support the passing of that json through the url criteria  with
a proposed validation rule.

The criteria in the url might look like

criteria={"contact" : {"first_name" :{"IN" : ["Peter", "Paul", "Mary"]]]}

This is passed to the contact api to limit the contacts to look for matches
for (before actually finding the matches). In discussion the biggest risk seemed to
be the possibility of chaining so I have added a filter on the
criteria & set check_permissions (acls are applied in the next step but
having it on the api call is clearer & may reduce matches for the next step).

6 years agoFix report form isTableSelected to treat relative date filters as filters.
eileen [Tue, 27 Mar 2018 04:30:43 +0000 (17:30 +1300)]
Fix report form isTableSelected to treat relative date filters as filters.

isTableSelected looks to see if the filter has been passed in. Without this it looks in ->_params[{}_value] &
for {}_op to be null or 'not null' but misses relative date filters.

6 years agoMerge pull request #11879 from MegaphoneJon/CRM-21842
Eileen McNaughton [Tue, 27 Mar 2018 01:06:11 +0000 (14:06 +1300)]
Merge pull request #11879 from MegaphoneJon/CRM-21842

CRM-21842 - Fix links to documentation

6 years agoMerge pull request #11874 from eileenmcnaughton/cust_data
Seamus Lee [Mon, 26 Mar 2018 22:20:46 +0000 (09:20 +1100)]
Merge pull request #11874 from eileenmcnaughton/cust_data

[NFC] remove unused vars

6 years agoCRM-21791 Use name instead of label
Matthew Wire [Mon, 26 Mar 2018 16:20:56 +0000 (17:20 +0100)]
CRM-21791 Use name instead of label

6 years agoMerge pull request #11876 from yashodha/report_improv
Eileen McNaughton [Mon, 26 Mar 2018 20:23:57 +0000 (09:23 +1300)]
Merge pull request #11876 from yashodha/report_improv

CRM-21677 reduce unnecessary joins in mailing reports

6 years agoCRM-21842 - Fix links to documentation
Jon Goldberg [Mon, 26 Mar 2018 17:41:02 +0000 (13:41 -0400)]
CRM-21842 - Fix links to documentation