Alexandra Leahu 0fe50bd9f0 Merged HEAD (5.2) to 5.2.N (5.2.1) ...

127445 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      127427 jkaabimofrad: RA-1052: Modified the upload API so that the failure of the async request to create a rendition wouldn't fail the upload.


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

2016-06-01 13:37:58 +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-06-01 13:37:58 +00:00

model

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

2016-05-11 14:39:44 +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

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

2016-05-11 14:39:44 +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

queries

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

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

quicksharelinks

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

2016-05-11 14:39:44 +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

trashcan

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

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

Activities.java

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

2016-05-11 12:19:47 +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

DeletedNodes.java

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

2016-05-11 14:39:44 +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-24 14:59:05 +00:00

People.java

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

2016-05-11 11:56:20 +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 12:57:39 +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

Queries.java

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

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

QuickShareLinks.java

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

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

Renditions.java

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

2016-05-24 14:59:05 +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