Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 18D9A200BD4 for ; Fri, 16 Dec 2016 23:41:22 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 17864160B32; Fri, 16 Dec 2016 22:41:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5B5B9160B10 for ; Fri, 16 Dec 2016 23:41:21 +0100 (CET) Received: (qmail 97040 invoked by uid 500); 16 Dec 2016 22:41:20 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 97030 invoked by uid 99); 16 Dec 2016 22:41:20 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Dec 2016 22:41:20 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id CAD203A0026 for ; Fri, 16 Dec 2016 22:41:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1774676 - in /manifoldcf/branches/release-2.6-branch: ./ CHANGES.txt framework/crawler-ui/src/main/webapp/listnotifications.jsp Date: Fri, 16 Dec 2016 22:41:19 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161216224119.CAD203A0026@svn01-us-west.apache.org> archived-at: Fri, 16 Dec 2016 22:41:22 -0000 Author: kwright Date: Fri Dec 16 22:41:19 2016 New Revision: 1774676 URL: http://svn.apache.org/viewvc?rev=1774676&view=rev Log: Pull up fix for CONNECTORS-1357 from trunk. Modified: manifoldcf/branches/release-2.6-branch/ (props changed) manifoldcf/branches/release-2.6-branch/CHANGES.txt manifoldcf/branches/release-2.6-branch/framework/crawler-ui/src/main/webapp/listnotifications.jsp Propchange: manifoldcf/branches/release-2.6-branch/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 16 22:41:19 2016 @@ -138,3 +138,4 @@ /manifoldcf/branches/CONNECTORS-981:1605049-1605773 /manifoldcf/branches/CONNECTORS-989:1611600-1612101 /manifoldcf/branches/CONNECTORS-990:1610284-1610707 +/manifoldcf/trunk:1774667,1774670 Modified: manifoldcf/branches/release-2.6-branch/CHANGES.txt URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.6-branch/CHANGES.txt?rev=1774676&r1=1774675&r2=1774676&view=diff ============================================================================== --- manifoldcf/branches/release-2.6-branch/CHANGES.txt (original) +++ manifoldcf/branches/release-2.6-branch/CHANGES.txt Fri Dec 16 22:41:19 2016 @@ -1,8 +1,12 @@ ManifoldCF Change Log $Id$ + ======================= Release 2.6 ===================== +CONNECTORS-1357: Delete button doesn't work on listnotifications +(Markus Schuch) + CONNECTORS-1336: Update the Compatibility Matrix (Piergiorgio Lucidi) Modified: manifoldcf/branches/release-2.6-branch/framework/crawler-ui/src/main/webapp/listnotifications.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.6-branch/framework/crawler-ui/src/main/webapp/listnotifications.jsp?rev=1774676&r1=1774675&r2=1774676&view=diff ============================================================================== --- manifoldcf/branches/release-2.6-branch/framework/crawler-ui/src/main/webapp/listnotifications.jsp (original) +++ manifoldcf/branches/release-2.6-branch/framework/crawler-ui/src/main/webapp/listnotifications.jsp Fri Dec 16 22:41:19 2016 @@ -79,7 +79,7 @@ function Delete(connectionName)

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.ListOfNotificationConnections")%>

- +