Alan Davis 31a44c72aa Merged 5.2.N (5.2.1) to HEAD (5.2) ...

130278 gjames: 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/HEAD/root@130352 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2016-09-06 22:07:56 +00:00

..

activities

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

2016-06-03 17:08:06 +00:00

node/ratings

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

2016-06-03 17:08:06 +00:00

ActivitiesImpl.java

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

2016-06-03 17:08:06 +00:00

AuthenticationsImpl.java

Update source headers that came from API-STRIKES-BACK

2016-06-06 11:11:00 +00:00

CommentsImpl.java

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

2016-07-12 12:00:37 +00:00

CustomModelsImpl.java

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

2016-06-03 17:08:06 +00:00

DefaultExceptionHandler.java

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

2016-06-03 17:08:06 +00:00

DeletedNodesImpl.java

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

2016-06-06 09:17:38 +00:00

ExceptionHandler.java

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

2016-06-03 17:08:06 +00:00

ExceptionInterceptor.java

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

2016-06-03 17:08:06 +00:00

ExcludedTypes.java

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

2016-06-03 17:08:06 +00:00

FavouritesImpl.java

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

2016-06-03 17:08:06 +00:00

LegacyExceptionHandler.java

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

2016-06-03 17:08:06 +00:00

NetworksImpl.java

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

2016-06-03 17:08:06 +00:00

NodeRatingsImpl.java

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

2016-06-03 17:08:06 +00:00

NodesImpl.java

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

2016-09-06 22:07:56 +00:00

PeopleImpl.java

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

2016-06-03 17:08:06 +00:00

PreferencesImpl.java

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

2016-06-03 17:08:06 +00:00

QueriesImpl.java

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

2016-08-09 14:18:28 +00:00

QuickShareLinksImpl.java

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

2016-09-06 22:02:33 +00:00

RenditionsImpl.java

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

2016-06-06 09:17:38 +00:00

SiteImportPackageHandler.java

Update source headers that came from API-STRIKES-BACK

2016-06-06 11:11:00 +00:00

SiteMembershipRequestsExceptionHandler.java

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

2016-06-03 17:08:06 +00:00

SiteMembershipRequestsImpl.java

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

2016-06-03 17:08:06 +00:00

SitesImpl.java

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

2016-06-03 17:08:06 +00:00

SiteSurfConfig.java

Update source headers that came from API-STRIKES-BACK

2016-06-06 11:11:00 +00:00

TagsImpl.java

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

2016-06-03 17:08:06 +00:00

Util.java

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

2016-06-03 17:08:06 +00:00