Commit Graph

22 Commits

Author SHA1 Message Date
Alan Davis
b116553f31 Fix compile error in build after merge to 5.2.N
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130316 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 20:29:23 +00:00
Gethin James
59a1186522 Merged searchapi (5.2.1) to 5.2.N (5.2.1)
130005 gjames: Merged 5.2.N-AHIND (5.2.1) to searchapi (5.2.1)
      129716 amorarasu: 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@130267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 15:12:54 +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
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
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
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
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
Ancuta Morarasu
e08abc2afb Merged HEAD (5.2) to 5.2.N (5.2.1)
126618 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      125355 gjames: RA-901: Success code for move operation should be 200


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126963 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:32:42 +00:00
Ancuta Morarasu
be9428619b Merged HEAD (5.2) to 5.2.N (5.2.1)
126607 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      125020 gjames: RA-884: Posting download activities and formatting


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126952 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:20:06 +00:00
Ancuta Morarasu
642e497a69 Merged HEAD (5.2) to 5.2.N (5.2.1)
126504 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122759 gjames: RA-211: Changing execution actions to handle WithResponse. Rework>Java7


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126848 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:46:15 +00:00
Ancuta Morarasu
8a9bbe855b Merged HEAD (5.2) to 5.2.N (5.2.1)
126484 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122595 jvonka: Nodes (FileFolder) API - add "permanent" option to delete node (to optionally bypass archive/trashcan)
      RA-837, RA-642


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126828 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:42:04 +00:00
Ancuta Morarasu
5b8acc631d Merged HEAD (5.2) to 5.2.N (5.2.1)
126450 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122127 jvonka: Nodes (FileFolder) API - update/add -ve tests for move & copy operations
      - also fix-up error messages to show nodeId (rather than full nodeRef)
      RA-684, RA-806


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126795 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:22:31 +00:00
Ancuta Morarasu
72dca1b5be Merged HEAD (5.2) to 5.2.N (5.2.1)
126435 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121907 gjames: RA-774 Renaming action to operation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:18:56 +00:00
Ancuta Morarasu
feae0837b6 Merged HEAD (5.2) to 5.2.N (5.2.1)
126432 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121870 gjames: Adding copy and move actions to the NodeEntityResource


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126778 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:18:26 +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
78a2510b8d Merged HEAD (5.2) to 5.2.N (5.2.1)
126358 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119623 jvonka: RA-663: Update REST fwk - fix BinaryResource update (currently masks entity PUT operation)
      - use "updateProperty" (instead of "update") to be consistent with other binary resource methods
      - note: REST fwk relies on unique method names across the resource actions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:47:42 +00:00
Ancuta Morarasu
60ed406cf6 Merged HEAD (5.2) to 5.2.N (5.2.1)
126355 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119311 jvonka: RA-388 / RA-638 : FileFolder API - optimise userInfo lookup for cm:creator & cm:modifier (especially when getting folder children)
      - also return userInfo for other in-built user props, eg. cm:owner, cm:lockOwner, cm:workingCopyOwner


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126701 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:47:14 +00:00
Ancuta Morarasu
d3b503759b Merged HEAD (5.2) to 5.2.N (5.2.1)
126349 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      118692 jvonka: Merge from DEV/SABRE_JANV1 (part 2) - RA-613 / RA-655
      - File Folder API (PoC - experimental WIP)
      - TODO add tests +review backwards compat' (eg. favs)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126694 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:44:49 +00:00
Ancuta Morarasu
3a5a22da8d Merged HEAD (5.2) to 5.2.N (5.2.1)
126348 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      118663 jvonka: Merge from DEV/SABRE_JANV1 (part 1)
      File Folder API (PoC - experimental WIP)
      - relates to RA-613
      - initial file folder CRUD including
      - * list folder children (minimal info by default) 
          with sorting, paging & optional isFolder=true/false
      - * create folders or (empty) files
      - * get node info
          with id, name, nodeType, auditable props, properties (not sys:referencable), aspectNames, ...
      - * put node info
      - * put content (upload file)
      - * get content (download file)
      - * delete node (cascade for folder)
      - * support for well-known folder alias, -root-, -my-, -shared-
      - TODO add tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126693 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:43:04 +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
Samuel Langlois
788d3c9c89 Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00