Gethin James 50d8381a2e Merged searchapi (5.2.1) to 5.2.N (5.2.1) ...

130015 gjames: Merged 5.2.N-AHIND (5.2.1) to searchapi (5.2.1)
      129790 jvonka: REPO-164 / REPO-1141: fix error mapping when unable to update content due to locked node (should be 409 not 500)
      - also minor cleanup of error handling/mapping (handle within common "writeContent")


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

2016-09-06 15:32:52 +00:00

..

authentications

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

2016-06-06 11:13: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 searchapi (5.2.1) to 5.2.N (5.2.1)

2016-09-06 15:32:52 +00:00

model

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

2016-09-06 15:27:33 +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 searchapi (5.2.1) to 5.2.N (5.2.1)

2016-09-06 15:12:54 +00:00

people

Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)

2016-08-05 13:49:10 +00:00

queries

REPO-1079 Rename "Live Search" API endpoints

2016-08-09 09:33:20 +00:00

quicksharelinks

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

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

search

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

2016-09-06 14:19:59 +00:00

sites

Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)

2016-08-05 13:46:17 +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

Authentications.java

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

2016-06-06 11:13:46 +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 searchapi (5.2.1) to 5.2.N (5.2.1)

2016-09-06 14:14:29 +00:00

NetworkWebScriptGet.java

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

2016-09-06 14:14:29 +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 searchapi (5.2.1) to 5.2.N (5.2.1)

2016-09-06 15:29:04 +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

Fixed some javadoc errors. REPO-466

2016-07-01 08:34:26 +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-06-03 15:19:40 +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 searchapi (5.2.1) to 5.2.N (5.2.1)

2016-09-06 14:14:29 +00:00

PublicApiWebScriptServlet.java

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

2016-06-03 14:14:04 +00:00

Queries.java

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

2016-09-06 14:14:29 +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-06-03 15:19:40 +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 HEAD (5.2) to 5.2.N (5.2.1)

2016-06-03 14:00:26 +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