inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,441 Commits 325 Branches 2,188 Tags
c6e240697688da83169ba3f048c0cee09932a5fb
Commit Graph

261 Commits

Author SHA1 Message Date
Alan Davis
c6e2406976 Merged 5.2.0 (5.2.0) to HEAD (5.2) 
133021 rmunteanu: REPO-558, REPO-557: Update Permissions For Node
      - Merged changes from branch 5.2.N-NODEPERMS-REST-API
      - Added tests for update node permissions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133380 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-12-06 17:05:36 +00:00
Alan Davis
a95054a8b0 Merged 5.2.0 (5.2.0) to HEAD (5.2) 
133001 mward: Merged mward/5.2.n-repo1544-update-self (5.2.1) to 5.2.N (5.2.1)
      132987 mward: REPO-1544: correcting silly typo in new error message (relates to review: CR-620)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133378 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-12-06 17:05:16 +00:00
Alan Davis
561dd11fc8 Merged 5.2.0 (5.2.0) to HEAD (5.2) 
133000 mward: Merged mward/5.2.n-repo1544-update-self (5.2.1) to 5.2.N (5.2.1)
      132966 mward: REPO-1544: replaced use of unprotected person service with runAsSystem (review: CR-620)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133377 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-12-06 17:05:06 +00:00
Alan Davis
a3da9d2d35 Merged 5.2.0 (5.2.0) to HEAD (5.2) 
132998 mward: Merged mward/5.2.n-repo1544-update-self (5.2.1) to 5.2.N (5.2.1)
      132959 mward: REPO-1544: added error message (review: CR-620)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-12-06 17:04:48 +00:00
Alan Davis
8c1fd3d00d Merged 5.2.0 (5.2.0) to HEAD (5.2) 
132996 mward: Merged mward/5.2.n-repo1544-update-self (5.2.1) to 5.2.N (5.2.1)
      132914 mward: REPO-1544: allow people to update their own password


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133373 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-12-06 17:04:29 +00:00
Alan Davis
622c86d00b Merged 5.2.0 (5.2.0) to HEAD (5.2) 
132993 mward: Merged mward/5.2.n-optionalcustomprops (5.2.1) to 5.2.N (5.2.1)
      132978 mward: REPO-1395: make aspectNames, properties optional 'includes' when listing people


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133372 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-12-06 17:04:19 +00:00
Alan Davis
2812472ed1 Merged 5.2.0 (5.2.0) to HEAD (5.2) 
132872 mward: Merged mward/5.2.n-custpeopleprops (5.2.1) to 5.2.N (5.2.1)
      132803 mward: REPO-1395: add further tests and tweak functionality.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133366 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-12-06 17:01:46 +00:00
Alan Davis
bd89a1afb8 Merged 5.2.0 (5.2.0) to HEAD (5.2) 
132871 mward: Merged mward/5.2.n-custpeopleprops (5.2.1) to 5.2.N (5.2.1)
      132754 mward: REPO-1395: add custom properties to people create/get/update.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133365 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-12-06 17:01:36 +00:00
Alan Davis
5d6c9aa7b0 Merged 5.2.0 (5.2.0) to HEAD (5.2) 
132727 rmunteanu: REPO-1530: Create Person - enabled flag should be optional
      - Added default value true for enable on create person and fixed test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133360 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-12-06 16:59:27 +00:00
Alan Davis
8ecfe10ea9 Merged 5.2.N (5.2.1) to HEAD (5.2) 
132658 rmunteanu: REPO-1457: The create site REST API implementation has appropriate extension points


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132723 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-11 17:32:48 +00:00
Alan Davis
271e40d2f3 Merged 5.2.N (5.2.1) to HEAD (5.2) 
132587 rmunteanu: REPO-1543: Refactor tests for list site filtering
      - site are now created with a default site preset
      - refactored tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132681 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-10 17:01:06 +00:00
Alan Davis
12d7f0ff0c Merged 5.2.N (5.2.1) to HEAD (5.2) 
132482 rmunteanu: REPO-556, REPO-1534: List People - OrderBy not working with "id"
      - fixed orderBy issue, now people list can be ordered by "id" key
      - added more tests for list people endpoint


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132671 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-10 16:59:14 +00:00
Alan Davis
7cf3d8ed99 Merged 5.2.N (5.2.1) to HEAD (5.2) 
132475 cturlica: REPO-894: Disable Person
      - updated so we receive an error when trying to disable an admin authority


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132669 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-10 16:58:51 +00:00
Alan Davis
ce22f54f19 Merged 5.2.N (5.2.1) to HEAD (5.2) 
132473 mward: REPO-1536: corrected 404 error message for get person by ID (/person/{id})


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132667 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-10 16:58:30 +00:00
Alan Davis
24a4547b3b Merged 5.2.N (5.2.1) to HEAD (5.2) 
132406 cturlica: REPO-1506: Update Person - implement
      - restrict rest api update person password for no authorization


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-10 16:57:57 +00:00
Alan Davis
97195d1534 Merged 5.2.N (5.2.1) to HEAD (5.2) 
132343 rmunteanu: REPO-556: List People - Allow people to be retrieved via the /people collection
      - added implementation for get people endpoint
      - added tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 20:06:41 +00:00
Alan Davis
edf2c25c42 Merged 5.2.N (5.2.1) to HEAD (5.2) 
132249 rmunteanu: REPO-1523: REGRESS: Site created from API cannot be accessed via Share


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 20:06:29 +00:00
Alan Davis
a6fa33a24a Merged 5.2.N (5.2.1) to HEAD (5.2) 
132120 mward: REPO-892: removed PersonUpdate class.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132340 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 14:05:13 +00:00
Alan Davis
a77b7e3173 Merged 5.2.N (5.2.1) to HEAD (5.2) 
132117 cturlica: REPO-1506: Update Person - implement
      - added implementation for update personService
      - added tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132338 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 14:04:53 +00:00
Alan Davis
d6e678d2c2 Merged 5.2.N (5.2.1) to HEAD (5.2) 
132107 gjames: SEARCH-227: Adding additional display information for facetting api


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132335 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 14:04:21 +00:00
Alan Davis
0e5f80f4eb Merged 5.2.N (5.2.1) to HEAD (5.2) 
132027 mward: REPO-1503: password is now mandatory.
   First check in at my new desk!
   I've also removed the auto-generation of passwords (UUID) since this is no longer needed with a mandatory password field.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132327 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 14:03:00 +00:00
Alan Davis
21356a4eaa Merged 5.2.N (5.2.1) to HEAD (5.2) 
131939 mward: REPO-1503: allow setting of password


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 14:02:51 +00:00
Alan Davis
3d481e8df0 Merged 5.2.N (5.2.1) to HEAD (5.2) 
131909 mward: REPO-892: allow creation of enabled/disabled users


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132319 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 14:01:42 +00:00
Alan Davis
a5e799aecf Merged 5.2.N (5.2.1) to HEAD (5.2) 
131902 mward: REPO-892: correctly store and retrieve cm:persondescription as a cm:content blob.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132318 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 14:01:32 +00:00
Alan Davis
687ebdf223 Merged 5.2.N (5.2.1) to HEAD (5.2) 
131893 cturlica: REPO-1459: Make NodesImpl.isSpecialNode protected
      - changed isSpecialNode method signature to protected and updated Java doc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132315 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 14:01:00 +00:00
Alan Davis
887d066424 Merged 5.2.N (5.2.1) to HEAD (5.2) 
131886 mward: REPO-892: ensure presence of mandatory fields


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 14:00:29 +00:00
Alan Davis
d2322f56a2 Merged 5.2.N (5.2.1) to HEAD (5.2) 
131862 mward: Merged 131680:131794 from DEV/mward/5.2.n-createperson to 5.2.N
     REPO-892: make sure not all fields need to be supplied during create.
     REPO-892: throws error if fields exclusively belonging to Person (that are not part of PersonUpdate) are sent in request.
     REPO-892: cleaned up PersonUpdateJSONSerializer a little, by removing unnecessary 'fullVisibility' switch.
     REPO-892: improved test for optional fields; added test for too few fields.
     REPO-892: added tests (and impl where needed) for -ve response codes as given in the open api spec for create person.
     REPO-892: fixed broken test due to reuse of username.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:59:46 +00:00
Alan Davis
373d976faa Merged 5.2.N (5.2.1) to HEAD (5.2) 
131858 mward: Merged 131464:131680 from DEV/mward/5.2.n_createperson to 5.2.n
     Creating branch for REPO-892 (Create person REST API)
     REPO-892: create person - initial commit, bare-bones implementation and test.
     REPO-892: refactored test versions of Person and Company to reduce duplication.
     REPO-892: further refactoring to reduce prod/test duplication.
     REPO-892: add missing fields to the 'create person' operation.
     REPO-892: introduced PersonUpdate class for create (and I'm assuming update) operations.
     REPO-892: missing license header
     REPO-892: very minor refactoring - extract field in tests.
     REPO-892: make sure not all fields need to be supplied during create.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132307 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:59:35 +00:00
Alan Davis
3a05a1d932 Merged 5.2.N (5.2.1) to HEAD (5.2) 
131837 cturlica: REPO-1404: Improve extensibility of NodesImpl
      -  refactored method buildSearchTypesAndIgnoreAspects based on feedback from IG team member


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132305 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:59:12 +00:00
Alan Davis
04edee8754 Merged 5.2.N (5.2.1) to HEAD (5.2) 
131796 rmunteanu: REPO-1390 , REPO-1391: Add support for retrieving site presets
      -  Fixed issue causing build failure;


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132300 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:58:21 +00:00
Alan Davis
7d606bd6eb Merged 5.2.N (5.2.1) to HEAD (5.2) 
131764 rmunteanu: REPO-1390 , REPO-1391: Add support for retrieving site presets
      -  Implemented the API;
      -  Added automated tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132294 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:57:18 +00:00
Alan Davis
74dc12f5c3 Merged 5.2.N (5.2.1) to HEAD (5.2) 
131716 cturlica: REPO-1404: Improve extensibility of NodesImpl
      -  refactored the listChildren by adding dedicated filter and sort methods, also added protected getters for the services and repositoryHelper.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132288 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:56:15 +00:00
Alan Davis
2f5d71cbb4 Merged 5.2.N (5.2.1) to HEAD (5.2) 
131582 jvonka: REPO-1443: V1 REST API - minor - accept well-known aliases for "update node info"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132278 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:54:31 +00:00
Alan Davis
b3379f798e Merged 5.2.N (5.2.1) to HEAD (5.2) 
131385 idanea: ACE-5453: 500 error: GET /nodes/{nodeId}/ratings?skipCount=XXX
      - implemented fix and added new unit test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:50:40 +00:00
Alan Davis
0deb44526b Merged 5.2.N (5.2.1) to HEAD (5.2) 
131302 rmunteanu: REPO-1354: Get Rendition info - implement the API
      - implemented get rendition info by id method


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132240 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:48:04 +00:00
Alan Davis
3d91d230d1 Merged 5.2.N (5.2.1) to HEAD (5.2) 
131282 mward: Merged r131242:131277 from BRANCHES/DEV/mward/5.2.n-restapi into BRANCHES/DEV/5.2.N


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132232 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:33:37 +00:00
Alan Davis
68fc7c7cc1 Merged 5.2.N (5.2.1) to HEAD (5.2) 
131275 cturlica: REPO-1360: Filter sites by visibility - add automated tests
      - added new tests for filter by visibility
      - updated getSites by personId because the value of totalItems wasn't calculated, also updated existing tests that where using the incorrect expected value.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132229 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:33:06 +00:00
Alan Davis
80daf219db Merged 5.2.N (5.2.1) to HEAD (5.2) 
131224 mward: REPO-1348: initial check-in for "update site" API implementation.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132224 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:32:15 +00:00
Alan Davis
a9655d73e9 Merged 5.2.N (5.2.1) to HEAD (5.2) 
131172 cturlica: REPO-1359: Filter sites by visibility - implement the API
      - added filter sites by visibility


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132219 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:31:33 +00:00
Alan Davis
6a5f88763f Merged 5.2.N (5.2.1) to HEAD (5.2) 
130871 jvonka: REPO-1027: V1 REST API - fix error handling (add site member)
   - fix error code (should be 400 not 500) & add -ve api tests
   - ACE-5458


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:28:23 +00:00
Alan Davis
5e3d908af7 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130868 jvonka: REPO-1027: V1 REST API - fix error handling (get site membership request)
   - fix error code (should be 404 not 500) & add -ve api test
   - ACE-2049 / ACE-5442


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132194 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:28:07 +00:00
Alan Davis
f2b37ccce9 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130854 jvonka: REPO-1058 / REPO-1244: REST API - list Sites - orderBy
   - tweak the default (as agreed with GC)
   - update automated unit test (and also refactor to make it re-runnable and to consistently use create site api)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132191 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:27:42 +00:00
Alan Davis
b34bbcfccc Merged 5.2.N (5.2.1) to HEAD (5.2) 
130783 jvonka: REPO-1058: REST API - list sites that person is member of ...
   - fix orderBy tests and backward compatibility
   - REPO-1242,  / REPO-1244


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132179 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:19:56 +00:00
Alan Davis
3a473a5d0d Merged 5.2.N (5.2.1) to HEAD (5.2) 
130774 jvonka: REPO-1058 / REPO-1242: REST API - list sites that person is member of - fix orderBy (id, title or role)
   - fix orderBy validation as per existing capabilities
   - TODO add tests (see REPO-1244)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132177 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:19:38 +00:00
Alan Davis
7887fd9246 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130681 jvonka: REPO-1058 / REPO-1242: REST API - list sites - add option to orderBy (id, title or description)
   - initial implementation (note: default remains "id asc")
   - TODO add tests (see REPO-1244)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:14:50 +00:00
Alan Davis
8ec46e924c Merged 5.2.N (5.2.1) to HEAD (5.2) 
130543 aepure: REPO-1158: Removed extra space from the received message.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132143 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:11:24 +00:00
Ancuta Morarasu
b5ec806baf Merged 5.2.N (5.2.1) to HEAD (5.2) 
130424 amorarasu: Clean-up after merges to 5.2.N. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130425 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-07 16:51:57 +00:00
Ancuta Morarasu
fea7f077e4 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130400 amorarasu: REPO-1164: 422 error when executing unlock on a node that is not locked


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130419 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-07 16:05:41 +00:00
Alan Davis
b10f889f29 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130297 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130050 gjames: SEARCH-161: Supporting synonyms for sorting fieldNames


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130369 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:10:26 +00:00
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