Commit Graph

437 Commits

Author SHA1 Message Date
Martin Muller
2b9173ee6a Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
129058 jvonka: V1 REST API: Sites Live Search (/queries/live-search-sites)
   - additional tweaks based on ADs review comments
   REPO-232, REPO-883


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129198 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 13:50:03 +00:00
Martin Muller
63bb6a86ef Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
129054 adavis: REPO-232,REPO-883 V1 REST API: Sites Live Search (/queries/live-search-sites)
      - Moved getSite() into the class that uses it.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 13:49:59 +00:00
Martin Muller
069da2af29 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
129052 adavis: REPO-232,REPO-883 V1 REST API: Sites Live Search (/queries/live-search-sites)
      - As part of code review: Added generics to listPage method and moved it inside AbstractQuery.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 13:49:53 +00:00
Martin Muller
33a3c91e99 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
129050 jvonka: V1 REST API: fix 500 (NPE) when trying to get a version (info or content) for a node that has no version history
   REPO-1051, REPO-327, REPO-229


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129194 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 13:49:42 +00:00
Martin Muller
9bc32208c7 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
129042 jvonka: V1 REST API: Sites Live Search (/queries/live-search-sites)
   - add experimental option (for review) to choose sort type
   - fix post query sort to use AlfrescoCollator rather than RuleBasedCollator (latter ignores spaces)
   - fix post query sort to apply paging correctly (get results first) - TODO add test
   REPO-232, REPO-882, REPO-883


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129193 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 13:49:39 +00:00
Martin Muller
267cdf9072 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
129037 adavis: REPO-243 People Live Search
      - Added another orderBy test following a question from Jan.
      - Minor change in post order code to replace a Map lookup with a List lookup. Logically the same but faster.
      - Replaced a NPE test failure with a failure message if TEST_COUNT is too small


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 13:49:35 +00:00
Martin Muller
dd330266ed Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
129017 adavis: REPO-243 People Live Search
      - Added additional tests
      - Removed check in Person constructor for no id as we want to be able to create a Person from json which might not have the id.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129190 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 13:49:27 +00:00
Martin Muller
f83b4b7654 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
129010 jvonka: V1 REST API: 1st-cut of Sites Live Search
   - TODO api sanity test
   - open-question, re: orderBy
   REPO-232, REPO-882


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129188 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 13:49:19 +00:00
Martin Muller
83e9fdf964 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
129004 adavis: REPO-243 People Live Search
      - First cut of this code
      - Includes a re-factor of the code used by GET /queries/live-search-nodes as there is much in common.
      - Still have some tests to write and there are bound to be comments from the review.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129187 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 13:49:15 +00:00
Martin Muller
15f33e6130 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
128790 mmuller: Fix for REPO-855 + Sanity test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 13:49:10 +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
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
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
6d4716b5c0 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
128526 amorarasu: REPO-853: Improve REST fwk: Where parameter with invalid operator like where=(inval=true)
       - Added proper error message.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129170 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 13:46:59 +00:00
Martin Muller
3881d6e8d7 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
128525 jvonka: REPO-874: Improve REST fwk: improve error message if a POST operation is attempted with multiple items
   - follow-on to fix fallout


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 13:46:55 +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
07a3d6b473 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
128489 jvonka: V1 REST API: Node Version History - minor tweak for "delete version" 
   - re: fix-up versionType if deleting last version
   REPO-835


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129166 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 13:46:43 +00:00
Martin Muller
4cc44bb4b2 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
128487 jvonka: V1 REST API: Node Version History - add basic paging
   - follow-on fix for NPE
   REPO-313


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129164 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 13:46:33 +00:00
Martin Muller
750adc141c Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
128479 jvonka: V1 REST API: Node Version History - add basic paging
   REPO-313


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129162 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 13:46:26 +00:00
Martin Muller
e641c2f0f3 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
128460 jvonka: REPO-341: Minor fix to site creation to return generic error message, if try to create multiple sites in a single call.
   - also relates to REPO-874


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129160 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 13:46:17 +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
fa533a6b57 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
128232 jvonka: V1 REST API: Node Version History - add "delete version" operation
   - DELETE /nodes/nodeId/versions/versionId
   REPO-835


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129136 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 10:13:51 +00:00
Martin Muller
dbb8bd31e8 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
128208 jvonka: V1 REST API: Node Version History - test update
   - test to show that optionally can create new file as a minor version (0.1)
   REPO-156, REPO-159


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129135 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 10:13:47 +00:00
Martin Muller
ee91e0b457 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
128207 jvonka: V1 REST API: Node Version History - add "revert version" operation
   - ie. promote a previous version to become a new (most recent) version
   - POST /nodes/nodeId/versions/versionId/revert (with request body, optionally majorVersion &/or comment)
   REPO-236


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129134 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 10:13:42 +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
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
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
f4db00acf7 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
128134 jvonka: v1 REST API:  minor bug fix(es) to error handling when creating node with assocs + sanity api tests
   REPO-476, REPO-477


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129126 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 10:11:36 +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
Martin Muller
24d305c132 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
128090 jvonka: Node Version History - 1st-cut impl (for initial review)
   - REPO-313: list version history
   - REPO-327: get version info
   - REPO-229: download version content
   - TODO api tests + spec updates


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129124 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-05 10:08:45 +00:00
Ancuta Morarasu
a991968b63 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128984 amorarasu: MNT-16469: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      128478 amorarasu: MNT-16468: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         128228, 128380 amorarasu: MNT-16439: Merged V4.2.4 (4.2.4.23) to V4.2-BUG-FIX (4.2.7)
            128107 amorarasu: MNT-16040: skipCount does not appear to work for Workflow tasks REST api
         - Updated Activiti to version 5.19.0.3


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128985 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-26 15:19:21 +00:00
Martin Muller
e39e468fff Fixed some javadoc errors. REPO-466
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128510 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-01 08:34:26 +00:00
Jan Vonka
0020afb335 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128375 jvonka: MNT-16446: Edit Comment permission (part 3) 
   - for CMIS (and also future v1 Nodes REST API)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128386 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-27 19:08:30 +00:00
Alan Davis
7d7e006356 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128355 jvonka: MNT-16446: Edit Comment permission (part 2)
   - for v1 api


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-27 07:05:38 +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
cf17943d43 Merged HEAD (5.2) to 5.2.N (5.2.1)
127899 adavis: Update source headers that came from API-STRIKES-BACK


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127901 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 11:13:46 +00:00
Alan Davis
15899820ce Merged HEAD (5.2) to 5.2.N (5.2.1)
127622 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127621 jkaabimofrad: Replaced anonymous class with lambda, to force the use of Java 8!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127728 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:19:51 +00:00
Alan Davis
4a18a13f7b Merged HEAD (5.2) to 5.2.N (5.2.1)
127619 jkaabimofrad: Missed changes during resolving conflicts.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:19:40 +00:00
Alan Davis
dc067d1878 Merged HEAD (5.2) to 5.2.N (5.2.1)
127617 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127512 jkaabimofrad: REPO-47: Per peer review, changed the upload API to throw an exception when requesting multiple renditions.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127724 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:19:29 +00:00
Alan Davis
e30e7a3504 Merged HEAD (5.2) to 5.2.N (5.2.1)
127616 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127464 jkaabimofrad: RA-1093: Removed a common method as it was pushed down to the QuickShareService as a result of the MNT-16224 fix.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127723 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:19:23 +00:00
Alan Davis
f3e9c355c3 Merged HEAD (5.2) to 5.2.N (5.2.1)
127614 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127461 jvonka: Fix RA-1011: REST API create site
      - can't create site with id/shortName = 'true'


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:19:11 +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
22d91cb857 Merged HEAD (5.2) to 5.2.N (5.2.1)
127606 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127419 jvonka: Node Associations - 1st cut for creating/listing primary child assoc type other than cm:contains
      - TODO sanity tests, api spec tweaks
      RA-1092


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127713 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:18:22 +00:00
Alan Davis
3f0bba6779 Merged HEAD (5.2) to 5.2.N (5.2.1)
127604 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127414 jvonka: Node Associations - create node with assocs (peer &/or secondary child)
      - can be optionally used to create (eg. mandatory) assoc(s) to other existing node(s)
      RA-925


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:18:10 +00:00
Alan Davis
a0b13ea954 Merged HEAD (5.2) to 5.2.N (5.2.1)
127602 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127342 jvonka: Node Associations - peer assoc permissions
      - alt impl using temp wrapper instead of full override
      RA-1062


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127694 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 14:48:43 +00:00
Alan Davis
eb8cf53b69 Merged HEAD (5.2) to 5.2.N (5.2.1)
127600 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127329 jvonka: Node Associations - initial paging (for secondary child assocs & parents)
      - as per review comment for RA-920


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 14:48:31 +00:00
Alan Davis
c7f6f894e4 Merged HEAD (5.2) to 5.2.N (5.2.1)
127597 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127314 jvonka: Fix RA-929 (Error message should not be empty when creating duplicate peer association)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127689 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 14:48:14 +00:00
Alan Davis
4188afe338 Merged HEAD (5.2) to 5.2.N (5.2.1)
127595 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127284 jvonka: Node Associations - add first-cut of permissions
      RA-1062


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 14:48:03 +00:00
Alan Davis
10aebdcf28 Merged HEAD (5.2) to 5.2.N (5.2.1)
127592 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127226 gjames: RA-1064: Added a WebScriptExceptionResolver


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127684 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 14:18:42 +00:00
Alan Davis
95ea8f67aa Merged HEAD (5.2) to 5.2.N (5.2.1)
127591 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127156 jvonka: Node Associations - trivial: remove unused imports (Assoc.java)
      RA-742


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