inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,849 Commits 335 Branches 2,191 Tags
cfee1bb5940239d4fd7b5df6f2ff4e22d8209bfe
Commit Graph

1638 Commits

Author SHA1 Message Date
Jamal Kaabi-Mofrad
cfee1bb594 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
120648 jkaabimofrad: RA-640: Added test to update node content. Also, minor modification to satisfy the IDEA's code analysis.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126394 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:39:38 +00:00
Jamal Kaabi-Mofrad
4cb38289a5 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
120645 jkaabimofrad: RA-638: Added test to GET node information.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:39:27 +00:00
Jamal Kaabi-Mofrad
9bce7d21cb Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
120603 jkaabimofrad: FileFolder API – cleanup + minor modification to satisfy the IDEA's code analysis.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126392 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:39:19 +00:00
Jamal Kaabi-Mofrad
8cbfae3ada Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
120592 jvonka: FileFolder API - trivial (add/udpate lic header)
   - note: at some point, we should do a sweep through the rest of the (remote-)api source code


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126391 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:39:06 +00:00
Jamal Kaabi-Mofrad
2fa53eeaf4 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
120550 jkaabimofrad: RA-638: Changed the "validateOrLookupNode" method visibility, in order to override it for Cloud.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126390 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:38:49 +00:00
Jamal Kaabi-Mofrad
7e62487fcb Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
120545 jvonka: FileFolder API - minor (fix formatting style - primarily opening curly brace on next line)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126389 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:38:36 +00:00
Jamal Kaabi-Mofrad
82fb214ab0 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
120483 jvonka: FileFolder API - minor (fix typo)
   - edge-case, eg. unknown type of cm:link


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126388 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:38:29 +00:00
Jamal Kaabi-Mofrad
7cc4fda5ab Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
120472 jvonka: FileFolder API - minor (JavaDoc / comments only)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:38:11 +00:00
Jamal Kaabi-Mofrad
8d629c6a91 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
120471 jvonka: FileFolder API - NodeApiTest - follow-on to fix NPE in debug logging
   RA-641


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126386 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:38:03 +00:00
Jamal Kaabi-Mofrad
dcc2467133 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/HEAD/root@126385 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:37:51 +00:00
Jamal Kaabi-Mofrad
ff65db22e9 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
120464 jkaabimofrad: RA-725: Changed the "userName" property in minimal person response to "id".


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126384 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:37:10 +00:00
Jamal Kaabi-Mofrad
f8a7dcfd4d Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
120445 jvonka: RA-631, RA-641: REST fwk - fix GET node binary resource (set content-disposition/attachment header)
   - by default, set attachment header when downloading content
   - unless "attachment=false" *and* content type is in nonAttachContentTypes white list (eg. pdf, images)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126383 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:37:00 +00:00
Jamal Kaabi-Mofrad
2f84bce7f7 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
120441 jvonka: RA-727: REST fwk - fix GET node binary resource (setting of content info response headers)
   - including encoding (Content-Type charset) & locale (Content-Language)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126382 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:36:50 +00:00
Jamal Kaabi-Mofrad
8c957be649 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
120439 jvonka: RA-630: FileFolder API - update antlr grammar in REST fwk for select/where clause
   - to allow colon in property name identifier (json path)
   - also update impl + test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126381 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:36:33 +00:00
Jamal Kaabi-Mofrad
9ec0c640f3 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/HEAD/root@126380 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:36:18 +00:00
Jamal Kaabi-Mofrad
10d9b76ddb Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
120059 jvonka: FileFolder API - NodeApiTest - add tests (+ve & -ve) to update node information
   RA-639


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126378 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:35:31 +00:00
Jamal Kaabi-Mofrad
e8f94dbdaa Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119921 jkaabimofrad: Finished the requirements in RA-637. Added nodeType form data, the client provided content-type will be used if it is not null, and also support for model properties in the form data.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126376 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:35:00 +00:00
Jamal Kaabi-Mofrad
744ca56709 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119858 jvonka: RA-632: REST fwk - minor tweak to be consistent with existing exception handling


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:34:36 +00:00
Jamal Kaabi-Mofrad
3c2e33ec20 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119857 jvonka: FileFolder API - optimise check when getting 'type' of node (whether folder or file, or a link to thereof)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:34:27 +00:00
Jamal Kaabi-Mofrad
ee8bc09fd3 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119840 jvonka: FileFolder API - update NodeApiTest (testCreateFolder & testCreateEmptyFile)
   - follow pre-existing "expected" api test pattern


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126373 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:34:20 +00:00
Jamal Kaabi-Mofrad
7212f0eec6 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119837 jvonka: FileFolder API - fix build (BCK) & api tests
   - as agreed, for now split test client api models from server-side impl
   - rename existing Node/Document/Folder to FavouriteNode/Document/Folder (for backwards compat')


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126372 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:34:09 +00:00
Jamal Kaabi-Mofrad
8d2ab43524 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119810 jvonka: FileFolder API - fix TestFavourites fallout (due to unexpected id:null -> NPE) after adding some NodeApiTests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126371 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:33:49 +00:00
Jamal Kaabi-Mofrad
945ccb724b Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119801 jkaabimofrad: RA-637: Added autoRename form data for the multipart upload, so, on name clash, the API will try to auto­rename the file with an integer counter.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126370 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:33:36 +00:00
Jamal Kaabi-Mofrad
01777c4bd3 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119798 jvonka: FileFolder API - NodeApiTest - add tests (+ve & -ve) to create empty file node
   - TODO subsequently show that file content can be updated
   RA-636


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126369 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:33:27 +00:00
Jamal Kaabi-Mofrad
cc94c78812 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119796 jvonka: FileFolder API - NodeApiTest - add tests (+ve & -ve) for create folder
   RA-635


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126368 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:33:16 +00:00
Jamal Kaabi-Mofrad
981f35301b Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119790 jvonka: FileFolder API - NodeApiTest - add test for delete node
   RA-642


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126367 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:33:06 +00:00
Jamal Kaabi-Mofrad
d1dbf339ba Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119787 jvonka: FileFolder API - handle file/folder link & also prevent create/upload of unknown (~residual) props
   RA-638, RA-639 (and related)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126366 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:33:00 +00:00
Jamal Kaabi-Mofrad
04239107de Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119775 jkaabimofrad: RA-635: Fixed Resource API fwk, where a resource is used to create a node via both JSON and multipart/form-data.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126365 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:32:47 +00:00
Jamal Kaabi-Mofrad
84f812c5c2 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119730 jvonka: FileFolder API - NodeApiTest - fix check for path elements (null unless selected)
   -RA-638


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:31:42 +00:00
Jamal Kaabi-Mofrad
f082c56625 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119716 jvonka: FileFolder API - handle "select", eg. get node info, list folder children
   - list folder children returns minimal info, select can be used to get additional info, eg. aspectNames, properties (or specific props)
   - get node info returns basic info, select can be used to get additional info, eg. path
   - RA-634, RA-638


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:31:29 +00:00
Jamal Kaabi-Mofrad
9ebac42f97 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119711 jvonka: FileFolder API - consistently handle node aspects &/or properties  (on create or update)
   - also allow specialise node type (when updating a node)
   - minor tweaks to javadoc/comments
   - RA-635, RA-636, RA-639


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126360 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:31:13 +00:00
Jamal Kaabi-Mofrad
5c854fc227 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119631 jvonka: RA-639: FileFolder API - update node info (metadata) - add &/or remove aspects
   - TODO add tests (across the board)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:30:44 +00:00
Jamal Kaabi-Mofrad
0b75a49b73 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/HEAD/root@126358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:30:30 +00:00
Jamal Kaabi-Mofrad
840c1ba969 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119504 jkaabimofrad: RA-637, SFS-260: Added multipart upload REST API.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126357 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:30:20 +00:00
Jamal Kaabi-Mofrad
648bfcbdf6 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119442 jvonka: RA-634 / RA-638 : FileFolder API - update handling of "select" as per design notes
   - return all properties, if "select=properties" or no select (unless listing children => minimal info)
   - also handle "select=properties/my:prop" (note: temporarily my_prop pending RA-630)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126356 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:30:04 +00:00
Jamal Kaabi-Mofrad
659cebdf21 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/HEAD/root@126355 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:29:51 +00:00
Jamal Kaabi-Mofrad
12905ba100 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
119021 jkaabimofrad: Fixed test failure .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126354 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:29:34 +00:00
Jamal Kaabi-Mofrad
02792acca3 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
118880 jkaabimofrad: Fixed test failure .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126353 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:28:42 +00:00
Jamal Kaabi-Mofrad
4b3891ce2c Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
118861 jkaabimofrad: Added NodeApiTest to test suit.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126352 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:28:23 +00:00
Jamal Kaabi-Mofrad
d8eb979be3 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/HEAD/root@126351 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:27:38 +00:00
Jamal Kaabi-Mofrad
09eac586f6 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 
118728 jvonka: RA-613 / RA-655
   - fix for TestFavourites failure (+ related backwards compat' for Favorites API response format)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126350 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:26:50 +00:00
Jamal Kaabi-Mofrad
17012b17b6 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/HEAD/root@126349 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:26:33 +00:00
Jamal Kaabi-Mofrad
4810279cb7 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/HEAD/root@126348 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:26:10 +00:00
Alan Davis
095b910fd1 Merged 5.2.N (5.2.1) to HEAD (5.2) 
125686: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125578 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125558 ltuca: MNT-16163 : Custom Type - ... in Description
   124858: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124799 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124794 adavis: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124785 adavis: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
               124784 adavis: Merged V4.1.10 (4.1.10.10) to V4.1-BUG-FIX (4.1.11)
                  124775 cturlica: MNT-15921: CLONE - 4.1.10: invite and other emails
   124817: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124814 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         << Similar change required in nb, pt_BR, ru, zh_CN files that don't exist in 5.0.N >> 
         124691 amukha: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124688 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
               124686 amukha: Merged 5.0.2-CLOUD42 (Cloud ) to V4.1-BUG-FIX (4.1.11)
                  124681 cturlica: MNT-15919: into invite and other emails
                     - on premise email template changes part III,
   124697: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124693 amukha: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124691 amukha: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124688 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
               124686 amukha: Merged 5.0.2-CLOUD42 (Cloud ) to V4.1-BUG-FIX (4.1.11)
                  124681 cturlica: MNT-15919: into invite and other emails
                     - on premise email template changes part III,
   124634: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124625 amukha: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124619 amukha: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124611 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
               124609 amukha: Merged V4.1.10 (4.1.10.10) to V4.1-BUG-FIX (4.1.11)
                  124606 amukha: MNT-15921: Merged 5.0.2-CLOUD42 (Cloud ) to V4.1.10 (4.1.10.10)
                     124594 cturlica: MNT-15919: into invite and other emails
                        - on premise email template changes part II,
   124633: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124624 amukha: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124618 amukha: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124610 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
               124608 amukha: Merged V4.1.10 (4.1.10.10) to V4.1-BUG-FIX (4.1.11)
                  124605 amukha: MNT-15921: Merged 5.0.2-CLOUD42 (Cloud ) to V4.1.10 (4.1.10.10)
                     124567 cturlica: MNT-15919: into invite and other emails
                        - on premise email template changes,
   124367: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124349 adavis: Merged 5.1.0-CLOUD43 (Cloud ) to 5.1.N (5.1.2)
         123596 skopf: ACE-2540
   - commits without changes: 123860,123908,124221,124223,124227,124279,124366,
     124368,124479,124522,124531,124700,124855,124857,124859,124873,124957,
     124961-124962,125057,125154,125234,125236,125325,125348,125389,125519-125520,
     125590,125685,125687-125688


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@125701 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-22 13:45:13 +00:00
Alan Davis
7a8ad6e632 Merged 5.1.N (5.1.1) to HEAD (5.2) 
123429 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      123347 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123049 rmunteanu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122966 rneamtu: MNT-15679: Delete comment updates the "Modifier" and "Modified date" properties of a file
               - Fixed compilation error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-11 22:34:47 +00:00
Alan Davis
d62ac8b95a Merged 5.1.N (5.1.1) to HEAD (5.2) 
123428 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      123346 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123048 rmunteanu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122964 rneamtu: MNT-15679: Delete comment updates the "Modifier" and "Modified date" properties of a file
               - Fixed failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123703 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-11 22:34:39 +00:00
Alan Davis
6da9f1acc7 Merged 5.1.N (5.1.1) to HEAD (5.2) 
123426 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      123344 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123045 rmunteanu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122858 rneamtu: MNT-15679: Delete comment updates the "Modifier" and "Modified date" properties of a file
               - Java-backed webscript CommentDelete added
               - Auditable behavior is disabled around deleting comment-node
               - Added unit test for case: CommentsApiTest.testDeleteCommentDoesNotChangeModifiedDate


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123701 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-11 22:34:24 +00:00
Alan Davis
b11b750d29 Merged 5.1.N (5.1.1) to HEAD (5.2) 
122555 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122499 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122438 rneamtu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122396 amorarasu: MNT-13739: Site consumers are able to lock documents (they did not create) via WebDAV
               - Fixed failing tests + added a test for moving locked nodes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123677 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-11 22:31:16 +00:00
Alan Davis
26b47e74dd Merged 5.1.N (5.1.1) to HEAD (5.2) 
122553 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122494 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122434 rneamtu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122333 amorarasu: Merged DEV to V4.2.6 (4.2.6)
               121922 122190 122271 122292 amorarasu: MNT-13739: Site consumers are able to lock documents (they did not create) via WebDAV
                  - Went back to using the secured lock service
                  - Unlock resource after MOVE only if the it was locked


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123676 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-11 22:31:09 +00:00
Alan Davis
7bcccda334 Merged 5.1.N (5.1.1) to HEAD (5.2) 
122427 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      122412 nsmintanca: MNT-15642 CLONE - Request to join a moderated site multiple times
         -added validation on backend to prevent multiple requests for joining a site
         -updated unit tests
         -added widget to display "Cancel request" button


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-11 22:25:47 +00:00