inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2 to HEAD

Browse Source 
15297: Merged V3.1 to V3.2
      15093: Merged V2.1-A to V3.1
         12428: Fix for ADB-150
         13461: Fix for ADB-163 - Generic picker now resizes but has minimum width
         13462: Fix for ADB-164 ACT 7788 - Search button label now configurable as component attribute.
         13757: Fix for ADB-155
         14113: Fix for ABD-143
         14115: Fix for ADB-144
         14493: Fixes for ADB-155 (correction) and ADB-161, ADB-184, ADB-185, ADB-186, ADB-188, ADB-189.
      15162: Fix for ETHREEOH-2278 - missed during merge of ABD-143
      15278: Fix for ETHREEOH-2474 - search regression

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15298 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-07-21 08:25:30 +00:00
parent 86d1ec7516
commit 1d57ca9d64
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/mimetype/mimetype-map.xml
View File

@@ -145,6 +145,7 @@
<extension display="DTD">dtd</extension>
<extension display="XSLT">xslt</extension>
<extension display="XSLT">xsl</extension>
<extension display="XSD">xsd</extension>
</mimetype>
<mimetype mimetype="application/x-dvi" display="">
<extension>dvi</extension>

2
source/java/org/alfresco/repo/jscript/Search.java
View File

@@ -296,7 +296,7 @@ public class Search extends BaseScopableProcessorExtension
public Scriptable luceneSearch(String store, String search, String sortColumn, boolean asc)
{
return luceneSearch(null, search, sortColumn, asc, 0);
return luceneSearch(store, search, sortColumn, asc, 0);
}
/**