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
4,186 Commits 325 Branches 2,188 Tags
d774d1b957cc73a9ed034bc8c42d03a0e025930d
Commit Graph

1978 Commits

Author SHA1 Message Date
Gethin James
e6549ed9a0 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/BRANCHES/DEV/5.2.N/root@130184 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:19:28 +00:00
Gethin James
d5c3d3c1ca Merged searchapi (5.2.1) to 5.2.N (5.2.1) 
129823 gjames: SEARCH-113: Clearer default parameters


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130183 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:19:20 +00:00
Gethin James
775ba1d947 Merged searchapi (5.2.1) to 5.2.N (5.2.1) 
129822 gjames: SEARCH-150: Adding Association


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130182 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:19:14 +00:00
Gethin James
d1d0c6436b 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/BRANCHES/DEV/5.2.N/root@130181 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:19:08 +00:00
Gethin James
c2953c739c 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/BRANCHES/DEV/5.2.N/root@130180 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:19:01 +00:00
Gethin James
347aedfa1b 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/BRANCHES/DEV/5.2.N/root@130179 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:18:54 +00:00
Gethin James
f3cb1c224d 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/BRANCHES/DEV/5.2.N/root@130178 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:18:46 +00:00
Gethin James
e1bd68c17c 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/BRANCHES/DEV/5.2.N/root@130177 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:18:40 +00:00
Gethin James
43bf3e848c 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/BRANCHES/DEV/5.2.N/root@130176 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:18:33 +00:00
Gethin James
0d109f4f06 Merged searchapi (5.2.1) to 5.2.N (5.2.1) 
129785 gjames: SEARCH-114: Adding skipcount to hasMoreItems.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130174 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:18:20 +00:00
Gethin James
f3d864f410 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/BRANCHES/DEV/5.2.N/root@130173 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:18:13 +00:00
Gethin James
fbebd84cd4 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/BRANCHES/DEV/5.2.N/root@130172 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:18:04 +00:00
Gethin James
67c21ad600 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/BRANCHES/DEV/5.2.N/root@130171 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:17:56 +00:00
Gethin James
b18f433fca 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/BRANCHES/DEV/5.2.N/root@130169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:15:02 +00:00
Gethin James
f60bdb5914 Merged searchapi (5.2.1) to 5.2.N (5.2.1) 
129777 gjames: Reformatted to Alfresco standards


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:14:52 +00:00
Gethin James
b2a6ad44ef Merged searchapi (5.2.1) to 5.2.N (5.2.1) 
129776 gjames: SEARCH-113: Adding a default success response


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:14:45 +00:00
Gethin James
c12508fb75 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/BRANCHES/DEV/5.2.N/root@130166 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:14:38 +00:00
Gethin James
bfd32ef859 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/BRANCHES/DEV/5.2.N/root@130165 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-06 14:14:29 +00:00
Jamal Kaabi-Mofrad
ff2ce9d706 Merged 5.2.0-CLOUD44 (Cloud ) to 5.2.N (5.2.1) 
129940 jkaabimofrad: SFS-610: A fix for the V1 node API where listing children and including certain properties returned 403 in the Cloud context, when the owner is "admin@alfresco.com".


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130094 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-02 15:56:05 +00:00
Jan Vonka
30a211d262 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/BRANCHES/DEV/5.2.N/root@130046 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-09-01 10:35:46 +00:00
Martin Muller
ed67760ab4 Restrict lock method to content types. REPO-1158 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-26 09:15:52 +00:00
Jan Vonka
25988a8efb 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/BRANCHES/DEV/5.2.N/root@129893 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-25 17:02:31 +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
Jan Vonka
78ed7e9c2d REPO-1090: fix regress (V1 REST API - list children within the context of a smart folder) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-25 12:14:41 +00:00
Kevin Roast
0c779ff00b Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
129680 kroast: Merged 5.0.N (5.0.5) to 5.1.N (5.1.2) (PARTIAL MERGE)
      129458 cpopa: Merged 5.0.2 (5.0.2.24) to 5.0.N (5.0.4)
         129454 cpopa: MNT-15376 : NTLM authentication sometimes fails with IE10+ (chrome OK) - concurrent socket threads   
            - Synchronize the processing of Type1 and Type3 messages on the same session.
            - Synchronize safely by using WebUtils.getSessionMutex(session) than the session object directly
            - Reuse the previously cached Type2Message in the Share SSOAuthenticationFilter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129874 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-25 10:37:45 +00:00
Ancuta Morarasu
b04cef45d1 REPO-340 / REPO-1136 - V1 REST API: Unlock Node 
- Removed the allowCheckedOut option from the unlock body

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129804 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-23 20:24:18 +00:00
Ancuta Morarasu
d53ac5135a REPO-340 / REPO-1136 - V1 REST API: Unlock Node 
- Unlock with includeChildren=true - fixed + testcases

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129791 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-23 11:34:52 +00:00
Jan Vonka
650554b62c REPO-164 / REPO-1141: fix error mapping when unable to update content due to locked node (should be 409 not 500) 
- also minor cleanup of error handling/mapping (handle within common "writeContent")

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-23 11:14:03 +00:00
Jan Vonka
940fa92b21 REPO-1144: LockService - add isLocked & isLockedAndReadOnly common helper methods to public API 
- remove duplicated code from various locations to use the new methods
- add sanity checks to Lock*Test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-22 14:20:52 +00:00
Ancuta Morarasu
ecec348d6c REPO-164 / REPO-1086 - V1 REST API: Lock Node 
- review suggestions
   - added more test cases + utility methods

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129751 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-22 13:10:19 +00:00
Martin Muller
c83c0521b2 Add a specific error message for invalid maxItem and skipCount. REPO-1061. (small optimation) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-22 09:51:05 +00:00
Martin Muller
30a8157a06 Add a specific error message for invalid maxItem and skipCount. REPO-1061. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129730 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-22 09:47:07 +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
Jan Vonka
0376e880d0 REPO-1138 / REPO-983: Add support for the isLocked property 
- can optionally "include" when getting node info, listing children, ...

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-19 16:22:09 +00:00
Martin Muller
e694fe4476 Add a specific error message for the maxItem=0. REPO-890 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129701 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-19 13:32:34 +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
de1ba8f23b Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
129597 mmuller: Merged 5.0.N (5.0.5) to 5.1.N (5.1.2) (PARTIAL MERGE)
      129593 mmuller: Merged 5.0.4 (5.0.4) to 5.0.N (5.0.5)
         129585 mmuller: Merged 5.0.3 (5.0.3.9) to 5.0.4 (5.0.4)
            129514 mmuller: MNT-16380, REPO-927, ESC-469 Regression fix from 4.2 --> 5.0. Can now use relative paths again.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129608 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-17 19:46:25 +00:00
Jelena Cule
943a9ea417 REPO-1023: Service Pack: MNT-16454 Can't use WebDAV to delete files which have the versionable aspect 
- check that node is is actually locked before unlocking to avoid access denied


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-14 18:06:06 +00:00
Alan Davis
c82cfb582c REPO-1069 Review live search sort order / sort type (sites and also people) 
- Removal of parameter sortType - we are going to be using the POST_QUERY_SORT
   - Removal of tests using IN_QUERY_SORT except for the one to do with the default sort.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 10:09:49 +00:00
Alan Davis
4b308b5cdc REPO-1079 Rename "Live Search" API endpoints 
- Changes to end points to reflect the rename of:
     /queries/live-search-nodes  to /queries/nodes
     /queries/live-search-people to /queries/people
     /queries/live-search-sites  to /queries/sites


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-09 09:33:20 +00:00
Kevin Roast
9122a9129f Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
129145 kroast: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      128659 cpopa: Merged 5.0.2 (5.0.2.22) to 5.0.N (5.0.4)
         128657 cpopa: MNT-15376 : NTLM authentication sometimes fails with IE10+ (chrome OK) - concurrent socket threads   
            - Reuse the previously created NTLM details cache when a type1 request is being reissued on the same session.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129220 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-08 11:20:34 +00:00
Kevin Roast
b8da5e77a8 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
128735 kroast: MNT-16510 - Chrome/Firefox Download action issue for document name without extension


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-08 11:16:59 +00:00
Martin Muller
fda06755c6 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
129059 adavis: REPO-243 People Live Search
      - Use id (in fields and orderBy) rather than userName as it is an id that is returned in the Person entity
      - Added tests to test id can be used in fields and orderBy
      - Added 'wildcard' tests created by Alexandru-Eusebiu Epure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:50:07 +00:00
Martin Muller
2b9173ee6a Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
129058 jvonka: V1 REST API: Sites Live Search (/queries/live-search-sites)
   - additional tweaks based on ADs review comments
   REPO-232, REPO-883


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129198 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:50:03 +00:00
Martin Muller
63bb6a86ef Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
129054 adavis: REPO-232,REPO-883 V1 REST API: Sites Live Search (/queries/live-search-sites)
      - Moved getSite() into the class that uses it.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:49:59 +00:00
Martin Muller
069da2af29 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
129052 adavis: REPO-232,REPO-883 V1 REST API: Sites Live Search (/queries/live-search-sites)
      - As part of code review: Added generics to listPage method and moved it inside AbstractQuery.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:49:53 +00:00
Martin Muller
33a3c91e99 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
129050 jvonka: V1 REST API: fix 500 (NPE) when trying to get a version (info or content) for a node that has no version history
   REPO-1051, REPO-327, REPO-229


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129194 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:49:42 +00:00
Martin Muller
9bc32208c7 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
129042 jvonka: V1 REST API: Sites Live Search (/queries/live-search-sites)
   - add experimental option (for review) to choose sort type
   - fix post query sort to use AlfrescoCollator rather than RuleBasedCollator (latter ignores spaces)
   - fix post query sort to apply paging correctly (get results first) - TODO add test
   REPO-232, REPO-882, REPO-883


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129193 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:49:39 +00:00
Martin Muller
267cdf9072 Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
129037 adavis: REPO-243 People Live Search
      - Added another orderBy test following a question from Jan.
      - Minor change in post order code to replace a Map lookup with a List lookup. Logically the same but faster.
      - Replaced a NPE test failure with a failure message if TEST_COUNT is too small


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:49:35 +00:00
Martin Muller
dd330266ed Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 
129017 adavis: REPO-243 People Live Search
      - Added additional tests
      - Removed check in Person constructor for no id as we want to be able to create a Person from json which might not have the id.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129190 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-08-05 13:49:27 +00:00