Alan Davis 4a18a13f7b Merged HEAD (5.2) to 5.2.N (5.2.1) ...

127619 jkaabimofrad: Missed changes during resolving conflicts.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2016-06-03 15:19:40 +00:00

..

activities

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

2016-04-26 13:45:01 +00:00

node/ratings

Merged HEAD (5.2) to 5.2.N (5.2.1)

2016-05-11 12:32:33 +00:00

ActivitiesImpl.java

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

2016-04-26 13:45:01 +00:00

AuthenticationsImpl.java

Merged HEAD (5.2) to 5.2.N (5.2.1)

2016-06-03 14:08:59 +00:00

CommentsImpl.java

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

2016-04-26 13:45:01 +00:00

CustomModelsImpl.java

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

2016-04-26 13:45:01 +00:00

DefaultExceptionHandler.java

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

2016-04-26 13:45:01 +00:00

DeletedNodesImpl.java

Update source headers - add new Copyrights for new Java files synced from Head (part 4).

2016-05-11 14:39:44 +00:00

ExceptionHandler.java

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

2016-04-26 13:45:01 +00:00

ExceptionInterceptor.java

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

2016-04-26 13:45:01 +00:00

ExcludedTypes.java

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

2016-04-26 13:45:01 +00:00

FavouritesImpl.java

Merged HEAD (5.2) to 5.2.N (5.2.1)

2016-06-03 13:59:39 +00:00

LegacyExceptionHandler.java

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

2016-04-26 13:45:01 +00:00

NetworksImpl.java

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

2016-04-26 13:45:01 +00:00

NodeRatingsImpl.java

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

2016-04-26 13:45:01 +00:00

NodesImpl.java

Merged HEAD (5.2) to 5.2.N (5.2.1)

2016-06-03 15:19:40 +00:00

PeopleImpl.java

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

2016-04-26 13:45:01 +00:00

PreferencesImpl.java

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

2016-04-26 13:45:01 +00:00

QueriesImpl.java

Update source headers - add new Copyrights for new Java files synced from Head (part 4).

2016-05-11 14:39:44 +00:00

QuickShareLinksImpl.java

Merged HEAD (5.2) to 5.2.N (5.2.1)

2016-06-03 15:19:23 +00:00

RenditionsImpl.java

Merged HEAD (5.2) to 5.2.N (5.2.1)

2016-06-03 15:19:40 +00:00

SiteImportPackageHandler.java

Merged HEAD (5.2) to 5.2.N (5.2.1)

2016-06-03 13:59:53 +00:00

SiteMembershipRequestsExceptionHandler.java

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

2016-04-26 13:45:01 +00:00

SiteMembershipRequestsImpl.java

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

2016-04-26 13:45:01 +00:00

SitesImpl.java

Merged HEAD (5.2) to 5.2.N (5.2.1)

2016-06-03 15:19:11 +00:00

SiteSurfConfig.java

Merged HEAD (5.2) to 5.2.N (5.2.1)

2016-06-03 13:59:53 +00:00

TagsImpl.java

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

2016-04-26 13:45:01 +00:00

Util.java

Merged HEAD (5.2) to 5.2.N (5.2.1)

2016-05-11 11:35:12 +00:00