Ancuta Morarasu a6f75435a2 Merged HEAD (5.2) to 5.2.N (5.2.1) ...

126494 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122675 jvonka: Nodes (FileFolder) API - return isFile in node info (renamed from isContent) in addition to isFolder
      - follow-on, to fix where clause
      RA-828, RA-741


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

2016-05-11 11:44:46 +00:00

..

cmm

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

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

impl

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

2016-05-11 11:44:46 +00:00

model

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

2016-05-11 11:37:52 +00:00

modules

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

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

networks

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

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

nodes

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

2016-05-11 11:44:37 +00:00

people

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

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

quicksharelinks

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

2016-05-11 11:19:27 +00:00

sites

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

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

tags

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

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

Activities.java

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

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

Comments.java

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

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

CustomModels.java

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

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

Favourites.java

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

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

Networks.java

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

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

NetworksWebScriptGet.java

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

2016-05-11 11:37:23 +00:00

NetworkWebScriptGet.java

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

2016-05-11 11:37:23 +00:00

NodeRatings.java

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

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

Nodes.java

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

2016-05-11 11:44:46 +00:00

People.java

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

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

Preferences.java

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

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

PublicApiAuthenticatorFactory.java

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

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

PublicApiCredentials.java

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

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

PublicApiDeclarativeRegistry.java

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

2016-05-11 11:18:44 +00:00

PublicApiHttpServletRequest.java

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

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

PublicApiRepositoryContainer.java

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

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

PublicApiTenantAuthentication.java

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

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

PublicApiTenantWebScriptServletRequest.java

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

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

PublicApiTenantWebScriptServletRuntime.java

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

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

PublicApiWebScriptServlet.java

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

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

QuickShareLinks.java

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

2016-05-11 11:19:27 +00:00

Renditions.java

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

2016-05-11 11:43:54 +00:00

SiteMembershipRequests.java

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

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

Sites.java

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

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

Tags.java

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

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

TenantCredentials.java

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

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