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,193 Commits 325 Branches 2,188 Tags
4498ab0a4a605a95f95f9c413a66cae8381c8650
Commit Graph

551 Commits

Author SHA1 Message Date
Alexandru Epure
4498ab0a4a Merged 5.2.N (5.2.1) to HEAD (5.2) 
129175 mmuller: 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/HEAD/root@129349 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:13:47 +00:00
Alexandru Epure
472785f0bd Merged 5.2.N (5.2.1) to HEAD (5.2) 
129174 mmuller: 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/HEAD/root@129348 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:13:39 +00:00
Alexandru Epure
575183a5ac Merged 5.2.N (5.2.1) to HEAD (5.2) 
129173 mmuller: 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/HEAD/root@129347 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:13:29 +00:00
Alexandru Epure
6084cc72b5 Merged 5.2.N (5.2.1) to HEAD (5.2) 
129172 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128561 jvonka: V1 REST API: Api Test cleanup and rationalisation (re: helper methods / runAs user / admin) - round 1b
      - follow-on to fix test fallout
      REPO-113


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129346 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:13:20 +00:00
Alexandru Epure
e44796d1ec Merged 5.2.N (5.2.1) to HEAD (5.2) 
129171 mmuller: 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/HEAD/root@129345 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:13:11 +00:00
Alexandru Epure
c3eeea134f Merged 5.2.N (5.2.1) to HEAD (5.2) 
129168 mmuller: 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/HEAD/root@129342 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:12:44 +00:00
Alexandru Epure
6a7984c98f Merged 5.2.N (5.2.1) to HEAD (5.2) 
129162 mmuller: 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/HEAD/root@129336 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:11:52 +00:00
Alexandru Epure
801f50689c Merged 5.2.N (5.2.1) to HEAD (5.2) 
129161 mmuller: 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/HEAD/root@129335 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:11:43 +00:00
Alexandru Epure
6e49b00e89 Merged 5.2.N (5.2.1) to HEAD (5.2) 
129159 mmuller: 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/HEAD/root@129333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:11:25 +00:00
Alexandru Epure
229b617556 Merged 5.2.N (5.2.1) to HEAD (5.2) 
129138 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128397 jvonka: Merged 5.1.N (5.1.2) to RETURN-OF-THE-API (5.2.0)
         128318 jvonka: MNT-16446: Edit Comment permission (part 1)
         - for v0 api so far (as per specifically described test case) ... more to follow !


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129331 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:11:03 +00:00
Alexandru Epure
dc0ead983d Merged 5.2.N (5.2.1) to HEAD (5.2) 
129136 mmuller: 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/HEAD/root@129330 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:10:54 +00:00
Alexandru Epure
66911c842b Merged 5.2.N (5.2.1) to HEAD (5.2) 
129135 mmuller: 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/HEAD/root@129329 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:10:45 +00:00
Alexandru Epure
8fa8efbee6 Merged 5.2.N (5.2.1) to HEAD (5.2) 
129134 mmuller: 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/HEAD/root@129328 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:10:35 +00:00
Alexandru Epure
99ae11c173 Merged 5.2.N (5.2.1) to HEAD (5.2) 
129133 mmuller: 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/HEAD/root@129327 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:10:26 +00:00
Alexandru Epure
37846a0c94 Merged 5.2.N (5.2.1) to HEAD (5.2) 
129132 mmuller: 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/HEAD/root@129326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:10:17 +00:00
Alexandru Epure
66c7905ee2 Merged 5.2.N (5.2.1) to HEAD (5.2) 
129130 mmuller: 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/HEAD/root@129324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:10:00 +00:00
Alexandru Epure
5d42543f51 Merged 5.2.N (5.2.1) to HEAD (5.2) 
129129 mmuller: 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/HEAD/root@129323 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:09:51 +00:00
Alexandru Epure
008800feb9 Merged 5.2.N (5.2.1) to HEAD (5.2) 
129128 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128138 jvonka: v1 REST API:  fix test fallout after improvements to error handling
      REPO-476, REPO-477


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129322 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:09:41 +00:00
Alexandru Epure
2664aa509c Merged 5.2.N (5.2.1) to HEAD (5.2) 
129127 mmuller: 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/HEAD/root@129321 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:09:33 +00:00
Alexandru Epure
d95958cf76 Merged 5.2.N (5.2.1) to HEAD (5.2) 
129126 mmuller: 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/HEAD/root@129320 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:09:24 +00:00
Alexandru Epure
98485e7723 Merged 5.2.N (5.2.1) to HEAD (5.2) 
129125 mmuller: 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/HEAD/root@129319 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:09:16 +00:00
Alexandru Epure
2fbd0b08cb Merged 5.2.N (5.2.1) to HEAD (5.2) 
128814 amukha: REPO-828: MNT-16401: Delete comment notification from Blog or Links is not displayed in Site Activities dashlet
      - Corrected the tests. (see REPO-904)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129302 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:06:40 +00:00
Alexandru Epure
e637bcbd6e Merged 5.2.N (5.2.1) to HEAD (5.2) 
128660 jkaabimofrad: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128649 jkaabimofrad: Merged JAMAL/MNT-16371 (5.1.2) to 5.1.N (5.1.2)
         128626 jkaabimofrad: MNT-16371: Turned off Inherit Permissions and explicitly added the Site Manager role for the Site to the surf-config folder when it is first created. Also, revoked ownership privileges for surf-config contents.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129299 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 14:06:17 +00:00
Alexandru Epure
58cb56c7c9 Merged 5.2.N (5.2.1) to HEAD (5.2) 
128371 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      - fix merge for:
      128341 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         128260 adavis: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            128213 arebegea: MNT-16437 : CLONE - 4.2.N - 4.2.3 CMIS Bulk Update Properties only updates the properties of one document when more than one document is in the objectIdAndChangeTokens list
               Merged V4.2.3 (4.2.3.25) to V4.2-BUG-FIX (4.2.7)
                  128177 arebegea: MNT-16376 : 4.2.3 CMIS Bulk Update Properties only updates the properties of one document when more than one document is in the objectIdAndChangeTokens list
                     - The batch worker threads did not have the thread context to know that they were dealing with CMIS version 1.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129285 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 13:55:50 +00:00
Alexandru Epure
03ab328868 Merged 5.2.N (5.2.1) to HEAD (5.2) 
128360 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128341 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         128260 adavis: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            128213 arebegea: MNT-16437 : CLONE - 4.2.N - 4.2.3 CMIS Bulk Update Properties only updates the properties of one document when more than one document is in the objectIdAndChangeTokens list
               Merged V4.2.3 (4.2.3.25) to V4.2-BUG-FIX (4.2.7)
                  128177 arebegea: MNT-16376 : 4.2.3 CMIS Bulk Update Properties only updates the properties of one document when more than one document is in the objectIdAndChangeTokens list
                     - The batch worker threads did not have the thread context to know that they were dealing with CMIS version 1.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 13:55:41 +00:00
Alexandru Epure
9621978d0c Merged 5.2.N (5.2.1) to HEAD (5.2) 
128215 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128190 amorarasu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         128171 amukha: MNT-16401: Delete comment notification from Blog or Links is not displayed in Site Activities dashlet
            - Corrected the comemnts webscript.
            - Added JUnit tests.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129278 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 13:51:28 +00:00
Ancuta Morarasu
34476add50 Merged 5.2.N (5.2.1) to HEAD (5.2) 
128985 amorarasu: 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/HEAD/root@128986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-07-26 17:15:29 +00:00
Jan Vonka
aa91d01a57 Merged 5.2.N (5.2.1) to HEAD (5.2) 
128387 jvonka: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128382 jvonka: MNT-16446: Edit Comment permission (part 3b) 
      - follow-on to fix test fallout
      - for CMIS (and future v1 Nodes REST)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@128731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-07-12 12:01:03 +00:00
Jan Vonka
d57202f68b Merged 5.2.N (5.2.1) to HEAD (5.2) 
128386 jvonka: 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/HEAD/root@128730 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-07-12 12:00:37 +00:00
Jan Vonka
a14d7cb610 Merged 5.2.N (5.2.1) to HEAD (5.2) 
128364 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128357 jvonka: MNT-16446: Edit Comment permission (part 2b) 
      - follow-on to fix test fallout
      - for v1 api


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@128729 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-07-12 12:00:09 +00:00
Jan Vonka
6bbb3e3d11 Merged 5.2.N (5.2.1) to HEAD (5.2) 
128362 adavis: 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/HEAD/root@128728 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-07-12 11:59:51 +00:00
Jan Vonka
c7bba00551 Merged 5.2.N (5.2.1) to HEAD (5.2) 
128334 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128318 jvonka: MNT-16446: Edit Comment permission (part 1)
      - for v0 api so far (as per specifically described test case) ... more to follow !


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@128727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-07-12 11:59:26 +00:00
Jan Vonka
5c4a450d30 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/HEAD/root@128106 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-09 16:14:36 +00:00
Jan Vonka
282f29adf9 Merged RETURN-OF-THE-API (5.2.0) to HEAD (5.2) 
128062: REPO-495: Follow-on to fix test fallout


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@128105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-09 16:14:11 +00:00
Jan Vonka
939ed76c22 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/HEAD/root@128104 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-09 16:13:50 +00:00
Alan Davis
41ae7f2d10 Update source headers that came from API-STRIKES-BACK 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127899 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 11:11:00 +00:00
Alan Davis
c9c7426ee8 Merged 5.2.N (5.2.1) to HEAD (5.2) 
127253 arebegea: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      127218 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         127187 cturlica: MNT-15630: CLONE - people rest api does not accept the skipCount param
            - merged initial solution with some changes required for 5.0.N, because the people web script was split in people.get.js and people-enterprise.get.js


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127875 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 09:21:53 +00:00
Alan Davis
9818f16f2a Merged 5.2.N (5.2.1) to HEAD (5.2) 
126998 amorarasu: Update source headers - add new Copyrights for new Java files synced from Head (part 3).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127854 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-06 09:17:00 +00:00
Alan Davis
1a5bba295d Merged 5.2.N (5.2.1) to HEAD (5.2) 
125859 adragoi: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125817 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125673 abalmus: MNT-15421 : Intermittent failure SubsystemsTest.testAbstractPropertyBackedBean_performEarlyPropertyChecks_PortEarlyPropertyChecker
            - Fixed intermittently failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127820 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-04 11:01:10 +00:00
Alan Davis
3e1e1edbaa Merged 5.2.N (5.2.1) to HEAD (5.2) 
125788 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127810 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 17:08:06 +00:00
Alan Davis
19fcf2c411 Merged 5.2.N (5.2.1) to HEAD (5.2) 
125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 16:45:04 +00:00
Alan Davis
da8101a5ba Merged 5.2.N (5.2.1) to HEAD (5.2) 
125781 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 16:40:56 +00:00
Alan Davis
743f5426d1 Merged 5.2.N (5.2.1) to HEAD (5.2) 
124521 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124493 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124467 amorarasu:       Reverse merged 5.0.N (5.0.4)
                  124430 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
                     124322 adragoi: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
                        124254 amorarasu: MNT-15848: The PublishingRestApiTest.testPublishingQueuePost intermittently fails on SQL Server
                           - scheduled post publishing after 1500 milliseconds, to have time to test the SCHEDULED status.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127762 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 16:04:20 +00:00
Alan Davis
905856dd2d Merged 5.2.N (5.2.1) to HEAD (5.2) 
124516 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124488 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124430 aleahu:       124430 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
                  124322 adragoi: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
                     124254 amorarasu: MNT-15848: The PublishingRestApiTest.testPublishingQueuePost intermittently fails on SQL Server
                        - scheduled post publishing after 1500 milliseconds, to have time to test the SCHEDULED status.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127757 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 16:03:52 +00:00
Jamal Kaabi-Mofrad
f9da6185f0 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/HEAD/root@127622 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 01:33:13 +00:00
Jamal Kaabi-Mofrad
8cc239c53c Missed changes during resolving conflicts. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-02 23:23:57 +00:00
Jamal Kaabi-Mofrad
f660ff4c3f 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/HEAD/root@127617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-02 22:25:24 +00:00
Jamal Kaabi-Mofrad
e04f7136be Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2) 
127462 jkaabimofrad: Merged 5.1.N (5.1.2) to API-STRIKES-BACK (5.2.0)
      127454 jkaabimofrad: MNT-16224, RA-1093: Fixed Quickshare issue where deleting a shared node didn't remove the 'shared' aspect. The fix also takes care of the shared nodes that have been deleted but not yet restored, as well as, shared nodes that have already been restored from the trashcan (allow the user to un-share).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-02 22:25:00 +00:00
Jamal Kaabi-Mofrad
010295d84d 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/HEAD/root@127614 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-02 22:24:27 +00:00
Jamal Kaabi-Mofrad
a6470f588e 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/HEAD/root@127612 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-02 22:24:02 +00:00