Alan Davis fb978c53cc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) ...

97593: Merged NESS/5.0.N-2015_01-20 (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      97514: MNT-13392 : Rendition - Error in AbstractRenderingEngine with model param using FreemarkerRenderingEngine
         - FIxed isAssignbleFrom issue when FreemarkerRenderingEngine is using params; added new test for case


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

2015-02-20 15:04:58 +00:00

..

executer

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

2015-02-20 15:04:58 +00:00

script

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

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

CompositeRenditionDefinitionImpl.java

Merging DEV_TEMPORARY to HEAD (RenditionService)

2010-03-05 20:02:52 +00:00

PerformRenditionActionExecuter.java

Rendition Definitions as native actions.

2010-07-05 15:35:44 +00:00

RenderingEngineDefinitionImpl.java

Merging DEV_TEMPORARY to HEAD (RenditionService)

2010-03-05 20:02:52 +00:00

RenditionDefinitionImpl.java

Merge from V3.3 to HEAD

2010-05-04 15:31:23 +00:00

RenditionDefinitionPersister.java

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

RenditionDefinitionPersisterImpl.java

Merged V3.4-BUG-FIX to HEAD

2011-06-30 11:36:51 +00:00

RenditionedAspect.java

ALF-10717: Renditions doclib and webpreview accumulates (not replaced) when creating new version using Edit Offline

2011-11-21 04:56:09 +00:00

RenditionLocation.java

Javadoc improvements and private variable renaming in the rendition service.

2010-06-14 10:41:13 +00:00

RenditionLocationImpl.java

Javadoc improvements and private variable renaming in the rendition service.

2010-06-14 10:41:13 +00:00

RenditionLocationResolver.java

Fix for ALF-5373 Renditions being generated to the same location (e.g. through use of paths/templates) can lead to incorrect renditions/exceptions.

2010-10-28 21:00:32 +00:00

RenditionNodeManager.java

Merged V4.1-BUG-FIX to HEAD

2013-02-27 11:56:13 +00:00

RenditionPreventionRegistry.java

Merged V4.0-BUG-FIX to HEAD

2012-03-02 15:00:35 +00:00

RenditionServiceImpl.java

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

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

StandardRenditionLocationResolverImpl.java

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

2014-09-03 12:18:05 +00:00