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,311 Commits 325 Branches 2,188 Tags
976b860eff6738455cdf1809c01fcb0d8be0c85c
Commit Graph

635 Commits

Author SHA1 Message Date
Alan Davis
976b860eff Merged 5.2.N (5.2.1) to HEAD (5.2) 
130503 gjames: SEARCH-114: Switching to use limit, missed test commit


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:10:27 +00:00
Alan Davis
5abba74783 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130488 amukha: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      130484 amukha: Merged 5.0.N (5.0.5) to 5.1.N (5.1.2)
         130477 amukha: MNT-16755: LDAP users are not found for users without First Name or Last Name
            - Added JUnit tests.
            - Updated authorised-users to latest version.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132131 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-11-03 13:09:33 +00:00
Kevin Roast
e511f5a13c Merged 5.2.N (5.2.1) to HEAD (5.2) 
130451 jkaabimofrad: SHA-1598: Minor tweaks of parsing of the property parameter based on GavinC review.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130936 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-27 13:58:55 +00:00
Kevin Roast
a8edbc04e1 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130404 jkaabimofrad: SHA-1598: Added support to Get Task Instances API to filter result, based on the given property.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-27 13:57:46 +00:00
Ancuta Morarasu
fea7f077e4 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130400 amorarasu: REPO-1164: 422 error when executing unlock on a node that is not locked


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130419 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-07 16:05:41 +00:00
Alan Davis
7372dd7205 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130309 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130161 gjames: SEARCH-162: Implement a "fields" json parameter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130380 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:12:07 +00:00
Alan Davis
9afb1ec1b0 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130307 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130151 gjames: SEARCH-124: Implementing "limits" search api param


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130379 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:11:58 +00:00
Alan Davis
0a37f5da26 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130306 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130147 gjames: SEARCH-121: Implementing facet fields


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130378 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:11:48 +00:00
Alan Davis
16e360f955 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130305 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130146 gjames: SEARCH-121: Implementing facet fields


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130377 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:11:38 +00:00
Alan Davis
9e76348016 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130304 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130145 gjames: SEARCH-123: Implementing scope for queries


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130376 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:11:29 +00:00
Alan Davis
5ce39aad3f Merged 5.2.N (5.2.1) to HEAD (5.2) 
130303 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130109 gjames: SEARCH-122: Implementing spellcheck queries, better tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:11:20 +00:00
Alan Davis
e45ac5b61c Merged 5.2.N (5.2.1) to HEAD (5.2) 
130302 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130108 gjames: SEARCH-122: Implementing spellcheck queries, better tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:11:11 +00:00
Alan Davis
68dcb5c29c Merged 5.2.N (5.2.1) to HEAD (5.2) 
130301 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130107 gjames: SEARCH-122: Implementing spellcheck queries


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130373 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:11:03 +00:00
Alan Davis
1e048180e9 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130300 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130061 gjames: SEARCH-120: Facet queries label support


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130372 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:10:53 +00:00
Alan Davis
818b3b3c18 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130299 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130052 gjames: SEARCH-161: Removed support for synonyms on SORT fieldNames


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130371 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:10:43 +00:00
Alan Davis
5c7fe2d39b Merged 5.2.N (5.2.1) to HEAD (5.2) 
130298 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130051 gjames: SEARCH-159: Don't allow sort for cmis_alfresco language


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130370 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:10:34 +00:00
Alan Davis
b10f889f29 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130297 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130050 gjames: SEARCH-161: Supporting synonyms for sorting fieldNames


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130369 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:10:26 +00:00
Alan Davis
63e06293bb Merged 5.2.N (5.2.1) to HEAD (5.2) 
130295 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130039 gjames: SEARCH-159: Don't allow sort for cmis language


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130367 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:10:08 +00:00
Alan Davis
be1ae9146e Merged 5.2.N (5.2.1) to HEAD (5.2) 
130294 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130038 gjames: SEARCH-158: Limit results by a final size of 100


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130366 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:09:59 +00:00
Alan Davis
b67a546851 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130293 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130037 gjames: SEARCH-120: Working on facet queries test improvements


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130365 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:09:50 +00:00
Alan Davis
4c3bd67a52 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130292 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130031 gjames: SEARCH-120: Working on facet queries test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130364 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:09:42 +00:00
Alan Davis
bdca31ff6a Merged 5.2.N (5.2.1) to HEAD (5.2) 
130289 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130028 gjames: SEARCH-120: Moving SearchContext and facets to its own package


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:09:16 +00:00
Alan Davis
c80a95d755 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130288 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130027 gjames: SEARCH-120: Implementing facet queries


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130360 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:09:06 +00:00
Alan Davis
a699adbe2f Merged 5.2.N (5.2.1) to HEAD (5.2) 
130287 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130026 gjames: SEARCH-119: Implementing filter queries (without tags)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:08:57 +00:00
Alan Davis
1b2b4b9093 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130267 gjames: 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/HEAD/root@130346 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:07:02 +00:00
Alan Davis
51b838e2ef Merged 5.2.N (5.2.1) to HEAD (5.2) 
130261 gjames: 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/HEAD/root@130344 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:06:41 +00:00
Alan Davis
4ab6e72418 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130191 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129957 gjames: SEARCH-113: Testing a NULL node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130342 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:06:25 +00:00
Alan Davis
aeb8af8c94 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130190 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129956 gjames: SEARCH-115: Testing sort of DOCUMENT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130341 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:06:16 +00:00
Alan Davis
b8802af7f4 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130187 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129890 gjames: SEARCH-116: Implementing defaults


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130338 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:05:50 +00:00
Alan Davis
a4d3b2e60c Merged 5.2.N (5.2.1) to HEAD (5.2) 
130186 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129839 gjames: Adding a better json example to the integration test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130337 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:05:40 +00:00
Alan Davis
3db8c1b295 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130185 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129838 gjames: SEARCH-117: Implementing templates


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130336 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:05:32 +00:00
Alan Davis
5d442553f5 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130184 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129824 gjames: SEARCH-115: Implementing Sort


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130335 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:05:22 +00:00
Alan Davis
e8e0209f8c Merged 5.2.N (5.2.1) to HEAD (5.2) 
130181 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129821 gjames: SEARCH-150: Implementing include in the JSON body


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130332 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:04:51 +00:00
Alan Davis
7e95472e8c Merged 5.2.N (5.2.1) to HEAD (5.2) 
130180 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129820 gjames: SEARCH-113: The JSON body not request is used for all params


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130331 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:04:42 +00:00
Alan Davis
e9783d8e04 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130179 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129819 gjames: SEARCH-113: The Json representation is immutable.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130330 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:04:33 +00:00
Alan Davis
a0a62612f4 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130178 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129808 gjames: SEARCH-112: Adding SearchContext to the response


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130329 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:04:24 +00:00
Alan Davis
9c8da6ba7c Merged 5.2.N (5.2.1) to HEAD (5.2) 
130177 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129807 gjames: SEARCH-113: No longer hedging my bets: The only way to pass parameter is via the JSON body.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130328 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:04:14 +00:00
Alan Davis
f78d1f81f7 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130176 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129787 gjames: SEARCH-114: No default paging.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130327 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:04:05 +00:00
Alan Davis
7755241834 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130175 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129786 gjames: SEARCH-113: Adding client object for SearchEntry


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:03:55 +00:00
Alan Davis
02d1385296 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130173 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129783 gjames: fixup! SEARCH-113: License header


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:03:37 +00:00
Alan Davis
898757661e Merged 5.2.N (5.2.1) to HEAD (5.2) 
130172 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129780 gjames: SEARCH-114: Adding paging support


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130323 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:03:28 +00:00
Alan Davis
e118a4940e Merged 5.2.N (5.2.1) to HEAD (5.2) 
130171 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129779 gjames: SEARCH-118: Adding search.score to node response


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130322 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:03:18 +00:00
Alan Davis
043a158c80 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130169 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129778 gjames: SEARCH-113: Initial implementation of the Search public API


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130321 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:03:09 +00:00
Alan Davis
f1905cd23a Merged 5.2.N (5.2.1) to HEAD (5.2) 
130166 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129775 gjames: Updated the auto-generated headers using mvn license:update-file-header


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130318 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:02:42 +00:00
Alan Davis
c6dda1e7fa Merged 5.2.N (5.2.1) to HEAD (5.2) 
130165 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129774 gjames: SEARCH-113: Moving more api logic to helper classes, using a "trait" style


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130317 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 22:02:33 +00:00
Alan Davis
76e33da7f5 Merged 5.2.N (5.2.1) to HEAD (5.2) 
130046 jvonka: REPO-1187 / REPO-164: V1 REST API to "lock content node" - initially, we will support one of two lock types, either ALLOW_OWNER_CHANGES (default, if not requested otherwise) or FULL
   - we will not support ALLOW_ADD_CHILDREN lock type (removed as part of this change request)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:45:36 +00:00
Alan Davis
dd8adcbd2f Merged 5.2.N (5.2.1) to HEAD (5.2) 
129897 mmuller: Restrict lock method to content types. REPO-1158


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130239 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:44:50 +00:00
Alan Davis
772d2ffd57 Merged 5.2.N (5.2.1) to HEAD (5.2) 
129893 jvonka: REPO-1090: fix regress (V1 REST API - list children within the context of a smart folder)
   - follow-on (re: NodeApiTest.getChildrenAssocType fallout - when returning any assoc, not just cm:contains)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130238 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:44:39 +00:00
Alan Davis
a98859b185 Merged 5.2.N (5.2.1) to HEAD (5.2) 
129892 amorarasu: REPO-1155 / REPO-160 / REPO-340: Remove "includeChildren" option for Lock / Unlock in the rest api (REPO-1163)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:44:30 +00:00
Alan Davis
ca6e13d532 Merged 5.2.N (5.2.1) to HEAD (5.2) 
129826 jvonka: REPO-164 / REPO-1150: fix minor regress (eg. if recursively locking nodes via includeChildren)
   -  MNT-16446, MNT-14945


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:43:54 +00:00