civicrm-core.git
7 years agoMerge pull request #10897 from agh1/4.7.24-releasenotes
Tim Otten [Thu, 7 Sep 2017 03:11:08 +0000 (20:11 -0700)]
Merge pull request #10897 from agh1/4.7.24-releasenotes

4.7.24 release notes

7 years ago4.7.24 Release notes: contributors
Andrew Hunt [Wed, 6 Sep 2017 23:25:33 +0000 (19:25 -0400)]
4.7.24 Release notes: contributors

7 years agoRelease notes 4.7.24: edits and reorganization
Andrew Hunt [Wed, 6 Sep 2017 23:09:18 +0000 (19:09 -0400)]
Release notes 4.7.24: edits and reorganization

7 years agoMerge pull request #3 from alifrumin/4.7.24-releasenotes
Andrew Hunt [Wed, 6 Sep 2017 22:01:09 +0000 (18:01 -0400)]
Merge pull request #3 from alifrumin/4.7.24-releasenotes

4.7.24 releasenotes edits

7 years agocleaning up and dealing with documentation of bigger changes
Alice Frumin [Wed, 6 Sep 2017 21:24:39 +0000 (17:24 -0400)]
cleaning up and dealing with documentation of bigger changes

7 years agomoving around issues between bugs and features
Alice Frumin [Wed, 6 Sep 2017 20:04:50 +0000 (16:04 -0400)]
moving around issues between bugs and features

7 years ago4.7.24 release notes: boilerplate added
Andrew Hunt [Thu, 24 Aug 2017 02:57:21 +0000 (22:57 -0400)]
4.7.24 release notes: boilerplate added

7 years ago4.7.24 release notes: raw from script
Andrew Hunt [Wed, 6 Sep 2017 14:22:57 +0000 (10:22 -0400)]
4.7.24 release notes: raw from script

7 years agoMerge pull request #10948 from colemanw/CRM-20941
Eileen McNaughton [Wed, 6 Sep 2017 02:01:37 +0000 (14:01 +1200)]
Merge pull request #10948 from colemanw/CRM-20941

CRM-20941 - Display correct version number in upgrade message

7 years agoCRM-20941 - Add punctuation to the end of sentences.
Coleman Watts [Wed, 6 Sep 2017 01:08:43 +0000 (21:08 -0400)]
CRM-20941 - Add punctuation to the end of sentences.

7 years agoCRM-20941 - Display correct version number in upgrade message
Coleman Watts [Wed, 6 Sep 2017 01:05:10 +0000 (21:05 -0400)]
CRM-20941 - Display correct version number in upgrade message

7 years agoMerge pull request #10932 from jitendrapurohit/CRM-21135-rcfix
colemanw [Fri, 1 Sep 2017 14:34:37 +0000 (10:34 -0400)]
Merge pull request #10932 from jitendrapurohit/CRM-21135-rcfix

CRM-21135 - Activity filter preference are not remembered when enable…

7 years agoCRM-21135 - Activity filter preference are not remembered when enabled in display...
Jitendra Purohit [Fri, 1 Sep 2017 10:53:17 +0000 (16:23 +0530)]
CRM-21135 - Activity filter preference are not remembered when enabled in display settings

7 years agoMerge pull request #10895 from seamuslee001/CRM-21100-rc
Eileen McNaughton [Wed, 23 Aug 2017 21:41:39 +0000 (09:41 +1200)]
Merge pull request #10895 from seamuslee001/CRM-21100-rc

CRM-21100 Hotfix to ensure that testGroup list is still the same as p…

7 years agoCRM-21100 Hotfix to ensure that testGroup list is still the same as previous, need...
Seamus Lee [Wed, 23 Aug 2017 20:46:34 +0000 (06:46 +1000)]
CRM-21100 Hotfix to ensure that testGroup list is still the same as previous, need to work on converting to AJAX list

7 years agoMerge pull request #10880 from seamuslee001/CRM-21070
Eileen McNaughton [Mon, 21 Aug 2017 08:11:20 +0000 (20:11 +1200)]
Merge pull request #10880 from seamuslee001/CRM-21070

CRM-21070 Remove reference to outdated template url file

7 years agoCRM-21070 Remove reference to outdated template url file
Seamus Lee [Mon, 21 Aug 2017 07:19:05 +0000 (17:19 +1000)]
CRM-21070 Remove reference to outdated template url file

7 years agoMerge pull request #10869 from MegaphoneJon/4.7.24-rc
Eileen McNaughton [Mon, 21 Aug 2017 05:01:29 +0000 (22:01 -0700)]
Merge pull request #10869 from MegaphoneJon/4.7.24-rc

CRM-21076 - ACL Role Assignments aren't browseable

7 years agoMerge pull request #10875 from civicrm/4.7.23-rc
Tim Otten [Fri, 18 Aug 2017 21:03:32 +0000 (14:03 -0700)]
Merge pull request #10875 from civicrm/4.7.23-rc

Bring 4.7.23 Release notes into 4.7.24

7 years agoMerge pull request #10872 from seamuslee001/CRM-20941-rc
Eileen McNaughton [Fri, 18 Aug 2017 03:09:26 +0000 (23:09 -0400)]
Merge pull request #10872 from seamuslee001/CRM-20941-rc

CRM-20941 Port changes to push minimum version of PHP to 5.6 with new message for php 5.3 and php5.4

7 years agoCRM-20941 Add in Link to blog post on bumping PHP Version
Seamus Lee [Wed, 16 Aug 2017 21:04:09 +0000 (07:04 +1000)]
CRM-20941 Add in Link to blog post on bumping PHP Version

7 years agoCRM-20941 Bump Minimum PHP Version to 5.6, Add in pre-upgrade messages specific to...
Seamus Lee [Sat, 12 Aug 2017 23:34:15 +0000 (09:34 +1000)]
CRM-20941 Bump Minimum PHP Version to 5.6, Add in pre-upgrade messages specific to 5.4 and 5.3 and alter Status Check message accordingly

7 years agoCRM-21076 - ACL Role Assignments aren't browseable
Jon goldberg [Thu, 17 Aug 2017 16:39:31 +0000 (12:39 -0400)]
CRM-21076 - ACL Role Assignments aren't browseable

7 years agoMerge pull request #10814 from JMAConsulting/CRM-20610-3-rc
Eileen McNaughton [Wed, 9 Aug 2017 13:28:17 +0000 (09:28 -0400)]
Merge pull request #10814 from JMAConsulting/CRM-20610-3-rc

CRM-20610: Handle payment instrument change on Payment Edit form

7 years agoMerge pull request #10833 from JMAConsulting/CRM-20800-rc
colemanw [Wed, 9 Aug 2017 13:03:15 +0000 (09:03 -0400)]
Merge pull request #10833 from JMAConsulting/CRM-20800-rc

CRM-20800 : User Cannot Cancel Recurring Payment With Paypal

7 years agoCRM-20800 : User Cannot Cancel Recurring Payment With Paypal
deb.monish [Wed, 9 Aug 2017 07:57:31 +0000 (13:27 +0530)]
CRM-20800 : User Cannot Cancel Recurring Payment With Paypal

7 years agoMerge pull request #10818 from eileenmcnaughton/recur_date
Monish Deb [Mon, 7 Aug 2017 12:03:48 +0000 (17:33 +0530)]
Merge pull request #10818 from eileenmcnaughton/recur_date

CRM-21027 Fix next recurring payment not accurately calculated

7 years agotest build failure fix
deb.monish [Fri, 4 Aug 2017 17:40:03 +0000 (23:10 +0530)]
test build failure fix

7 years agoMerge pull request #10820 from JMAConsulting/CRM-21029
colemanw [Fri, 4 Aug 2017 22:00:39 +0000 (18:00 -0400)]
Merge pull request #10820 from JMAConsulting/CRM-21029

CRM-21029 - Report - Fix Activity Report SQL Syntax Error

7 years agoCRM-21029 - Report - Fix Activity Report SQL Syntax Error
Thomas Schüttler [Fri, 4 Aug 2017 10:40:40 +0000 (12:40 +0200)]
CRM-21029 - Report - Fix Activity Report SQL Syntax Error

7 years agoconcatenate check_number and trxn_id in contribution
deb.monish [Fri, 4 Aug 2017 12:44:02 +0000 (18:14 +0530)]
concatenate check_number and trxn_id in contribution

7 years agoadditional fixes
deb.monish [Fri, 4 Aug 2017 11:07:29 +0000 (16:37 +0530)]
additional fixes

7 years agoCRM-21027 Fix next recurring payment not accurately calculated when effective date...
eileen [Fri, 4 Aug 2017 08:49:32 +0000 (20:49 +1200)]
CRM-21027 Fix next recurring payment not accurately calculated when effective date passed in

7 years agoadded unit test and other changes
deb.monish [Thu, 3 Aug 2017 11:50:11 +0000 (17:20 +0530)]
added unit test and other changes

7 years agoCRM-20610: Handle payment instrument change on Payment Edit form
deb.monish [Wed, 2 Aug 2017 20:54:03 +0000 (02:24 +0530)]
CRM-20610: Handle payment instrument change on Payment Edit form

7 years agoMerge pull request #10810 from totten/4.7.23-rc-notes
Tim Otten [Thu, 3 Aug 2017 04:16:21 +0000 (21:16 -0700)]
Merge pull request #10810 from totten/4.7.23-rc-notes

(NFC) Update 4.7.23 release notes

7 years agoMerge pull request #10811 from jitendrapurohit/CRM-20913-sync-inprogress
Eileen McNaughton [Thu, 3 Aug 2017 04:14:15 +0000 (16:14 +1200)]
Merge pull request #10811 from jitendrapurohit/CRM-20913-sync-inprogress

CRM-20913: Fix inprogress value to match with contribution status

7 years agoCRM-20913: Fix inprogress value to match with contribution status
Jitendra Purohit [Thu, 3 Aug 2017 04:01:07 +0000 (09:31 +0530)]
CRM-20913: Fix inprogress value to match with contribution status

7 years agoUpdate 4.7.23.md
Tim Otten [Thu, 3 Aug 2017 03:20:55 +0000 (20:20 -0700)]
Update 4.7.23.md

7 years agoUpdate 4.7.23.md
Tim Otten [Thu, 3 Aug 2017 03:17:51 +0000 (20:17 -0700)]
Update 4.7.23.md

7 years agoUpdate 4.7.23.md
Tim Otten [Thu, 3 Aug 2017 03:09:58 +0000 (20:09 -0700)]
Update 4.7.23.md

7 years agoUpdate 4.7.23.md - Capitalization
Tim Otten [Thu, 3 Aug 2017 02:54:23 +0000 (19:54 -0700)]
Update 4.7.23.md - Capitalization

7 years agoMerge pull request #10703 from agh1/4.7.23-release-notes
Tim Otten [Wed, 2 Aug 2017 23:44:29 +0000 (16:44 -0700)]
Merge pull request #10703 from agh1/4.7.23-release-notes

4.7.23 release notes

7 years agoMerge pull request #10807 from mattwire/link_to_release_notes
Eileen McNaughton [Wed, 2 Aug 2017 20:19:27 +0000 (08:19 +1200)]
Merge pull request #10807 from mattwire/link_to_release_notes

CRM-21012 Add link to release notes

7 years agoMerge pull request #10803 from jitendrapurohit/CRM-20913-sync-ov
Eileen McNaughton [Wed, 2 Aug 2017 19:45:54 +0000 (07:45 +1200)]
Merge pull request #10803 from jitendrapurohit/CRM-20913-sync-ov

CRM-20913 use pledge option group for pledge payments

7 years agoMerge pull request #10806 from JMAConsulting/CRM-20610-2
colemanw [Wed, 2 Aug 2017 18:58:04 +0000 (14:58 -0400)]
Merge pull request #10806 from JMAConsulting/CRM-20610-2

CRM-20610: 'Payment Edit' form improvements

7 years ago4.7.23 release notes: contributors
Andrew Hunt [Wed, 2 Aug 2017 17:48:26 +0000 (13:48 -0400)]
4.7.23 release notes: contributors

7 years ago4.7.23-release-notes: issues done, on to the contributors
Andrew Hunt [Wed, 2 Aug 2017 17:24:56 +0000 (13:24 -0400)]
4.7.23-release-notes: issues done, on to the contributors

7 years agoAdd link to release notes
Matthew Wire [Wed, 2 Aug 2017 15:51:13 +0000 (16:51 +0100)]
Add link to release notes

7 years ago4.7.23 release notes: more bugs, plus added version summary grid
Andrew Hunt [Wed, 2 Aug 2017 14:22:20 +0000 (10:22 -0400)]
4.7.23 release notes: more bugs, plus added version summary grid

7 years agoadd metadata to trxn_id
deb.monish [Wed, 2 Aug 2017 14:11:03 +0000 (19:41 +0530)]
add metadata to trxn_id

7 years agoCRM-20610: 'Payment Edit' form improvements
deb.monish [Tue, 1 Aug 2017 10:45:40 +0000 (16:15 +0530)]
CRM-20610: 'Payment Edit' form improvements

7 years agoMerge pull request #10677 from fuzionnz/CRM-20885-suppress_fakefile_error
Monish Deb [Wed, 2 Aug 2017 09:33:59 +0000 (15:03 +0530)]
Merge pull request #10677 from fuzionnz/CRM-20885-suppress_fakefile_error

Suppress error if fakeFile cannot be created.

7 years agosync value for overdue with contribution status for safety
Jitendra Purohit [Wed, 2 Aug 2017 08:56:16 +0000 (14:26 +0530)]
sync value for overdue with contribution status for safety

7 years agoCRM-20913 use pledge option group for pledge payments
eileen [Mon, 31 Jul 2017 04:57:44 +0000 (16:57 +1200)]
CRM-20913 use pledge option group for pledge payments

7 years agoMerge pull request #10303 from seamuslee001/CRM-20521
Monish Deb [Wed, 2 Aug 2017 06:53:20 +0000 (12:23 +0530)]
Merge pull request #10303 from seamuslee001/CRM-20521

CRM-20521 Convert returning groups and mailings for CiviMail new mail…

7 years ago4.7.23 release notes: features
Andrew Hunt [Wed, 2 Aug 2017 04:43:57 +0000 (00:43 -0400)]
4.7.23 release notes: features

7 years ago4.7.22 release notes: added credits for 4.7.22
Andrew Hunt [Wed, 19 Jul 2017 23:07:35 +0000 (19:07 -0400)]
4.7.22 release notes: added credits for 4.7.22

7 years ago4.7.23 release notes: add item to main list
Andrew Hunt [Wed, 19 Jul 2017 22:51:24 +0000 (18:51 -0400)]
4.7.23 release notes: add item to main list

7 years ago4.7.23 release notes: new script run
Andrew Hunt [Wed, 2 Aug 2017 01:49:46 +0000 (21:49 -0400)]
4.7.23 release notes: new script run

7 years agoMerge pull request #10799 from JMAConsulting/CRM-21002
Eileen McNaughton [Tue, 1 Aug 2017 22:45:34 +0000 (10:45 +1200)]
Merge pull request #10799 from JMAConsulting/CRM-21002

CRM-21002: Credit card type icons are incorrectly populated on backoffice live mode

7 years agoCRM-20521 Ensure that only Mailing List groups appear in the receipients box
Seamus Lee [Mon, 31 Jul 2017 21:51:02 +0000 (21:51 +0000)]
CRM-20521 Ensure that only Mailing List groups appear in the receipients box

7 years agoCRM-20521 Ensure that Disabled groups are also excluded
Seamus Lee [Thu, 1 Jun 2017 22:21:47 +0000 (08:21 +1000)]
CRM-20521 Ensure that Disabled groups are also excluded

7 years agoCRM-20521 Convert returning groups and mailings for CiviMail new mailing screen into...
Seamus Lee [Thu, 4 May 2017 11:23:31 +0000 (21:23 +1000)]
CRM-20521 Convert returning groups and mailings for CiviMail new mailing screen into an API request rather than loading in the DOM

7 years agoCRM-21002: Credit card type icons are incorrectly populated on backoffice live mode
deb.monish [Tue, 1 Aug 2017 18:45:30 +0000 (00:15 +0530)]
CRM-21002: Credit card type icons are incorrectly populated on backoffice live mode

7 years agoMerge pull request #10796 from tschuettler/CRM-20995
colemanw [Tue, 1 Aug 2017 16:06:08 +0000 (12:06 -0400)]
Merge pull request #10796 from tschuettler/CRM-20995

CRM-20995 - API - Extension get - Filter by full_name

7 years agoChange new parameter to default to 'keys'
Thomas Schüttler [Tue, 1 Aug 2017 10:55:06 +0000 (12:55 +0200)]
Change new parameter to default to 'keys'

7 years agoMerge pull request #10340 from Stoob/master
Eileen McNaughton [Mon, 31 Jul 2017 23:37:40 +0000 (11:37 +1200)]
Merge pull request #10340 from Stoob/master

CRM-20563 change fatal error message

7 years agoMerge pull request #10795 from jitendrapurohit/CRM-20994
colemanw [Mon, 31 Jul 2017 19:38:08 +0000 (15:38 -0400)]
Merge pull request #10795 from jitendrapurohit/CRM-20994

CRM-20994 : Fix hardcoded relationship type value

7 years agoMerge pull request #10792 from seamuslee001/CRM-20989
Monish Deb [Mon, 31 Jul 2017 17:38:03 +0000 (23:08 +0530)]
Merge pull request #10792 from seamuslee001/CRM-20989

CRM-20989 Fix Active provider count to know about multisite

7 years agoMerge pull request #10789 from JMAConsulting/CRM-20987
Monish Deb [Mon, 31 Jul 2017 17:37:14 +0000 (23:07 +0530)]
Merge pull request #10789 from JMAConsulting/CRM-20987

CRM-20987, added batch transaction column

7 years agoFix coding standard
Thomas Schüttler [Mon, 31 Jul 2017 15:41:44 +0000 (17:41 +0200)]
Fix coding standard

7 years agoFix undefined index in UnitTests
Thomas Schüttler [Mon, 31 Jul 2017 15:39:32 +0000 (17:39 +0200)]
Fix undefined index in UnitTests

7 years agoCRM-20995 - API - Extension get - Filter by full_name
Thomas Schüttler [Mon, 31 Jul 2017 10:55:38 +0000 (12:55 +0200)]
CRM-20995 - API - Extension get - Filter by full_name

----------------------------------------
* CRM-20995: API - Extension get - Ignores parameter full_name as created by API explorer
  https://issues.civicrm.org/jira/browse/CRM-20995

7 years agoCRM-20994 : Fix hardcoded relationship type value
Jitendra Purohit [Mon, 31 Jul 2017 10:50:09 +0000 (16:20 +0530)]
CRM-20994 : Fix hardcoded relationship type value

7 years agoMerge pull request #10788 from JMAConsulting/CRM-20947
Eileen McNaughton [Mon, 31 Jul 2017 07:08:09 +0000 (19:08 +1200)]
Merge pull request #10788 from JMAConsulting/CRM-20947

CRM-20947, fixed notice error on Activity tab

7 years agoCRM-20987, fixed unit test
Pradeep Nayak [Mon, 31 Jul 2017 06:03:48 +0000 (11:33 +0530)]
CRM-20987, fixed unit test

----------------------------------------
* CRM-20987: Add transaction date field to listings of transactions
  https://issues.civicrm.org/jira/browse/CRM-20987

fixed indexes

7 years agoAdd Unit test to provde domain filtering is working with activeProviderCount
Seamus Lee [Mon, 31 Jul 2017 06:36:48 +0000 (16:36 +1000)]
Add Unit test to provde domain filtering is working with activeProviderCount

7 years agoCRM-20989 Fix Active provider count to know about multistie and return a proper count
Seamus Lee [Mon, 31 Jul 2017 06:11:57 +0000 (16:11 +1000)]
CRM-20989 Fix Active provider count to know about multistie and return a proper count

7 years agoCRM-20947, fixed notice error
Pradeep Nayak [Mon, 31 Jul 2017 02:03:01 +0000 (07:33 +0530)]
CRM-20947, fixed notice error

----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
  https://issues.civicrm.org/jira/browse/CRM-20947

fixed fieldname

7 years agoMerge pull request #10763 from JMAConsulting/CRM-20967
Eileen McNaughton [Mon, 31 Jul 2017 05:10:54 +0000 (17:10 +1200)]
Merge pull request #10763 from JMAConsulting/CRM-20967

CRM-20967, use is_payment = TRUE to retrieve payments

7 years agoMerge pull request #10787 from JMAConsulting/CRM-20984
Eileen McNaughton [Mon, 31 Jul 2017 03:39:16 +0000 (15:39 +1200)]
Merge pull request #10787 from JMAConsulting/CRM-20984

CRM-20984: Move placement of payment processor field

7 years agoCRM-20987, added batch transaction column
Pradeep Nayak [Mon, 31 Jul 2017 02:59:34 +0000 (08:29 +0530)]
CRM-20987, added batch transaction column

----------------------------------------
* CRM-20987: Add transaction date field to listings of transactions
  https://issues.civicrm.org/jira/browse/CRM-20987

7 years agoCRM-20947, fixed notice error on Activity tab
Pradeep Nayak [Mon, 31 Jul 2017 01:57:54 +0000 (07:27 +0530)]
CRM-20947, fixed notice error on Activity tab

----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
  https://issues.civicrm.org/jira/browse/CRM-20947

7 years agoMerge pull request #10726 from JMAConsulting/CRM-20946
Eileen McNaughton [Sun, 30 Jul 2017 21:52:59 +0000 (09:52 +1200)]
Merge pull request #10726 from JMAConsulting/CRM-20946

CRM-20946, use line total of line item to store in financial item table

7 years agoCRM-20984: Move placement of payment processor field
deb.monish [Sun, 30 Jul 2017 20:43:26 +0000 (02:13 +0530)]
CRM-20984: Move placement of payment processor field

7 years agoMerge pull request #10765 from seamuslee001/report_fixes
Monish Deb [Sun, 30 Jul 2017 19:07:41 +0000 (00:37 +0530)]
Merge pull request #10765 from seamuslee001/report_fixes

CRM-20969 Fix issues in order by clauses of reports showing errors in 7.1

7 years agoadded unit test
deb.monish [Sat, 29 Jul 2017 18:42:10 +0000 (00:12 +0530)]
added unit test

7 years agoCRM-20946, use line total of line itme to store in financial item table
Pradeep Nayak [Sun, 23 Jul 2017 10:05:01 +0000 (15:35 +0530)]
CRM-20946, use line total of line itme to store in financial item table

----------------------------------------
* CRM-20946: Wrong entries in financial table when contribution is cancelled
  https://issues.civicrm.org/jira/browse/CRM-20946

7 years agoRemove orderBy function following Eileen's testing
Seamus Lee [Sun, 30 Jul 2017 06:39:24 +0000 (16:39 +1000)]
Remove orderBy function following Eileen's testing

7 years agoUse the orderByArray and groupByArray variables
Seamus Lee [Sat, 29 Jul 2017 05:26:42 +0000 (15:26 +1000)]
Use the orderByArray and groupByArray variables

7 years agoCRM-20969 alternate approach to resolving php 7.1 errors
eileen [Fri, 28 Jul 2017 02:23:03 +0000 (14:23 +1200)]
CRM-20969 alternate approach to resolving php 7.1 errors

I am proposing this as an alternate approach for fixing the 7.1 errors.

Note this only covers one report - I think we should move that function which is actually
generic to the parent class, however I think the one in contribute.summary is
a bit more nuanced.

Note this is also the approach taken by the extendedreport
extension (which takes it a little further). I will remove the declaration of
groupByArray from that extension if we add it here

I do have a medium term plan to move a lot of the helpers from extended report back into core.

Change-Id: I377d33a7417ff93169f12ccbda77f3662da5bac1

7 years agoFix issues in order by clauses of reports showing errors in 7.1
Seamus Lee [Tue, 25 Jul 2017 07:54:12 +0000 (17:54 +1000)]
Fix issues in order by clauses of reports showing errors in 7.1

7 years agoMerge pull request #10737 from jitendrapurohit/CRM-20913
Monish Deb [Sat, 29 Jul 2017 19:49:31 +0000 (01:19 +0530)]
Merge pull request #10737 from jitendrapurohit/CRM-20913

CRM-20913 - Add separate option group for pledge status

7 years agoMerge pull request #10699 from JMAConsulting/CRM-20321-1
colemanw [Sat, 29 Jul 2017 17:59:31 +0000 (13:59 -0400)]
Merge pull request #10699 from JMAConsulting/CRM-20321-1

[re-submitted and unchanged] CRM-20321, CRM-20652 : Changing membership type should change related contribution and generalise changeFeeSelection function to be used for any entity

7 years agoMerge pull request #10383 from MegaphoneJon/unsupervised-reserved-threshold
colemanw [Sat, 29 Jul 2017 14:15:59 +0000 (10:15 -0400)]
Merge pull request #10383 from MegaphoneJon/unsupervised-reserved-threshold

CRM-20607 - Dedupe - Allow saving reserved groups

7 years agogenerated data
Jitendra Purohit [Sat, 29 Jul 2017 05:12:09 +0000 (10:42 +0530)]
generated data

7 years agoMerge pull request #10782 from JMAConsulting/CRM-20947
Eileen McNaughton [Sat, 29 Jul 2017 02:58:44 +0000 (14:58 +1200)]
Merge pull request #10782 from JMAConsulting/CRM-20947

CRM-20947, fixed notice error for deprecated function on batch form

7 years agoMerge pull request #10784 from totten/master-prtpl
Eileen McNaughton [Sat, 29 Jul 2017 02:55:42 +0000 (14:55 +1200)]
Merge pull request #10784 from totten/master-prtpl

CRM-20965 - PULL_REQUEST_TEMPLATE - Change header notation

7 years agoCRM-20965 - PULL_REQUEST_TEMPLATE - Change header notation
Tim Otten [Sat, 29 Jul 2017 00:24:00 +0000 (17:24 -0700)]
CRM-20965 - PULL_REQUEST_TEMPLATE - Change header notation

If you use the `#` notation for headers, the Github CLI (`hub pull-request`)
would filter out those lines as comments.

Using the `---` notation should provide that.