civicrm-core.git
5 years agoMerge pull request #13375 from yashodha/dev_622
Seamus Lee [Tue, 1 Jan 2019 20:27:30 +0000 (07:27 +1100)]
Merge pull request #13375 from yashodha/dev_622

(dev/core#622) User Dashboard doesn't show Edit Contact Information link

5 years ago(dev/core#622) User Dashboard doesn't show Edit Contact Information link
yashodha [Tue, 1 Jan 2019 13:08:10 +0000 (18:38 +0530)]
(dev/core#622) User Dashboard doesn't show Edit Contact Information link

5 years agoMerge pull request #13344 from seamuslee001/unit_test_13343
Seamus Lee [Tue, 1 Jan 2019 06:26:47 +0000 (17:26 +1100)]
Merge pull request #13344 from seamuslee001/unit_test_13343

Add in unit test to support changes in UF API in PR 13343

5 years agoMerge pull request #13343 from GinkgoFJG/case-issues-w-ufgroup-api
Seamus Lee [Tue, 1 Jan 2019 01:09:05 +0000 (12:09 +1100)]
Merge pull request #13343 from GinkgoFJG/case-issues-w-ufgroup-api

Improved support for case variability in UF* API calls.

5 years agoMerge pull request #13370 from eileenmcnaughton/payment
Seamus Lee [Mon, 31 Dec 2018 03:39:57 +0000 (14:39 +1100)]
Merge pull request #13370 from eileenmcnaughton/payment

[REF] extract internals of Payment.create into function on BAO class.

5 years ago[REF] extract internals of Payment.create into function on BAO class.
eileen [Sun, 30 Dec 2018 21:45:47 +0000 (10:45 +1300)]
[REF] extract internals of Payment.create into function on BAO class.

This is a partial of https://github.com/civicrm/civicrm-core/pull/13330 - trying
to separate out the main code move from the changes. My only change was to change the name to
addPayment since that is what we are doing but here are some additionaly thoughts.

1) I'm inclined to put the class onto a new pseudo-bao CRM_Finanial_BAO_Payment. We already have this
pseudo-entity on the api level & it gives us a way to build up a place for the functions we are migrating
towards.

2) I think we should consider changing the input parameters to this function to be
- contributionID, total_amount & line_items or in some way limiting the parameters tha
t get passed through. We have historically gotten ourselves in trouble by
having people hacking in another parameter to go through whereas the strength of the api
is clear inputs & outputs. I note the api will need to support
'is_email_receipt' as will this fn & the CRM_Contribute_Form_AdditionalPayment::emailReceipt
should be moved off the form layer - possibly to our new BAO

3) I think the exceptions need to be CRM_Core_Exceptions if thrown in the BAO although this is kinda cosmetic

Change-Id: Ib5caf0d878e9c5cc735cb1a20c640f61da2dbfc6

5 years agoMerge pull request #13371 from eileenmcnaughton/activity_extract
Seamus Lee [Mon, 31 Dec 2018 00:15:58 +0000 (11:15 +1100)]
Merge pull request #13371 from eileenmcnaughton/activity_extract

[REF] simplify CRM_Activity_BAO_Activity function by using early returns

5 years ago[REF] simplify CRM_Activity_BAO_Activity function by using early returns.
eileen [Sun, 30 Dec 2018 22:33:12 +0000 (11:33 +1300)]
[REF] simplify CRM_Activity_BAO_Activity function by using early returns.

This function returns a bool. In the process it sets the  variable, however, once set to false in two places
it can never be set to true, so I am simply replacing a big if block with an early return to simplify the code.

This is a further block that can go but it is a slightly different patter & would remove 2 levels of 'if'
so it feels like an easier review if I leave that out of scope

5 years agoMerge pull request #13367 from mattwire/nfc_commentscustomfield
Seamus Lee [Sat, 29 Dec 2018 22:34:23 +0000 (09:34 +1100)]
Merge pull request #13367 from mattwire/nfc_commentscustomfield

NFC tidy up comments, remove unused variables in customfield classes

5 years agoMerge pull request #13368 from mattwire/case_cachecount
Seamus Lee [Sat, 29 Dec 2018 22:33:56 +0000 (09:33 +1100)]
Merge pull request #13368 from mattwire/case_cachecount

Cache case count when getting list of cases so query is executed once instead of three times

5 years agoMerge pull request #13359 from chamilwijesooriya/issue-625
Seamus Lee [Sat, 29 Dec 2018 21:16:46 +0000 (08:16 +1100)]
Merge pull request #13359 from chamilwijesooriya/issue-625

(dev/core#625) DB error on Case Summary report

5 years agoMerge pull request #13328 from eileenmcnaughton/phone_handle
Seamus Lee [Sat, 29 Dec 2018 20:32:03 +0000 (07:32 +1100)]
Merge pull request #13328 from eileenmcnaughton/phone_handle

[REF] genericise function to add pseudoconstant data to fields to process

5 years agoMerge pull request #13360 from ray-wright/patch-2
Seamus Lee [Sat, 29 Dec 2018 20:29:05 +0000 (07:29 +1100)]
Merge pull request #13360 from ray-wright/patch-2

Revert to showing overdue activities on a case first

5 years agoCache case count when getting list of cases so query is executed once instead of...
Matthew Wire (MJW Consulting) [Sat, 29 Dec 2018 12:15:17 +0000 (12:15 +0000)]
Cache case count when getting list of cases so query is executed once instead of three times

5 years agoNFC tidy up comments, remove unused variables in customfield classes
Matthew Wire (MJW Consulting) [Sat, 29 Dec 2018 11:13:57 +0000 (11:13 +0000)]
NFC tidy up comments, remove unused variables in customfield classes

5 years agoMerge pull request #13366 from seamuslee001/refinement_623
Seamus Lee [Sat, 29 Dec 2018 04:44:15 +0000 (15:44 +1100)]
Merge pull request #13366 from seamuslee001/refinement_623

dev/core#623 Refine the upgrade statement to only those of the old st…

5 years agodev/core#623 Refine the upgrade statement to only those of the old standard value
Seamus Lee [Sat, 29 Dec 2018 03:16:08 +0000 (14:16 +1100)]
dev/core#623 Refine the upgrade statement to only those of the old standard value

5 years agoGitLab issue 625 DB error on Case Summary report
Chamil Wijesooriya [Thu, 27 Dec 2018 12:23:17 +0000 (12:23 +0000)]
GitLab issue 625 DB error on Case Summary report

5 years agoMerge pull request #13299 from colemanw/activityDate
Seamus Lee [Fri, 28 Dec 2018 10:21:01 +0000 (21:21 +1100)]
Merge pull request #13299 from colemanw/activityDate

Activity date fields -> datepicker

5 years agoMerge pull request #13336 from mattwire/missingcaseaddaction
Seamus Lee [Fri, 28 Dec 2018 09:27:53 +0000 (20:27 +1100)]
Merge pull request #13336 from mattwire/missingcaseaddaction

Don't crash with missing class if action is not defined when opening new case

5 years agoMerge pull request #13363 from civicrm/5.9
Seamus Lee [Fri, 28 Dec 2018 08:51:37 +0000 (19:51 +1100)]
Merge pull request #13363 from civicrm/5.9

5.9

5 years agoMerge pull request #13361 from seamuslee001/lab_core_594
Seamus Lee [Fri, 28 Dec 2018 08:27:19 +0000 (19:27 +1100)]
Merge pull request #13361 from seamuslee001/lab_core_594

(dev/core#594) Fix key-value mappings for WYSIWYG setting (editor_id). Accept keyColumn option.

5 years agoMerge pull request #13362 from seamuslee001/lab_core_623
Eileen McNaughton [Fri, 28 Dec 2018 08:19:57 +0000 (21:19 +1300)]
Merge pull request #13362 from seamuslee001/lab_core_623

dev/core#623 add in upgrade step to update Away type hold threshold t…

5 years agoFiveNine.php - Copy-edit post-upgrade message
Tim Otten [Fri, 28 Dec 2018 06:59:41 +0000 (22:59 -0800)]
FiveNine.php - Copy-edit post-upgrade message

5 years agodev/core#594 Fix issue where editor_id is expected to be keyed on name not on value
Seamus Lee [Thu, 27 Dec 2018 21:37:52 +0000 (08:37 +1100)]
dev/core#594 Fix issue where editor_id is expected to be keyed on name not on value

Add in a post upgrade message encourging people to check their editor setting

5 years agodev/core#623 add in upgrade step to update Away type hold threshold to be 30 as agree...
Seamus Lee [Fri, 28 Dec 2018 02:46:23 +0000 (13:46 +1100)]
dev/core#623 add in upgrade step to update Away type hold threshold to be 30 as agreed to in CRM-6405 version 3.2. It appears there may have been no upgrade made at the type so catching up now

5 years agoMerge pull request #13215 from mattwire/recur_invoice_selfservice_links
Seamus Lee [Thu, 27 Dec 2018 21:08:55 +0000 (08:08 +1100)]
Merge pull request #13215 from mattwire/recur_invoice_selfservice_links

Display self-service links in email receipts based on payment processor capabilities

5 years agodev/core#561 - case_start_date field -> datepicker
Coleman Watts [Mon, 17 Dec 2018 18:36:46 +0000 (13:36 -0500)]
dev/core#561 - case_start_date field -> datepicker

5 years agoactivity_duration field -> number
Coleman Watts [Thu, 6 Dec 2018 18:50:39 +0000 (13:50 -0500)]
activity_duration field -> number

5 years agodev/core#561 - activity_date_time field -> datepicker
Coleman Watts [Thu, 6 Dec 2018 18:48:39 +0000 (13:48 -0500)]
dev/core#561 - activity_date_time field -> datepicker

5 years agoTo revert to showing overdue activities first
ray-wright [Thu, 27 Dec 2018 18:56:52 +0000 (13:56 -0500)]
To revert to showing overdue activities first

Based on this issue, I'd like to remove the data-order, as the BAO Case file already sorts.

https://lab.civicrm.org/dev/core/issues/626

5 years agoDon't crash with missing class if action is not defined when opening new case
Matthew Wire (MJW Consulting) [Thu, 27 Dec 2018 18:54:59 +0000 (18:54 +0000)]
Don't crash with missing class if action is not defined when opening new case

5 years agoDisplay self-service links in email receipts based on payment processor capabilities
Matthew Wire (MJW Consulting) [Mon, 3 Dec 2018 15:35:31 +0000 (15:35 +0000)]
Display self-service links in email receipts based on payment processor capabilities

5 years agoMerge pull request #13350 from francescbassas/patch-16
Yashodha Chaku [Thu, 27 Dec 2018 11:06:30 +0000 (16:36 +0530)]
Merge pull request #13350 from francescbassas/patch-16

#620 - Unable to show custom fields on Repeat Contributions Report

5 years agoMerge pull request #13354 from seamuslee001/lab_core_35
Yashodha Chaku [Thu, 27 Dec 2018 08:58:25 +0000 (14:28 +0530)]
Merge pull request #13354 from seamuslee001/lab_core_35

dev/mail#35 Ensure that Public View link is visible in Scheduled and …

5 years agoMerge pull request #13356 from yashodha/campaign_reports
Seamus Lee [Thu, 27 Dec 2018 08:03:21 +0000 (19:03 +1100)]
Merge pull request #13356 from yashodha/campaign_reports

(dev/core#491) campaign cleanup for pledge detail report and show dis…

5 years agoMerge pull request #13355 from seamuslee001/lab_core_621
Yashodha Chaku [Thu, 27 Dec 2018 07:42:25 +0000 (13:12 +0530)]
Merge pull request #13355 from seamuslee001/lab_core_621

dev/core#621 Ensure that only 2 decimal places are dispalyed for opti…

5 years agoMerge pull request #13316 from alifrumin/amountlink
Seamus Lee [Thu, 27 Dec 2018 05:55:13 +0000 (16:55 +1100)]
Merge pull request #13316 from alifrumin/amountlink

On the Contribution Detail Report link the Amount field to the contribution

5 years ago(dev/core#491) campaign cleanup for pledge detail report and show disabled campaigns...
yashodha [Thu, 27 Dec 2018 05:14:30 +0000 (10:44 +0530)]
(dev/core#491) campaign cleanup for pledge detail report and show disabled campaigns as well

5 years agodev/core#621 Ensure that only 2 decimal places are dispalyed for option amount and...
Seamus Lee [Wed, 26 Dec 2018 20:59:36 +0000 (07:59 +1100)]
dev/core#621 Ensure that only 2 decimal places are dispalyed for option amount and also ensure that non deductable amount is cleaned before saving to db

5 years agoMerge pull request #13351 from yashodha/campaign_reports
Seamus Lee [Wed, 26 Dec 2018 19:59:57 +0000 (06:59 +1100)]
Merge pull request #13351 from yashodha/campaign_reports

(dev/core#491) campaign cleanup for soft credit report and show disab…

5 years agoMerge pull request #13352 from yashodha/fix-verbiage
Seamus Lee [Wed, 26 Dec 2018 19:44:50 +0000 (06:44 +1100)]
Merge pull request #13352 from yashodha/fix-verbiage

fix verbiage for Edit Contact Information title

5 years agodev/mail#35 Ensure that Public View link is visible in Scheduled and Sent Screens
Seamus Lee [Wed, 26 Dec 2018 19:42:12 +0000 (06:42 +1100)]
dev/mail#35 Ensure that Public View link is visible in Scheduled and Sent Screens

5 years agoMerge pull request #13339 from yashodha/dev-610
colemanw [Wed, 26 Dec 2018 18:04:56 +0000 (13:04 -0500)]
Merge pull request #13339 from yashodha/dev-610

(dev/core#610) Page title displays twice on Activity form

5 years agoMerge pull request #13347 from mfb/ellipsify-optimize
Seamus Lee [Wed, 26 Dec 2018 08:35:43 +0000 (19:35 +1100)]
Merge pull request #13347 from mfb/ellipsify-optimize

optimize CRM_Utils_String::ellipsify() method

5 years agofix verbiage for Edit Contact Information title
yashodha [Wed, 26 Dec 2018 05:43:53 +0000 (11:13 +0530)]
fix verbiage for Edit Contact Information title

5 years agoMerge pull request #13349 from yashodha/fix-verbiage
Yashodha Chaku [Wed, 26 Dec 2018 05:36:52 +0000 (11:06 +0530)]
Merge pull request #13349 from yashodha/fix-verbiage

fix verbiage for Dashboard title

5 years ago(dev/core#491) campaign cleanup for soft credit report and show disabled campaigns...
yashodha [Wed, 26 Dec 2018 05:11:45 +0000 (10:41 +0530)]
(dev/core#491) campaign cleanup for soft credit report and show disabled campaigns as well

5 years agoMerge pull request #13348 from yashodha/campaign_reports
Seamus Lee [Tue, 25 Dec 2018 20:12:30 +0000 (07:12 +1100)]
Merge pull request #13348 from yashodha/campaign_reports

(dev/core#491) campaign cleanup for contribution (org) report and sho…

5 years agoUpdate Repeat.php
francescbassas [Mon, 24 Dec 2018 10:18:50 +0000 (11:18 +0100)]
Update Repeat.php

5 years ago#620 - Unable to show custom fields on Repeat Contributions Report
francescbassas [Mon, 24 Dec 2018 10:16:15 +0000 (11:16 +0100)]
#620 - Unable to show custom fields on Repeat Contributions Report

https://lab.civicrm.org/dev/core/issues/620

5 years agofix verbiage for Dashboard title
yashodha [Mon, 24 Dec 2018 08:40:37 +0000 (14:10 +0530)]
fix verbiage for Dashboard title

5 years ago(dev/core#491) campaign cleanup for contribution (org) report and show disabled campa...
yashodha [Mon, 24 Dec 2018 05:44:01 +0000 (11:14 +0530)]
(dev/core#491) campaign cleanup for contribution (org) report and show disabled campaigns as well

5 years agooptimize CRM_Utils_String::ellipsify() method
mark burdett [Mon, 24 Dec 2018 04:47:06 +0000 (20:47 -0800)]
optimize CRM_Utils_String::ellipsify() method

5 years agoMerge pull request #13341 from yashodha/campaign_reports
Seamus Lee [Fri, 21 Dec 2018 21:59:16 +0000 (08:59 +1100)]
Merge pull request #13341 from yashodha/campaign_reports

add suport for order by clause for campaign and clean up

5 years agoAdd in unit test to support changes in UF API in PR 13343
Seamus Lee [Fri, 21 Dec 2018 21:54:11 +0000 (08:54 +1100)]
Add in unit test to support changes in UF API in PR 13343

5 years agoImproved support for case variability in UF* API calls.
Frank J. Gómez [Fri, 21 Dec 2018 20:03:48 +0000 (15:03 -0500)]
Improved support for case variability in UF* API calls.

5 years agoMerge pull request #13291 from eileenmcnaughton/process_default_active
colemanw [Fri, 21 Dec 2018 15:58:32 +0000 (10:58 -0500)]
Merge pull request #13291 from eileenmcnaughton/process_default_active

Add default of TRUE for is_active on PaymentProcessor.create api.

5 years agoMerge pull request #13329 from eileenmcnaughton/activity_extract
colemanw [Fri, 21 Dec 2018 15:56:50 +0000 (10:56 -0500)]
Merge pull request #13329 from eileenmcnaughton/activity_extract

[REF] Add caching to function to determine if activity type is permitted.

5 years agoMerge pull request #13250 from francescbassas/patch-16
Monish Deb [Fri, 21 Dec 2018 13:47:34 +0000 (19:17 +0530)]
Merge pull request #13250 from francescbassas/patch-16

#469 - Error on action "Email - schedule/send via CiviMail" with mult…

5 years agoadd suport for order by clause for campaign and clean up
yashodha [Fri, 21 Dec 2018 12:40:39 +0000 (18:10 +0530)]
add suport for order by clause for campaign and clean up

5 years agoMerge pull request #13241 from seamuslee001/561_schedule_reminders
Monish Deb [Fri, 21 Dec 2018 10:18:07 +0000 (15:48 +0530)]
Merge pull request #13241 from seamuslee001/561_schedule_reminders

dev/core#561 Convert Scheduled Reminders Form to use datepicker and e…

5 years agoMerge pull request #13281 from yashodha/campaign
Seamus Lee [Fri, 21 Dec 2018 06:45:40 +0000 (17:45 +1100)]
Merge pull request #13281 from yashodha/campaign

campaign cleanup for household summary

5 years ago(dev/core#610) Page title displays twice on Activity form
yashodha [Fri, 21 Dec 2018 06:19:40 +0000 (11:49 +0530)]
(dev/core#610) Page title displays twice on Activity form

5 years agoMerge pull request #13311 from mattwire/entityform_customsubtype
colemanw [Fri, 21 Dec 2018 04:33:51 +0000 (23:33 -0500)]
Merge pull request #13311 from mattwire/entityform_customsubtype

Support customdata subtype on entityform (for activity/relationship types)

5 years agoMerge pull request #13337 from GinkgoFJG/crmPageTitle
colemanw [Fri, 21 Dec 2018 02:44:23 +0000 (21:44 -0500)]
Merge pull request #13337 from GinkgoFJG/crmPageTitle

NFC: Improved documentation of crmPageTitle directive.

5 years agoImproved documentation of crmPageTitle directive.
Frank J. Gómez [Thu, 20 Dec 2018 21:46:30 +0000 (16:46 -0500)]
Improved documentation of crmPageTitle directive.

Documented assumption that AngularJS base page be named "CiviCRM."

5 years agoMerge pull request #13335 from mattwire/opencase_comments
Seamus Lee [Thu, 20 Dec 2018 21:28:46 +0000 (08:28 +1100)]
Merge pull request #13335 from mattwire/opencase_comments

NFC Minor tweaks to docblocks on opencase form

5 years agoMinor tweaks to docblocks on opencase form
Matthew Wire (MJW Consulting) [Thu, 20 Dec 2018 15:51:10 +0000 (15:51 +0000)]
Minor tweaks to docblocks on opencase form

5 years agoMerge pull request #13321 from yashodha/campaign-clean
Eileen McNaughton [Thu, 20 Dec 2018 08:21:36 +0000 (21:21 +1300)]
Merge pull request #13321 from yashodha/campaign-clean

campaign cleanup for sybunt report and show disabled campaigns as well

5 years agoMerge pull request #13323 from JMAConsulting/dedupe_zero
Monish Deb [Thu, 20 Dec 2018 06:09:23 +0000 (11:39 +0530)]
Merge pull request #13323 from JMAConsulting/dedupe_zero

Unit test for PR#12699

5 years agoUnit test for PR#12699
Monish Deb [Wed, 19 Dec 2018 19:33:10 +0000 (01:03 +0530)]
Unit test for PR#12699

5 years agoMerge pull request #12669 from eileenmcnaughton/dedupe_zero
Monish Deb [Thu, 20 Dec 2018 04:40:45 +0000 (10:10 +0530)]
Merge pull request #12669 from eileenmcnaughton/dedupe_zero

Fix duplicate merge to not disregard zero values.

5 years agoMerge pull request #13322 from JMAConsulting/dev-report-5
Eileen McNaughton [Thu, 20 Dec 2018 04:17:44 +0000 (17:17 +1300)]
Merge pull request #13322 from JMAConsulting/dev-report-5

dev/report#5 - Fix mailing report unique count issue

5 years agoAdd caching to function to determine if activity type is permitted.
eileen [Wed, 24 Oct 2018 02:29:55 +0000 (15:29 +1300)]
Add caching to function to determine if activity type is permitted.

This adds caching & re-usability to the activity type checking

5 years agoMerge pull request #13326 from mlutfy/intall-php72
Tim Otten [Thu, 20 Dec 2018 02:02:52 +0000 (18:02 -0800)]
Merge pull request #13326 from mlutfy/intall-php72

installer: PHP 7.2 compatibility fixes

5 years ago[REF] genericise function to add pseudoconstant data to fields to process
eileen [Wed, 19 Dec 2018 23:05:40 +0000 (12:05 +1300)]
[REF] genericise function to add pseudoconstant data to fields to process

5 years agoinstaller: PHP 7.2 compatibility fixes
Mathieu Lutfy [Wed, 19 Dec 2018 22:27:16 +0000 (17:27 -0500)]
installer: PHP 7.2 compatibility fixes

5 years agoMerge pull request #13313 from kainuk/issues-607
Monish Deb [Wed, 19 Dec 2018 20:00:32 +0000 (01:30 +0530)]
Merge pull request #13313 from kainuk/issues-607

Search Builder fails with an error when searching for State if the location type differs from the display name.

5 years agoAdded test case
Monish Deb [Wed, 19 Dec 2018 14:41:58 +0000 (20:11 +0530)]
Added test case

5 years agoCiviLint
Klaas Eikelboom [Wed, 19 Dec 2018 14:03:28 +0000 (15:03 +0100)]
CiviLint

5 years agoTest case for report
Sunil Pawar [Wed, 11 Jul 2018 10:45:30 +0000 (16:15 +0530)]
Test case for report

5 years agodev/report/#5 - Fix mailing report unique count issue
Sunil Pawar [Mon, 2 Jul 2018 15:40:02 +0000 (21:10 +0530)]
dev/report/#5 - Fix mailing report unique count issue

5 years agocampaign cleanup for sybunt report and show disabled campaigns as well
yashodha [Wed, 19 Dec 2018 08:30:50 +0000 (14:00 +0530)]
campaign cleanup for sybunt report and show disabled campaigns as well

5 years agoMerge pull request #13315 from seamuslee001/5.9
Seamus Lee [Wed, 19 Dec 2018 02:00:24 +0000 (13:00 +1100)]
Merge pull request #13315 from seamuslee001/5.9

Fix PHP7.2 Count error on test testImportParserWtihEmployeeOfRelation…

5 years agoMerge pull request #12995 from eileenmcnaughton/activity_extract2
colemanw [Wed, 19 Dec 2018 01:57:23 +0000 (20:57 -0500)]
Merge pull request #12995 from eileenmcnaughton/activity_extract2

dev/core/454 rationalise activity case permissions & code

5 years agoLink the Amount field to the contribution in the Contribution Detail Report
Alice Frumin [Tue, 18 Dec 2018 22:41:39 +0000 (17:41 -0500)]
Link the Amount field to the contribution in the Contribution Detail Report

5 years agoFix PHP7.2 Count error on test testImportParserWtihEmployeeOfRelationship
Seamus Lee [Sun, 9 Dec 2018 20:32:03 +0000 (07:32 +1100)]
Fix PHP7.2 Count error on test testImportParserWtihEmployeeOfRelationship

5 years agoMerge pull request #13170 from elisseck/dev/core/485
Eileen McNaughton [Tue, 18 Dec 2018 19:45:55 +0000 (08:45 +1300)]
Merge pull request #13170 from elisseck/dev/core/485

dev/core/485 Website type should be required as other type values are

5 years agoMerge pull request #13312 from compucorp/fix-modal-cancel
colemanw [Tue, 18 Dec 2018 18:20:13 +0000 (13:20 -0500)]
Merge pull request #13312 from compucorp/fix-modal-cancel

dev/core#606: Don't redirect to the Option Groups page when page is displayed in a modal

5 years agoFix for issue 607
Klaas Eikelboom [Tue, 18 Dec 2018 14:03:44 +0000 (15:03 +0100)]
Fix for issue 607

5 years agoDon't redirect to the Option Groups page when page is displayed in a modal
Davi Alexandre [Tue, 18 Dec 2018 12:17:27 +0000 (10:17 -0200)]
Don't redirect to the Option Groups page when page is displayed in a modal

5 years agoMerge pull request #13309 from seamuslee001/min_php_version_bump
Seamus Lee [Tue, 18 Dec 2018 11:03:38 +0000 (22:03 +1100)]
Merge pull request #13309 from seamuslee001/min_php_version_bump

Bump Minimum Required PHP to be 5.6

5 years agoSupport customdata subtype on entityform (for activity/relationship types)
Matthew Wire (MJW Consulting) [Tue, 18 Dec 2018 10:01:49 +0000 (10:01 +0000)]
Support customdata subtype on entityform (for activity/relationship types)

5 years agoMerge pull request #13296 from mathavanveda/603_case_summary_report
Yashodha Chaku [Tue, 18 Dec 2018 07:53:27 +0000 (13:23 +0530)]
Merge pull request #13296 from mathavanveda/603_case_summary_report

dev/core#603 not set default value yes/no for active relationship filters

5 years agoMerge pull request #13308 from seamuslee001/5.9
Eileen McNaughton [Tue, 18 Dec 2018 07:14:38 +0000 (20:14 +1300)]
Merge pull request #13308 from seamuslee001/5.9

Add release notes for 5.8.2 & 5.8.1

5 years agoBump Recommended PHP version to 7.2 and min recommend to be 7.1 as per Eileen
Seamus Lee [Tue, 18 Dec 2018 06:07:09 +0000 (17:07 +1100)]
Bump Recommended PHP version to 7.2 and min recommend to be 7.1 as per Eileen

5 years agoBump Minimum Required PHP to be 5.6
Seamus Lee [Tue, 18 Dec 2018 06:00:47 +0000 (17:00 +1100)]
Bump Minimum Required PHP to be 5.6

5 years agorelease-notes/5.8.1.md - Add missing item
Tim Otten [Thu, 13 Dec 2018 07:24:29 +0000 (23:24 -0800)]
release-notes/5.8.1.md - Add missing item

5 years agorelease-notes/5.8.1.md - Copy edit
Tim Otten [Thu, 13 Dec 2018 06:13:21 +0000 (22:13 -0800)]
release-notes/5.8.1.md - Copy edit