Tatyana Valkevych c7e7ff3fef Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE) ...

110087: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
      110048: MNT-14554 : 5.0.2 - Node-Details
         - added incompatible_improvements setting to version 2.3.20 to all FreeMarker Configurations
         - this will tell free marker to escape all ?html as ?xhtml
         - added more validation code: ?html to alfresco-macros.lib.ftl   


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

2015-08-17 11:45:13 +00:00

..

cleanup

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

2014-09-18 17:26:23 +00:00

local

Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)

2015-08-17 11:45:13 +00:00

AbstractFeedGenerator.java

ACE-2780: Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

2014-09-23 16:10:34 +00:00

AbstractUserNotifier.java

ACE-3175

2014-10-22 09:13:24 +00:00

ActivitiesFeedModelBuilder.java

ACE-3175

2014-10-22 09:13:24 +00:00

DefaultActivitiesFeedModelBuilder.java

ACE-3175 - Activity notification emails are overloaded with tracked preview and download actions

2014-10-22 12:01:32 +00:00

EmailUserNotifier.java

Merged BRANCHES/DEV/CONV_HEAD to HEAD:

2013-03-20 11:11:55 +00:00

ErrorProneActionExecutor.java

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

2015-03-27 23:00:01 +00:00

ErrorProneUserNotifier.java

Merged BRANCHES/DEV/CONV_HEAD to HEAD:

2013-03-20 11:11:55 +00:00

FeedGenerator.java

Updated header to LGPL

2010-03-01 22:48:39 +00:00

FeedGeneratorJob.java

Updated header to LGPL

2010-03-01 22:48:39 +00:00

FeedGridJob.java

Updated header to LGPL

2010-03-01 22:48:39 +00:00

FeedNotifier.java

Merged V3.4-TEAM to HEAD

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

FeedNotifierImpl.java

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

2015-05-02 07:18:49 +00:00

FeedNotifierJob.java

Merged BRANCHES/DEV/CONV_HEAD to HEAD:

2013-03-18 09:23:29 +00:00

FeedTaskProcessor.java

Merged 5.0.N (5.0.3) to HEAD (5.1) (PARTIAL MERGE)

2015-08-17 11:45:13 +00:00

FeedTaskSplit.java

Updated header to LGPL

2010-03-01 22:48:39 +00:00

JobSettings.java

Merged V4.0-BUG-FIX to HEAD

2012-02-08 11:06:09 +00:00

MockUserNotifier.java

Merged BRANCHES/DEV/CONV_HEAD to HEAD:

2013-03-20 11:11:55 +00:00

RepoCtx.java

Merged V4.0-BUG-FIX to HEAD

2012-02-08 11:06:09 +00:00

UserNotifier.java

Merged BRANCHES/DEV/CONV_HEAD to HEAD:

2013-03-20 11:11:55 +00:00