manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1791610 - in /manifoldcf/branches/release-2.7-branch: ./ connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/
Date Sun, 16 Apr 2017 15:34:06 GMT
Author: kwright
Date: Sun Apr 16 15:34:06 2017
New Revision: 1791610

URL: http://svn.apache.org/viewvc?rev=1791610&view=rev
Log:
Pull up fix for CONNECTORS-1411

Modified:
    manifoldcf/branches/release-2.7-branch/   (props changed)
    manifoldcf/branches/release-2.7-branch/CHANGES.txt
    manifoldcf/branches/release-2.7-branch/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/ConfigurationView.html
    manifoldcf/branches/release-2.7-branch/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_URL.html

Propchange: manifoldcf/branches/release-2.7-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 16 15:34:06 2017
@@ -142,4 +142,4 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1791542,1791548,1791603
+/manifoldcf/trunk:1791542,1791548,1791603,1791609

Modified: manifoldcf/branches/release-2.7-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.7-branch/CHANGES.txt?rev=1791610&r1=1791609&r2=1791610&view=diff
==============================================================================
--- manifoldcf/branches/release-2.7-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.7-branch/CHANGES.txt Sun Apr 16 15:34:06 2017
@@ -3,6 +3,9 @@ $Id$
 
 ======================= Release 2.7 =====================
 
+CONNECTORS-1411: Fix attachment URL template reset bug.
+(Furkan KAMACI)
+
 CONNECTORS-1410: Body is used as content at emails.
 (Furkan KAMACI)
 

Modified: manifoldcf/branches/release-2.7-branch/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/ConfigurationView.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.7-branch/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/ConfigurationView.html?rev=1791610&r1=1791609&r2=1791610&view=diff
==============================================================================
--- manifoldcf/branches/release-2.7-branch/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/ConfigurationView.html
(original)
+++ manifoldcf/branches/release-2.7-branch/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/ConfigurationView.html
Sun Apr 16 15:34:06 2017
@@ -91,6 +91,14 @@ limitations under the License.
       <nobr>$Encoder.bodyEscape($URL)</nobr>
     </td>
   </tr>
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('EmailConnector.AttachmentURLTemplateColon'))</nobr>
+    </td>
+    <td class="value">
+      <nobr>$Encoder.bodyEscape($ATTACHMENTURL)</nobr>
+    </td>
+  </tr>
 
 </table>
 

Modified: manifoldcf/branches/release-2.7-branch/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_URL.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.7-branch/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_URL.html?rev=1791610&r1=1791609&r2=1791610&view=diff
==============================================================================
--- manifoldcf/branches/release-2.7-branch/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_URL.html
(original)
+++ manifoldcf/branches/release-2.7-branch/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/email/Configuration_URL.html
Sun Apr 16 15:34:06 2017
@@ -40,5 +40,6 @@ limitations under the License.
 #else
 
 <input type="hidden" name="url" value="$Encoder.attributeEscape($URL)"/>
+<input type="hidden" name="attachmenturl" value="$Encoder.attributeEscape($ATTACHMENTURL)"/>
 
 #end
\ No newline at end of file



Mime
View raw message