civicrm-core.git
6 years agoOnly treat a request as a get request (and hence use GET) if it starts with get
eileen [Wed, 13 Jun 2018 02:07:21 +0000 (14:07 +1200)]
Only treat a request as a get request (and hence use GET) if it starts with get

Current code looks for the word 'get' anywhere in the action so the action 'forget' is also picked up.

Further down we explicitly look for 0 so we should here too.

6 years agoMerge pull request #11830 from mattwire/devcore24_case_api_contact_fix
colemanw [Wed, 13 Jun 2018 01:40:52 +0000 (21:40 -0400)]
Merge pull request #11830 from mattwire/devcore24_case_api_contact_fix

dev/core#24 Passing an array for contact_id/client_id to Case.Create API when updating an existing case causes case to be "reassigned"

6 years agoMerge pull request #11481 from jitendrapurohit/CRM-21622
Eileen McNaughton [Tue, 12 Jun 2018 22:42:13 +0000 (10:42 +1200)]
Merge pull request #11481 from jitendrapurohit/CRM-21622

CRM-21622: Allow multiple parents to be created from 'New Group' form.

6 years agoMerge pull request #12276 from eileenmcnaughton/memory_more
colemanw [Tue, 12 Jun 2018 12:44:41 +0000 (08:44 -0400)]
Merge pull request #12276 from eileenmcnaughton/memory_more

CRM-19798 fix memory leak on EntityTag.get & other calls in the DB (generic fix)

6 years agoMerge pull request #12302 from totten/master-redis-null
Eileen McNaughton [Tue, 12 Jun 2018 05:15:18 +0000 (17:15 +1200)]
Merge pull request #12302 from totten/master-redis-null

(dev/core#177) Redis::get() should return NULL for undefined cache keys

6 years ago(dev/core#177) Redis::get() should return NULL for undefined cache keys
Tim Otten [Fri, 30 Mar 2018 01:14:48 +0000 (18:14 -0700)]
(dev/core#177) Redis::get() should return NULL for undefined cache keys

The docs for  `CRM_Utils_Cache_Interface::get()` specify that the return value should be NULL
if the key does not exist.

However, `CRM_Utils_Cache_Redis::get()` was returning FALSE in that circumstance
(because `unserialize(FALSE)===FALSE`). This fixes it comply.

6 years agoMerge pull request #12301 from jitendrapurohit/core-175
Seamus Lee [Mon, 11 Jun 2018 21:24:23 +0000 (07:24 +1000)]
Merge pull request #12301 from jitendrapurohit/core-175

dev/core#175 - Smart group involving relationship type filter display…

6 years agoMerge pull request #12281 from eileenmcnaughton/cont_detail_report
Seamus Lee [Mon, 11 Jun 2018 21:12:21 +0000 (07:12 +1000)]
Merge pull request #12281 from eileenmcnaughton/cont_detail_report

Add testing to contribution detail report, covering dev/core/issues#170

6 years agoMerge pull request #11883 from jitendrapurohit/core-32
Eileen McNaughton [Mon, 11 Jun 2018 20:00:02 +0000 (08:00 +1200)]
Merge pull request #11883 from jitendrapurohit/core-32

core-32 - Add option to disable cancel button on a profile form

6 years agoMerge pull request #11736 from jitendrapurohit/CRM-21815
colemanw [Mon, 11 Jun 2018 16:21:16 +0000 (12:21 -0400)]
Merge pull request #11736 from jitendrapurohit/CRM-21815

CRM-21815 - re-opening a civicase - Case Coordinator (and other roles…

6 years agoMerge pull request #12298 from eileenmcnaughton/notice
colemanw [Mon, 11 Jun 2018 15:44:08 +0000 (11:44 -0400)]
Merge pull request #12298 from eileenmcnaughton/notice

Fix e-notice, remove legacy code pattern

6 years agoMerge pull request #12299 from eileenmcnaughton/cancel_recur
colemanw [Mon, 11 Jun 2018 13:54:16 +0000 (09:54 -0400)]
Merge pull request #12299 from eileenmcnaughton/cancel_recur

Remove unused code variable

6 years agoMove upgrade function to 5.4
Jitendra Purohit [Mon, 11 Jun 2018 11:31:49 +0000 (17:01 +0530)]
Move upgrade function to 5.4

6 years agocore-32 - Add option to disable cancel button on a profile form
Jitendra Purohit [Tue, 27 Mar 2018 06:11:56 +0000 (11:41 +0530)]
core-32 - Add option to disable cancel button on a profile form

6 years agoadd unit test
Jitendra Purohit [Mon, 11 Jun 2018 10:14:40 +0000 (15:44 +0530)]
add unit test

6 years agodev/core#175 - Smart group involving relationship type filter display incorrect results
Jitendra Purohit [Mon, 11 Jun 2018 09:50:58 +0000 (15:20 +0530)]
dev/core#175 - Smart group involving relationship type filter display incorrect results

6 years agoMerge pull request #11964 from scardinius/core-56
Seamus Lee [Mon, 11 Jun 2018 05:50:14 +0000 (15:50 +1000)]
Merge pull request #11964 from scardinius/core-56

(dev/core/56) Cancel Recurring Contribution activity should has a source record id

6 years agoMerge pull request #12300 from civicrm/5.3
Eileen McNaughton [Mon, 11 Jun 2018 04:32:27 +0000 (16:32 +1200)]
Merge pull request #12300 from civicrm/5.3

5.3

6 years agoMerge pull request #12277 from seamuslee001/dev_core_163
Seamus Lee [Mon, 11 Jun 2018 03:39:56 +0000 (13:39 +1000)]
Merge pull request #12277 from seamuslee001/dev_core_163

dev/core#163 Improve inclusion of disabled groups when getting all ma…

6 years agoRemove unused code variable
eileen [Mon, 11 Jun 2018 01:13:30 +0000 (13:13 +1200)]
Remove unused code variable

6 years agodev/core#163 Improve way of getting all groups for use in getting all mailing accessa...
Seamus Lee [Thu, 7 Jun 2018 03:25:55 +0000 (13:25 +1000)]
dev/core#163 Improve way of getting all groups for use in getting all mailing accessable by a user by removing is_active filter alltogether

6 years agoFix e-notice, remove legacy code pattern
eileen [Mon, 11 Jun 2018 00:16:49 +0000 (12:16 +1200)]
Fix e-notice, remove legacy code pattern

6 years agoMerge pull request #12295 from eileenmcnaughton/mailing
Seamus Lee [Mon, 11 Jun 2018 00:13:50 +0000 (10:13 +1000)]
Merge pull request #12295 from eileenmcnaughton/mailing

Confirm & lock in group.get handling of is_active

6 years agoMerge pull request #12297 from civicrm/5.3
Eileen McNaughton [Mon, 11 Jun 2018 00:13:12 +0000 (12:13 +1200)]
Merge pull request #12297 from civicrm/5.3

5.3

6 years agoMerge pull request #12294 from seamuslee001/remove_payflow_recur
Seamus Lee [Sun, 10 Jun 2018 23:39:06 +0000 (09:39 +1000)]
Merge pull request #12294 from seamuslee001/remove_payflow_recur

Remove unused function getRecuringTransactionStatus from PayflowPro c…

6 years agoMerge pull request #12293 from colemanw/arrayUtil
Seamus Lee [Sun, 10 Jun 2018 23:17:33 +0000 (09:17 +1000)]
Merge pull request #12293 from colemanw/arrayUtil

Improve CRM_Utils_Array::recursiveBuild to work with existing arrays.

6 years agoMerge pull request #12224 from eileenmcnaughton/templates
Seamus Lee [Sun, 10 Jun 2018 22:06:58 +0000 (08:06 +1000)]
Merge pull request #12224 from eileenmcnaughton/templates

Add upgrade function for message templates that does not involve copying the whole template

6 years agoConfirm & lock in group.get handling of is_active
eileen [Sun, 10 Jun 2018 22:03:03 +0000 (10:03 +1200)]
Confirm & lock in group.get handling of is_active

6 years agoRemove unused function getRecuringTransactionStatus from PayflowPro class
Seamus Lee [Sun, 10 Jun 2018 21:37:17 +0000 (07:37 +1000)]
Remove unused function getRecuringTransactionStatus from PayflowPro class

6 years agoImprove CRM_Utils_Array::recursiveBuild to work with existing arrays.
Coleman Watts [Sun, 10 Jun 2018 19:41:42 +0000 (15:41 -0400)]
Improve CRM_Utils_Array::recursiveBuild to work with existing arrays.

6 years agodev/core#170 fix regression on soft_credits with unit test
eileen [Fri, 8 Jun 2018 01:32:37 +0000 (13:32 +1200)]
dev/core#170 fix regression on soft_credits with unit test

6 years agoMerge pull request #12288 from eileenmcnaughton/export
colemanw [Sat, 9 Jun 2018 21:15:02 +0000 (17:15 -0400)]
Merge pull request #12288 from eileenmcnaughton/export

Function extraction BAO_Export class

6 years agoExtract build buildRelatedContactArray function
eileen [Sat, 9 Jun 2018 07:27:32 +0000 (19:27 +1200)]
Extract build buildRelatedContactArray function

6 years agoFurther minor function extraction on Export class
eileen [Sat, 9 Jun 2018 07:24:31 +0000 (19:24 +1200)]
Further minor function extraction on Export class

6 years agoMerge pull request #12289 from eileenmcnaughton/frank
Eileen McNaughton [Sat, 9 Jun 2018 07:09:09 +0000 (19:09 +1200)]
Merge pull request #12289 from eileenmcnaughton/frank

Partial code cleanup & testability improvement towards CRM-21177

6 years agoCleaned up code style. No expected functional change.
Frank J. Gómez [Thu, 28 Sep 2017 15:37:11 +0000 (11:37 -0400)]
Cleaned up code style. No expected functional change.

6 years agoMerge pull request #11726 from scardinius/crm-21808
Eileen McNaughton [Sat, 9 Jun 2018 02:17:13 +0000 (14:17 +1200)]
Merge pull request #11726 from scardinius/crm-21808

CRM-21808 Install custom group for Contribution or ContributioRecur s…

6 years agoMerge pull request #12107 from eileenmcnaughton/save_report
Eileen McNaughton [Sat, 9 Jun 2018 01:32:52 +0000 (13:32 +1200)]
Merge pull request #12107 from eileenmcnaughton/save_report

CRM-20430 - Permission 'save Report Criteria'.

6 years agoMerge pull request #11337 from WeMoveEU/CRM-21460
Eileen McNaughton [Sat, 9 Jun 2018 01:22:02 +0000 (13:22 +1200)]
Merge pull request #11337 from WeMoveEU/CRM-21460

CRM-21460 Add job execution hooks

6 years agoCRM-21177: Added unit test to lock in behavior of properly looking up
Frank J. Gómez [Wed, 27 Sep 2017 23:00:02 +0000 (19:00 -0400)]
CRM-21177: Added unit test to lock in behavior of properly looking up
membership term from the line item.

6 years agoMerge pull request #11945 from mattwire/devcore47_clone_scheduled_jobs
Eileen McNaughton [Fri, 8 Jun 2018 23:57:22 +0000 (11:57 +1200)]
Merge pull request #11945 from mattwire/devcore47_clone_scheduled_jobs

dev/core#47 Add clone scheduled job functionality

6 years agoCRM-20430 - Permission 'save Report Criteria'.
Johan Vervloet [Fri, 14 Apr 2017 12:16:50 +0000 (14:16 +0200)]
CRM-20430 - Permission 'save Report Criteria'.

If you don't have the permission, the 'save report' actions aren't shown
on the form of the report instance.

CRM-20430 - Check 'save Report Criteria' permission before saving a report instance.

Coding style issues.

Added a pre-commit message about the new permission.

6 years agoMerge pull request #12067 from michaelmcandrew/CRM-21576-sms-permission-extra
Eileen McNaughton [Fri, 8 Jun 2018 23:27:21 +0000 (11:27 +1200)]
Merge pull request #12067 from michaelmcandrew/CRM-21576-sms-permission-extra

Make Send SMS permission independent of Edit Contact permission

6 years agoMerge pull request #11956 from MiyaNoctem/CRM-50-sub-tabs-for-contributions
Eileen McNaughton [Fri, 8 Jun 2018 23:08:49 +0000 (11:08 +1200)]
Merge pull request #11956 from MiyaNoctem/CRM-50-sub-tabs-for-contributions

(dev/core/50) Add Separate Sub-tabs for Contributions and Recurring Contributions

6 years agoMerge pull request #12078 from compucorp/101-conditionals-in-search-form
Eileen McNaughton [Fri, 8 Jun 2018 23:00:34 +0000 (11:00 +1200)]
Merge pull request #12078 from compucorp/101-conditionals-in-search-form

dev/core/#101: Allow further customization of search form in hooks

6 years ago@eileenmcnaughton
eileen [Fri, 8 Jun 2018 11:21:05 +0000 (23:21 +1200)]
@eileenmcnaughton
Add contact greeting to membership online receipt text message template

6 years agoAdd upgrade function for message templates that does not involve copying the whole...
eileen [Tue, 29 May 2018 08:36:47 +0000 (20:36 +1200)]
Add upgrade function for message templates that does not involve copying the whole template

6 years agoMerge pull request #11840 from mfb/smtp-reconnect
Eileen McNaughton [Fri, 8 Jun 2018 22:17:02 +0000 (10:17 +1200)]
Merge pull request #11840 from mfb/smtp-reconnect

CiviMail: If SMTP connection error is detected, disconnect so we can reconnect and retry

6 years agoMerge pull request #12287 from eileenmcnaughton/5.3
colemanw [Fri, 8 Jun 2018 20:14:37 +0000 (16:14 -0400)]
Merge pull request #12287 from eileenmcnaughton/5.3

core/#170 minimal fix for fatal on soft_credit field

6 years agoMerge pull request #11724 from lemacarl/CRM-21779
colemanw [Fri, 8 Jun 2018 20:13:08 +0000 (16:13 -0400)]
Merge pull request #11724 from lemacarl/CRM-21779

CRM-21779 - ang\crmMailing - Fix adding empty mailing to recipients field

6 years agodev/core#101 Implement field spec pattern for advanced search form.
Michael Devery [Thu, 3 May 2018 15:32:13 +0000 (16:32 +0100)]
dev/core#101 Implement field spec pattern for advanced search form.

By implementing the field spec pattern as detailed in dev/core#115 extension developers have more control over
 what is displayed in this template without needing to resort to
 overriding it

6 years agoMerge pull request #12284 from jitendrapurohit/mail-1-message
Eileen McNaughton [Fri, 8 Jun 2018 11:11:10 +0000 (23:11 +1200)]
Merge pull request #12284 from jitendrapurohit/mail-1-message

dev/mail#1 - Modify message text for pause mailing

6 years agoMerge pull request #12271 from eileenmcnaughton/membership
Eileen McNaughton [Fri, 8 Jun 2018 10:47:44 +0000 (22:47 +1200)]
Merge pull request #12271 from eileenmcnaughton/membership

Partial refactor of completeMembershipFromContribution

6 years agocore/#170 minimal fix for fatal on soft_credit field
eileen [Fri, 8 Jun 2018 01:35:57 +0000 (13:35 +1200)]
core/#170 minimal fix for fatal on soft_credit field

6 years agoMerge pull request #12285 from eileenmcnaughton/master
Eileen McNaughton [Fri, 8 Jun 2018 09:15:04 +0000 (21:15 +1200)]
Merge pull request #12285 from eileenmcnaughton/master

merge to master

6 years agoMerge branch '5.3' of https://github.com/civicrm/civicrm-core
eileen [Fri, 8 Jun 2018 09:10:25 +0000 (21:10 +1200)]
Merge branch '5.3' of https://github.com/civicrm/civicrm-core

6 years agoMerge pull request #12283 from eileenmcnaughton/cust_test
Eileen McNaughton [Fri, 8 Jun 2018 08:58:04 +0000 (20:58 +1200)]
Merge pull request #12283 from eileenmcnaughton/cust_test

Add unit test for CRM_Core_BAO_CustomField::getCustomFieldID

6 years agoMerge pull request #12282 from eileenmcnaughton/5.3
Monish Deb [Fri, 8 Jun 2018 07:44:24 +0000 (13:14 +0530)]
Merge pull request #12282 from eileenmcnaughton/5.3

core/#170 minimal fix for fatal on soft_credit field

6 years agodev/mail#1 - Modify message text for pause mailing
Jitendra Purohit [Fri, 8 Jun 2018 06:50:50 +0000 (12:20 +0530)]
dev/mail#1 - Modify message text for pause mailing

6 years agoMerge pull request #12279 from colemanw/dev/core#165
Seamus Lee [Fri, 8 Jun 2018 06:11:21 +0000 (16:11 +1000)]
Merge pull request #12279 from colemanw/dev/core#165

dev/core#165 - Fix case activity breadcrumb

6 years agoMerge pull request #12091 from eileenmcnaughton/paypal_exp
Seamus Lee [Fri, 8 Jun 2018 05:21:39 +0000 (15:21 +1000)]
Merge pull request #12091 from eileenmcnaughton/paypal_exp

dev/financial#14 Fix enotices & inability to cancel recurring on paypal express

6 years agoMerge pull request #12181 from JMAConsulting/dev_core_134
Eileen McNaughton [Fri, 8 Jun 2018 04:10:31 +0000 (16:10 +1200)]
Merge pull request #12181 from JMAConsulting/dev_core_134

dev/core#134 Search Builder broken filter for Source Contact ID

6 years agoMerge pull request #12280 from eileenmcnaughton/line_endings
Seamus Lee [Fri, 8 Jun 2018 03:50:20 +0000 (13:50 +1000)]
Merge pull request #12280 from eileenmcnaughton/line_endings

[NFC] Fix line endings (Jenkins where were you)

6 years agoMerge pull request #11803 from jitendrapurohit/mail-1
colemanw [Fri, 8 Jun 2018 02:58:35 +0000 (22:58 -0400)]
Merge pull request #11803 from jitendrapurohit/mail-1

Mail#1 - Add pause/resume functionality to civicrm bulk mailing

6 years agoMerge pull request #12195 from michaelmcandrew/dev/core#140
Eileen McNaughton [Fri, 8 Jun 2018 02:11:54 +0000 (14:11 +1200)]
Merge pull request #12195 from michaelmcandrew/dev/core#140

dev/core#140 add missing pseudoconstant for option_group_id in CustomField.xml

6 years agoMerge pull request #12209 from JMAConsulting/access-3-event
Eileen McNaughton [Fri, 8 Jun 2018 02:05:27 +0000 (14:05 +1200)]
Merge pull request #12209 from JMAConsulting/access-3-event

dev/accessiblity#3 Remove orphan label tag from Event pages

6 years agoAdd unit test for CRM_Core_BAO_CustomField::getCustomFieldID
eileen [Fri, 8 Jun 2018 01:57:17 +0000 (13:57 +1200)]
Add unit test for CRM_Core_BAO_CustomField::getCustomFieldID

6 years agocore/#170 minimal fix for fatal on soft_credit field
eileen [Fri, 8 Jun 2018 01:35:57 +0000 (13:35 +1200)]
core/#170 minimal fix for fatal on soft_credit field

6 years ago[NFC] Fix line endings (Jenkins where were you)
eileen [Fri, 8 Jun 2018 01:00:44 +0000 (13:00 +1200)]
[NFC] Fix line endings (Jenkins where were you)

6 years agodev/core#165 - Fix case activity breadcrumb
Coleman Watts [Thu, 7 Jun 2018 18:39:08 +0000 (14:39 -0400)]
dev/core#165 - Fix case activity breadcrumb

When opening a case activity (without popups) this will correctly set the breadcrumb.

6 years agoMerge pull request #12278 from eileenmcnaughton/5.3
Eileen McNaughton [Thu, 7 Jun 2018 08:35:01 +0000 (20:35 +1200)]
Merge pull request #12278 from eileenmcnaughton/5.3

Fix incorrect operator on previous Export fix

6 years agoFix incorrect operator on previous Export fix
eileen [Thu, 7 Jun 2018 06:29:18 +0000 (18:29 +1200)]
Fix incorrect operator on previous Export fix

6 years agoMerge pull request #12272 from eileenmcnaughton/export_house
Monish Deb [Thu, 7 Jun 2018 04:36:16 +0000 (10:06 +0530)]
Merge pull request #12272 from eileenmcnaughton/export_house

Towards fixing household merge export, extract function, add test, fix prev

6 years agoSet version to 5.4.alpha1
CiviCRM [Thu, 7 Jun 2018 03:50:24 +0000 (03:50 +0000)]
Set version to 5.4.alpha1

6 years agoSet version to 5.3.beta1
CiviCRM [Thu, 7 Jun 2018 03:40:49 +0000 (03:40 +0000)]
Set version to 5.3.beta1

6 years agoCRM-19798 fix memory leak on EntityTag.get
eileen [Wed, 31 Jan 2018 04:53:49 +0000 (17:53 +1300)]
CRM-19798 fix memory leak on EntityTag.get

This is an alternate methodology using __destruct on the DAO object.

Note that I have found some places bypass this - ie.

```
   $rule = new CRM_ACL_BAO_ACL();
   $rule->query($query);
```

But I think that is a pretty clumsy construct & we should swap to
CRM_Core_DAO::executeQuery();

6 years agoMerge pull request #12275 from JMAConsulting/dev_mail_11-1
Eileen McNaughton [Wed, 6 Jun 2018 20:15:11 +0000 (08:15 +1200)]
Merge pull request #12275 from JMAConsulting/dev_mail_11-1

dev/mail#11 add CRM_Mailing_BAO_MailingJob::del()

6 years agoMerge pull request #12193 from eileenmcnaughton/dedupe
Monish Deb [Wed, 6 Jun 2018 19:10:27 +0000 (00:40 +0530)]
Merge pull request #12193 from eileenmcnaughton/dedupe

Fix non-display of conflicts after batch dedupe from dedupe screen

6 years agodev/mail#11 add CRM_Mailing_BAO_MailingJob::del()
deb.monish [Wed, 6 Jun 2018 14:53:30 +0000 (20:23 +0530)]
dev/mail#11 add CRM_Mailing_BAO_MailingJob::del()

6 years agoPartial refactor of completeMembershipFromContribution
eileen [Wed, 6 Jun 2018 10:33:55 +0000 (22:33 +1200)]
Partial refactor of completeMembershipFromContribution

6 years agoMerge pull request #12274 from civicrm/5.2
Eileen McNaughton [Wed, 6 Jun 2018 13:09:57 +0000 (01:09 +1200)]
Merge pull request #12274 from civicrm/5.2

5.2 to master

6 years agoMerge pull request #12273 from eileenmcnaughton/notices
Eileen McNaughton [Wed, 6 Jun 2018 13:09:23 +0000 (01:09 +1200)]
Merge pull request #12273 from eileenmcnaughton/notices

dev/core#158 group contacts list and export limits results to 500 records

6 years agoFix e-notices on export coming from https://github.com/civicrm/civicrm-core/pull...
eileen [Wed, 6 Jun 2018 12:44:13 +0000 (00:44 +1200)]
Fix e-notices on export coming from https://github.com/civicrm/civicrm-core/pull/12110/files

6 years agoTowards fixing household merge export, extract function, add test, fix prev
eileen [Wed, 6 Jun 2018 11:58:03 +0000 (23:58 +1200)]
Towards fixing household merge export, extract function, add test, fix prev

6 years agoMake Send SMS permission independent of Edit Contact permission
Michael McAndrew [Wed, 6 Jun 2018 11:50:00 +0000 (12:50 +0100)]
Make Send SMS permission independent of Edit Contact permission

6 years agoMerge pull request #12266 from jitendrapurohit/core-154
Eileen McNaughton [Wed, 6 Jun 2018 08:38:23 +0000 (20:38 +1200)]
Merge pull request #12266 from jitendrapurohit/core-154

dev/core#154 - Can't edit related records when current employer has a…

6 years agoMerge pull request #10630 from tschuettler/CRM-CRM-20841
Eileen McNaughton [Wed, 6 Jun 2018 06:53:58 +0000 (18:53 +1200)]
Merge pull request #10630 from tschuettler/CRM-CRM-20841

CRM-20841 - Dedupe - Show on_hold, is_bulkmail or signature merge…

6 years agoMerge pull request #12269 from civicrm/5.2
Eileen McNaughton [Wed, 6 Jun 2018 06:13:07 +0000 (18:13 +1200)]
Merge pull request #12269 from civicrm/5.2

5.2.0 merge to master

6 years ago5.2.0 release notes (#12100)
Andrew Hunt [Wed, 6 Jun 2018 06:12:32 +0000 (02:12 -0400)]
5.2.0 release notes (#12100)

* 5.2.0 release notes: raw from script

* 5.2.0 release notes: added boilerplate

* 5.2.0 release notes: first pass of release notes

* 5.2.0 release notes: updated contributors

* 5.2.0 release notes: final edits

* 5.2.0 release notes: update with late RC changes

* Add release notes for 5.1.2

* release-notes - Update 5.1.2

* Fix typo in release-notes for 5.1.2

6 years agodev/core#154 - Can't edit related records when current employer has a pending membership
Jitendra Purohit [Tue, 5 Jun 2018 10:47:11 +0000 (16:17 +0530)]
dev/core#154 - Can't edit related records when current employer has a pending membership

check for pending status instead of pay later

6 years agoMerge pull request #12259 from seamuslee001/dev_core_163
Eileen McNaughton [Wed, 6 Jun 2018 01:37:50 +0000 (13:37 +1200)]
Merge pull request #12259 from seamuslee001/dev_core_163

dev/core#163 Fix issue where disabling a group would block access to …

6 years agoMerge pull request #12267 from colemanw/dev/core/#152
Eileen McNaughton [Tue, 5 Jun 2018 19:51:45 +0000 (07:51 +1200)]
Merge pull request #12267 from colemanw/dev/core/#152

dev/core/#152 - AdvMulti-Select cleanup

6 years agoMerge pull request #12265 from agileware/Accessibility-Issue-9
Monish Deb [Tue, 5 Jun 2018 13:21:57 +0000 (18:51 +0530)]
Merge pull request #12265 from agileware/Accessibility-Issue-9

Accessibility #9: Regression - js error due to alertDismissal setting fixed.

6 years agodev/core/#152 - AdvMulti-Select cleanup
Coleman Watts [Tue, 5 Jun 2018 13:17:31 +0000 (09:17 -0400)]
dev/core/#152 - AdvMulti-Select cleanup

6 years agoAccessibility #9: Regression - js error due to alertDismissal setting fixed.
Alok Patel [Tue, 5 Jun 2018 11:04:07 +0000 (16:34 +0530)]
Accessibility #9: Regression - js error due to alertDismissal setting fixed.

6 years agoMerge pull request #12264 from civicrm/5.2
Eileen McNaughton [Tue, 5 Jun 2018 10:21:00 +0000 (22:21 +1200)]
Merge pull request #12264 from civicrm/5.2

5.2 merge to maste

6 years agoMerge pull request #12262 from JMAConsulting/dev_mail_13-rc
Eileen McNaughton [Tue, 5 Jun 2018 10:20:33 +0000 (22:20 +1200)]
Merge pull request #12262 from JMAConsulting/dev_mail_13-rc

dev/mail#13 - All members should not be excluded from Smart unsubscribe group

6 years agoMerge pull request #12255 from hosseinamin/master
Eileen McNaughton [Tue, 5 Jun 2018 10:20:14 +0000 (22:20 +1200)]
Merge pull request #12255 from hosseinamin/master

fix related to issue dev/core#127, in depth overlap of filter related contacts

6 years agoMerge pull request #10341 from colemanw/CRM-20565
Monish Deb [Tue, 5 Jun 2018 08:54:30 +0000 (14:24 +0530)]
Merge pull request #10341 from colemanw/CRM-20565

CRM-20565 - Improve ajax dedupe lookups on contact add form

6 years agoMerge pull request #12257 from eileenmcnaughton/relationship_type
Monish Deb [Tue, 5 Jun 2018 08:52:47 +0000 (14:22 +0530)]
Merge pull request #12257 from eileenmcnaughton/relationship_type

Fix unreleased regression - fatal when editing relationship type Employer