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.0 to HEAD

Browse Source 
11357: Added site preset for Document Workspace.
   11358: Minor fix to labels for new Edit Online and Edit Offline actions.
   11359: Added missing servlet to NTLM auth examples section in web.xml

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12429 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-12-17 10:24:10 +00:00
parent 08e7e5f038
commit 4c44ffd0f4
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/messages/webclient.properties
View File

@@ -299,8 +299,8 @@ click_to_set_date=Click to set a date
today=Today today=Today
reset=Reset reset=Reset
label=Label label=Label
edit_doc_offline=Edit offline edit_doc_offline=Edit Offline
edit_doc_online=Edit online edit_doc_online=Edit Online
upload_new_version=Upload new version upload_new_version=Upload new version
checkin_this_file=Check in this file checkin_this_file=Check in this file
cannot_delete_node_has_working_copy=Cannot delete file \"{0}\" as it has an associated working copy. cannot_delete_node_has_working_copy=Cannot delete file \"{0}\" as it has an associated working copy.

12
source/web/WEB-INF/web.xml
View File

@@ -134,7 +134,7 @@
</filter> </filter>
<!-- For NTLM authentication support enable the following mappings --> <!-- For NTLM authentication support enable the following mappings -->
<!-- after enabling the NTLMAuthenticationFilter filter classes above --> <!-- after enabling the NTLMAuthenticationFilter filter class above -->
<!-- <!--
<filter-mapping> <filter-mapping>
<filter-name>Authentication Filter</filter-name> <filter-name>Authentication Filter</filter-name>
@@ -175,6 +175,16 @@
<filter-name>Authentication Filter</filter-name> <filter-name>Authentication Filter</filter-name>
<url-pattern>/d/*</url-pattern> <url-pattern>/d/*</url-pattern>
</filter-mapping> </filter-mapping>
<filter-mapping>
<filter-name>Authentication Filter</filter-name>
<url-pattern>/wcservice/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>Authentication Filter</filter-name>
<url-pattern>/wcs/*</url-pattern>
</filter-mapping>
--> -->
<filter-mapping> <filter-mapping>