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
4,005 Commits 325 Branches 2,188 Tags
a85512572b0825d26ab39aead0f396c87310a80d
Commit Graph

128 Commits

Author SHA1 Message Date
Raluca Munteanu
a85512572b REPO-557: Retrieve Permissions For Node 
-  Renamed field according to REST API code conventions

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-25 15:45:10 +00:00
Raluca Munteanu
c9753d62cd REPO-557: Retrieve Permissions For Node 
-  Fixed build failure

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133112 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-25 10:38:00 +00:00
Raluca Munteanu
ded07a19fa REPO-557: Retrieve Permissions For Node 
-  Added tests and minor changes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133082 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-24 14:28:13 +00:00
Raluca Munteanu
87ec45860b REPO-558, REPO-557: Update Permissions For Node 
- Fixed build failure, related to REPO-1538

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-22 16:15:50 +00:00
Raluca Munteanu
5b10029042 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/BRANCHES/DEV/5.2.N/root@133021 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-22 11:55:08 +00:00
Jan Vonka
befcb4acf0 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/BRANCHES/DEV/5.2.N/root@131582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-10-19 20:35:14 +00:00
Cristina Mocanu
e05b5d5a0e REPO-164 - Added new negative unit test for includeChildren: try to lock using includeChildren parameter that has been removed and 400 response code is retrieved. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130641 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-14 12:26:19 +00:00
Ancuta Morarasu
e586f9f210 REPO-484: [REST API] 400 error for unsupported NOT operator in the 'where' predicate. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130610 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-13 15:41:43 +00:00
Cristina Mocanu
b2accc9af8 REPO-164 - Added new unit test for timeToExpire parameter: locked a document, tried to delete while is locked, wait until expiration time has passed and delete the document. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130574 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-12 13:19:22 +00:00
Cristina Mocanu
c69160a717 Added new negative test for Lock functionality: try to lock a folder. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130556 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-12 11:39:10 +00:00
Ancuta Morarasu
59eed12c13 REPO-1164: [REST API] 422 error when executing unlock on a node that is not locked 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130400 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-07 11:48:02 +00:00
Gethin James
91cc53e31b Merged searchapi (5.2.1) to 5.2.N (5.2.1) 
129999 ahind: Merged 5.2.N-AHIND (5.2.1) to searchapi (5.2.1)
      129643 amorarasu: REPO-164 / REPO-1086 - V1 REST API: Lock Node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130261 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:58:13 +00:00
Jan Vonka
30a211d262 REPO-1187 / REPO-164: V1 REST API to "lock content node" - initially, we will support one of two lock types, either ALLOW_OWNER_CHANGES (default, if not requested otherwise) or FULL 
- we will not support ALLOW_ADD_CHILDREN lock type (removed as part of this change request)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130046 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-01 10:35:46 +00:00
Martin Muller
ed67760ab4 Restrict lock method to content types. REPO-1158 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-26 09:15:52 +00:00
Jan Vonka
25988a8efb REPO-1090: fix regress (V1 REST API - list children within the context of a smart folder) 
- follow-on (re: NodeApiTest.getChildrenAssocType fallout - when returning any assoc, not just cm:contains)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129893 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-25 17:02:31 +00:00
Ancuta Morarasu
8dfbbeaf3d REPO-1155 / REPO-160 / REPO-340 - V1 REST API: Remove "includeChildren" option for Lock / Unlock in the rest api (REPO-1163) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-25 16:16:37 +00:00
Ancuta Morarasu
b04cef45d1 REPO-340 / REPO-1136 - V1 REST API: Unlock Node 
- Removed the allowCheckedOut option from the unlock body

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129804 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-23 20:24:18 +00:00
Ancuta Morarasu
d53ac5135a REPO-340 / REPO-1136 - V1 REST API: Unlock Node 
- Unlock with includeChildren=true - fixed + testcases

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129791 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-23 11:34:52 +00:00
Jan Vonka
650554b62c 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@129790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-23 11:14:03 +00:00
Ancuta Morarasu
ecec348d6c REPO-164 / REPO-1086 - V1 REST API: Lock Node 
- review suggestions
   - added more test cases + utility methods

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129751 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-22 13:10:19 +00:00
Ancuta Morarasu
063dde5d8b REPO-340 / REPO-1136 - V1 REST API: Unlock Node 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129716 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-19 18:37:10 +00:00
Jan Vonka
0376e880d0 REPO-1138 / REPO-983: Add support for the isLocked property 
- can optionally "include" when getting node info, listing children, ...

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-19 16:22:09 +00:00
Ancuta Morarasu
3374ed8e49 REPO-164 / REPO-1086 - V1 REST API: Lock Node 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129643 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-18 12:11:24 +00:00
Martin Muller
4350d8026b Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
129011 adavis: REPO-243 People Live Search
      - Fix build failures
      - replace tabs in Person.java


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129189 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:49:23 +00:00
Martin Muller
79149bf9b3 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128681 jvonka: V1 REST API: version history - add api sanity check for auto-version on metadata-only updates
   REPO-348, REPO-313, REPO-905


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129184 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:47:57 +00:00
Martin Muller
ee32e29f48 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128651 jvonka: V1 REST API test improvements: minor fix to re-comment out known issue (see REPO-907)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129182 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:47:49 +00:00
Martin Muller
01042e67ff Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128650 jvonka: V1 REST API: minor fixes (if running within default non-tenant context and single setup)
   - fix couple of failed tests to make sure they're no longer inter-dependent when run in this mode
   REPO-113


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129181 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:47:46 +00:00
Martin Muller
a65e2f48f1 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128640 jvonka: V1 REST API: cleanup and rationalise new api tests (re: remotable helpers & runAs user / admin) - round 5
   REPO-113 (also relates to REPO-28, REPO-114, REPO-825)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129179 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:47:37 +00:00
Martin Muller
3c1341e808 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128608 jvonka: V1 REST API: cleanup and rationalise new api tests (re: remotable helpers & runAs user / admin) - round 4
   REPO-113 (also relates to REPO-28, REPO-114, REPO-825)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129178 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:47:33 +00:00
Martin Muller
82f60d85fb Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128601 jvonka: V1 REST API: cleanup and rationalise new api tests (re: remotable helpers & runAs user / admin) - round 3
   REPO-113 (also relates to REPO-28, REPO-825)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129176 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:47:24 +00:00
Martin Muller
bcf551a644 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128597 jvonka: REPO-900: Fix "autoRename not working if using a relativePath (with create/add node via json request)"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129175 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:47:20 +00:00
Martin Muller
a95eb5613e Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128594 jvonka: V1 REST API: cleanup and rationalise new api tests (re: remotable helpers & runAs user / admin) - round 2
   REPO-113


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129174 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:47:16 +00:00
Martin Muller
1b474b8199 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128583 jvonka: V1 REST API: Node Version History - tweak "delete version" operation
   - cannot delete last version for now (return 422)
   REPO-835


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129173 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:47:11 +00:00
Martin Muller
ebeb96f576 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128537 jvonka: V1 REST API: Api Test cleanup and rationalisation (re: helper methods / runAs user / admin) - round 1
   REPO-113


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129171 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:47:03 +00:00
Martin Muller
ed52b3a6c5 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128517 jvonka: REPO-874: Improve REST fwk: improve error message if a POST operation is attempted with multiple items
   - rationalise the code when handling POST for an API "operation" or POST to a collection that is marked as "allowMultiple=false"
   - they should now consistently return the same existing error message: "Only 1 entity is supported in the HTTP request body"
   - add api sanity tests to "create site", "create rating" and some of the node op's, such as "/move" & "/copy"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:46:51 +00:00
Martin Muller
5e6bc0ae99 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128476 jvonka: REPO-839: Follow-on to fix subtle issue in mimeType guess (ie. application/octet-stream should be last resort, if magic bytes indicate text and there is no file ext)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129161 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:46:22 +00:00
Martin Muller
93aa43babc Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128442 jvonka: V1 REST API: Update binary content - add optional name param (to allow rename on upload of a new version)
   - api implementation + api sanity tests (+ve/-ve)
   REPO-518


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129159 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:46:13 +00:00
Martin Muller
c06865ed18 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128173 jvonka: REPO-839: Fix guess mimetype (if no file ext) - on upload and/or update (after a rename)
   - improvement to REPO-495
   - will also apply to REPO-518 when implemented


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129133 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 10:13:38 +00:00
Martin Muller
6bcf383094 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128172 jvonka: V1 REST API: Node Version History - minor: move relevant test from NodeApiTest to NodeVersionsApiTest
   - REPO-313: list version history
   - REPO-228: update node content/binary


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129132 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 10:13:34 +00:00
Martin Muller
2f429ff4a4 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128162 jvonka: V1 REST API: Node Version History - initial api tests
   - REPO-313: list version history
   - REPO-327: get version info
   - REPO-229: download version content


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129130 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 10:13:25 +00:00
Martin Muller
30bf2e5d14 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128148 jvonka: v1 REST API:  additional sanity checks for paging query params
   REPO-390


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 10:13:21 +00:00
Martin Muller
f88cccb1b7 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128135 jvonka: v1 REST API:  fix possible NPE when optionally listing allowable ops for non-file/non-file (+ add sanity api test)
   REPO-488, REPO-514


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 10:12:38 +00:00
Martin Muller
c13683eea1 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
128122 jvonka: v1 REST API:  minor bug fix(es) to update http error code mappings (to 4xx rather than 500) + sanity api tests
   REPO-475, REPO-512, REPO-516, REPO-473


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 10:10:41 +00:00
Andrei Rebegea
a1facc20f9 Merged HEAD (5.2) to 5.2.N (5.2.1) 
128106 jvonka: Merged RETURN-OF-THE-API (5.2.0) to HEAD (5.2)
      128071: REPO-495: Update + add tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-10 13:49:18 +00:00
Andrei Rebegea
9203c6884a Merged HEAD (5.2) to 5.2.N (5.2.1) 
128104 jvonka: Merged RETURN-OF-THE-API (5.2.0) to HEAD (5.2)
      128054: REPO-495: When uploading/updating binary content, guess mimetype and encoding
      - follow similar pattern to v0 Upload API (ignore Content-Type header)
      - in the future, we might wish to loosen this restriction [pending MNT-16381] and/or allow admin's option to update mimeType/encoding directly via node metadata update


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-10 13:48:27 +00:00
Alan Davis
241ed23c04 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127620 jkaabimofrad: Missed changes during resolving conflicts.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 15:19:45 +00:00
Alan Davis
c96fec3100 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127612 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127450 jvonka: Node Associations - creating/listing primary child assoc type other than cm:contains
      - fix test fallout (400 -> 422 for model integrity exceptions)
      - RA-1092


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127719 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 15:18:58 +00:00
Alan Davis
f99ba16ec7 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127611 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127447 jvonka: Node Associations - creating/listing primary child assoc type other than cm:contains
      - follow-on fix + test based on review back (create children below content)
      - also -ve test for model integrity excet
      - RA-1092


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127718 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 15:18:53 +00:00
Alan Davis
6fccac5a48 Merged HEAD (5.2) to 5.2.N (5.2.1) 
127609 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127435 jvonka: Node Associations - creating/listing primary child assoc type other than cm:contains
      - follow-on to add api sanity tests
      RA-1092


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127716 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 15:18:41 +00:00
Alan Davis
18a8b2949e Merged HEAD (5.2) to 5.2.N (5.2.1) 
127607 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127420 jvonka: Node Associations - 1st cut for creating/listing primary child assoc type other than cm:contains
      - minor: fix test fallout
      RA-1092


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127714 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 15:18:29 +00:00