Commit Graph

13 Commits

Author SHA1 Message Date
Ancuta Morarasu
5934340526 Merged HEAD (5.2) to 5.2.N (5.2.1)
126507 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122770 jvonka: Nodes & Shared Links APIs - some test refactoring
       - primarily introduce createTextFile helper (in addition to createFolder/createNode) to reduce dependency on "repoService" test helper
      - also means we're using the v1 api to upload test content :-)
      RA-388, RA-773


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:46:40 +00:00
Ancuta Morarasu
f053fca565 Merged HEAD (5.2) to 5.2.N (5.2.1)
126489 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122631 jkaabimofrad: RA-676: Added node's renditions REST API.
              - Download renditioned content + test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126833 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:43:54 +00:00
Ancuta Morarasu
22f901e0dd Merged HEAD (5.2) to 5.2.N (5.2.1)
126486 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122626 jvonka: Nodes (FileFolder) API - add "permanent" option to delete node (to optionally bypass archive/trashcan)
      - follow-on such that user cannot delete permanently (even with delete permission) unless they're owner or admin of node (for hierarchy, only checks parent folder node) 
      RA-837, RA-642


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:42:25 +00:00
Ancuta Morarasu
c5dcb1659f Merged HEAD (5.2) to 5.2.N (5.2.1)
126483 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122594 jvonka: REST api fwk: pass through query params for DELETE method
      - also update REST api test fwk
      RA-837


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126827 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:41:53 +00:00
Ancuta Morarasu
18408af78f Merged HEAD (5.2) to 5.2.N (5.2.1)
126467 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122325 jkaabimofrad: Moved some of the FileFolder API tests logic to AbstractBaseApiTest.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126811 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:25:57 +00:00
Ancuta Morarasu
f7e646bdab Merged HEAD (5.2) to 5.2.N (5.2.1)
126438 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121924 gjames: RA-684: Adding a test for node copy


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126784 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:19:46 +00:00
Ancuta Morarasu
7801810028 Merged HEAD (5.2) to 5.2.N (5.2.1)
126385 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120469 jvonka: FileFolder API - NodeApiTest - add test to retrieve content
      - also update test fwk to support post request body as byte array (as well as string)
      RA-641


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:56:47 +00:00
Ancuta Morarasu
5fbede5332 Merged HEAD (5.2) to 5.2.N (5.2.1)
126380 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120084 jkaabimofrad: RA-640, RA-681: made "update node content" API to return the default JSON representation of the file node. Also added a test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:53:26 +00:00
Ancuta Morarasu
d05f7bb484 Merged HEAD (5.2) to 5.2.N (5.2.1)
126351 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      118825 jkaabimofrad: RA-655: manual merge of SFS module to FILE-FOLDER-API.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:46:38 +00:00
Raluca Munteanu
27333f1d39 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/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
9a889c69ea 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/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Jamal Kaabi-Mofrad
8855ef66f8 ACE-4469: Merged BRANCHES/DEV/HEAD-SFS (cherry picked) to HEAD
113520: SFS-179: Added multipart upload support into Public API framework.
   114561: SFS-179: Added tests for upload API, as well as minor fixes.
   114732: SFS-179: Changed the assert import from 3.X to 4.X.
   114734: SFS-179: Added unit tests for Public API framework multiPart support.
   114735: SFS-179: Fixed unit test failure.
- Also removed mergeinfo added in r112639

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-19 23:25:59 +00:00
Gethin James
8962c270e3 Merge Sabre4 to HEAD
110680: Tests for ModulePackages api endpoint RA-370, moved some CMM logic to AbstractBaseApiTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111189 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:04:56 +00:00