Alan Davis 801fbdbb66 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) ...

61491: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      61339: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         61232: Merged DEV to V4.1-BUG-FIX (4.1.8)
            61152 : MNT-10364 : Kerberos SSO is not working on /alfresco/activiti-admin
               - Added new filter mapping for "Global Authentication Filter" to allow SSO for activiti admin console.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62425 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2014-02-12 15:41:39 +00:00

..

cmis10

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

cmis11

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

alfresco-object.xml

Fixes to allow Alfresco to run with latest JBoss Portal + Jboss AS

2006-01-03 18:26:58 +00:00

alfresco.tld

Merged V3.2 to HEAD

2009-07-21 08:25:30 +00:00

c.tld

Big honkin' merge from head. Sheesh!

2006-08-27 01:01:30 +00:00

chiba.xml

Merged V2.1 to HEAD

2007-09-10 12:26:25 +00:00

faces-config-app.xml

Merged BRANCHES/DEV/HEAD-QA to HEAD:

2013-07-01 09:35:59 +00:00

faces-config-beans.xml

Merged V4.1-BUG-FIX to HEAD

2012-08-21 16:31:48 +00:00

faces-config-common.xml

Final set of UI dialog conversion changes from usethelink. A few associated minor fixes. Improvements and optimisations to automagic file upload JSF trickery

2008-01-10 14:31:58 +00:00

faces-config-custom.xml

Morning merge.

2006-05-22 17:20:58 +00:00

faces-config-enterprise.xml

Merge from HEAD into WCM-DEV2. Also fixes build breakage in

2006-07-24 18:27:41 +00:00

faces-config-jbpm.xml

Big honkin' merge from head. Sheesh!

2006-08-27 01:01:30 +00:00

faces-config-navigation.xml

Final set of UI dialog conversion changes from usethelink. A few associated minor fixes. Improvements and optimisations to automagic file upload JSF trickery

2008-01-10 14:31:58 +00:00

faces-config-repo.xml

Merged V4.0-BUG-FIX to HEAD

2012-04-13 14:21:53 +00:00

faces-config-wcm.xml

Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-5 to HEAD:

2010-06-17 19:35:49 +00:00

jboss-portlet.xml

Moving to root below branch label

2005-12-08 07:13:07 +00:00

jboss-web.xml

ALFCOM-2816: Changes for JBoss v5.0.1.GA compatibility

2009-04-28 14:07:52 +00:00

liferay-plugin-package.properties

ALF-691: Make alfresco.war work on Liferay v5.2.3

2010-03-22 17:34:05 +00:00

portlet.xml

Web Script Portlet fix after f/w refactoring - a) refer to correct impl. of WebScriptPortlet in web.xml, b) remove TODOs that have now been done

2008-02-20 18:43:02 +00:00

repo.tld

Merged DEV/TEMPORARY to HEAD

2010-01-06 17:09:10 +00:00

server-config.wsdd

CLOUD-2159 Move server-config.wsdd from remote-api to web-client, where it belongs, otherwise it is missing in Cloud build

2013-10-31 15:29:22 +00:00

sun-jaxws.xml

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

wcm.tld

Merged V3.3 to HEAD

2010-06-09 12:47:50 +00:00

web-application-context.xml

Merged CONV_HEAD to HEAD

2013-03-25 09:37:19 +00:00

web.xml

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

2014-02-12 15:41:39 +00:00

weblogic.xml

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

2014-02-12 14:37:42 +00:00