Alexandra Leahu
0817d77475
Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
...
127454 jkaabimofrad: MNT-16224, RA-1093: Fixed Quickshare issue where deleting a shared node didn't remove the 'shared' aspect. The fix also takes care of the shared nodes that have been deleted but not yet restored, as well as, shared nodes that have already been restored from the trashcan (allow the user to un-share).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127465 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-01 13:26:30 +00:00
Raluca Munteanu
94215263cf
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
127316 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
127312 jkaabimofrad: SFS-577, SFS-581: Fixed the shared-link no-auth APIs issue with multi-tenancy.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127385 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-24 14:59:05 +00:00
Andrei Rebegea
337f5bc8a3
Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
...
127218 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
127187 cturlica: MNT-15630: CLONE - people rest api does not accept the skipCount param
- merged initial solution with some changes required for 5.0.N, because the people web script was split in people.get.js and people-enterprise.get.js
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-19 14:54:32 +00:00
Jamal Kaabi-Mofrad
36b2e9782f
ACE-5340: Fixed test failures in TestCustomConstraint class as a result of switching to Java 8. The test class depends on "org.apache.commons.lang3.builder.EqualsBuilder.reflectionEquals", but somehow didn't behave in Java 8.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127228 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-18 18:59:32 +00:00
Ancuta Morarasu
bb0598991a
Update source headers - add new Copyrights for new Java files synced from Head (part 3).
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126998 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 14:24:54 +00:00
Ancuta Morarasu
742a76a7c7
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126689 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
126661 jvonka: RA-1045: As requested for SFS, allow rendition details (available/created renditions only) for shared link to be listed via no auth.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126989 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:57:39 +00:00
Ancuta Morarasu
8aacfd1b1f
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126636 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
126201 jkaabimofrad: SFS-558: Added test for the move/copy between sites.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126987 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:41:41 +00:00
Ancuta Morarasu
4383e6017b
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126635 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
126115 jvonka: RA-1028: Fix copy bug - if same parent & name (ie. nothing copied) then return 409 rather than 201
- see also SFS-554
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:41:31 +00:00
Ancuta Morarasu
ee3feed2ad
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126619 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
125356 gjames: RA-917 Success code for restore operation should be 200
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126964 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:32:51 +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
287f92d3ff
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126616 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
125219 jkaabimofrad: Fixed minor formatting issue in the toString methods. Also, removed unused imports.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126961 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:32:24 +00:00
Ancuta Morarasu
bdee9963af
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126610 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
125122 jkaabimofrad: RA-884: Fixed minor code standards issues.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126955 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:31:31 +00:00
Ancuta Morarasu
31766e2d9e
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126609 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
125121 gjames: RA-675: Fixed the descriptionURL in error response
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126954 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:20:33 +00:00
Ancuta Morarasu
366ed0fce0
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126608 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
125032 jvonka: RA-767: Queries API - bug fixes (and updated tests)
- optional rootNodeId should allow well-known aliases (-root-,-my-,-shared-)
- investigate and 'fix' apparent underlying issue with '.' which causes 500 in FTS query parser, eg. abc.txt
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126953 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:20:23 +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
5fdb72ede0
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126605 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124992 gjames: RA-847, RA-848: Showing orignal parent path but not parentid
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:19:38 +00:00
Ancuta Morarasu
8a87a94931
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126603 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124973 gjames: RA-847: formatting changes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:15:28 +00:00
Ancuta Morarasu
f8d4813192
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126600 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124911 jvonka: RA-767: Queries API - additional tests & fixes (re: tag hits & also optional "include" info in results)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:15:00 +00:00
Ancuta Morarasu
cb22f40e35
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126599 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124903 gjames: RA-850 Purge Deleted Node
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126944 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:14:50 +00:00
Ancuta Morarasu
c0a435be1a
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126598 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124844 jvonka: RA-767: Queries API - optionally restrict by nodeType
- also added tests (+ve/-ve)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126943 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:14:41 +00:00
Ancuta Morarasu
a9423c607a
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126597 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124840 gjames: RA-847, RA-848 Adding the tests to the suite
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126942 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:14:32 +00:00
Ancuta Morarasu
4dd8604cb8
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126596 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124839 gjames: RA-848: Adding a permissions check test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126941 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:14:23 +00:00
Ancuta Morarasu
5010012a1e
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126592 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124825 gjames: RA-849: Restore Deleted Node
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126937 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:13:48 +00:00
Ancuta Morarasu
3d51ad151c
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126591 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124824 gjames: RA-847, RA-848 Retrieving deleted nodes as Admin
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126936 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:13:39 +00:00
Ancuta Morarasu
6e66fbc924
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126590 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124822 jkaabimofrad: RA-889: Fixed test failure as the result of my r124813 commit.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:13:30 +00:00
Ancuta Morarasu
c7678ccd65
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126589 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124819 jvonka: RA-896 - List Node Children filtering - additional fixes & tests, when filtering by isFile &/or isFolder
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:13:21 +00:00
Ancuta Morarasu
e4beb318b7
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126588 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124813 jkaabimofrad: RA-889: Changed multipart field's name from "filename" to "name".
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126933 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:13:13 +00:00
Ancuta Morarasu
e9dbbc1cd0
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126587 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124793 jkaabimofrad: Fixed API tests failures, after synced HEAD to FILE-FOLDER-API.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126932 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:13:04 +00:00
Ancuta Morarasu
5ab0af68ad
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126586 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124792 jvonka: RA-767: Queries API - min 3 alphanumeric chars in search 'term' (pending requirement review)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:12:55 +00:00
Ancuta Morarasu
07d78c71c6
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126585 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124763 jkaabimofrad: Fixed build failure.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126930 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:12:46 +00:00
Ancuta Morarasu
3802003bd7
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126583 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124754 jvonka: RA-773: SharedLinkApiTest - bring back test - for now create "doclib" rendition for pdf
- not sure why build m/c fails to create "doclib" rendition for txt
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126928 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:12:30 +00:00
Ancuta Morarasu
95affed365
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126581 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124740 gjames: RA-847, RA-848 Retrieving deleted nodes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126926 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:12:13 +00:00
Ancuta Morarasu
9d3444eee3
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126579 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124732 jvonka: RA-773: SharedLinkApiTest - temporarily comment-out test (apparently rendition is not created on build m/c)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126924 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:11:54 +00:00
Ancuta Morarasu
b3d2375271
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126578 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124729 jvonka: RA-773: Try bumping retry count for async rendition creation on build m/c (SharedLinkApiTest)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:11:45 +00:00
Ancuta Morarasu
8570181ea2
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126577 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124721 jvonka: RA-773, RA-767: Oops - add test to suite (so that they're run as part of the build)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:11:34 +00:00
Ancuta Morarasu
c0036b0f85
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126576 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124677 jvonka: RA-767: Queries API - "live-search-nodes" - add orderBy options (& more tests)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126921 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:11:26 +00:00
Ancuta Morarasu
e1322a88ae
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126573 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124623 jkaabimofrad: SFS-405, RA-778: Added tests and as the result did some minor modifications. Also, removed the ability to set or remove a client via JMX (Read only).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:11:01 +00:00
Ancuta Morarasu
fb4bf104af
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126572 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124603 jvonka: RA-767: Queries API - 1st cut for "live-search-nodes" (wip)
- initial commit with basic support for 'term' (and optional 'rootNodeId' &/or 'nodeType')
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:10:48 +00:00
Ancuta Morarasu
ff84789b99
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126571 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124586 gjames: RA-884: Moved ActivitiesPostingTest up the APITest suite to avoid a permissions error
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126916 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:10:39 +00:00
Ancuta Morarasu
e5ca888f6a
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126570 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124580 gjames: RA-884: Adding ActivitiesPostingTest to the APITest suite
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:10:30 +00:00
Ancuta Morarasu
ef82a92254
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126569 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124565 gjames: RA-884: Posting DOWNLOAD activities in a new (non-readonly) transaction
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:10:20 +00:00
Ancuta Morarasu
b2a48bde95
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126568 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124564 gjames: RA-884: Added non-file activity tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:10:11 +00:00
Ancuta Morarasu
8031ad0aa3
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126566 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124563 gjames: RA-884: Posting activities for file/folder deleted
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126912 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:10:02 +00:00
Ancuta Morarasu
490e2345da
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126565 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124562 gjames: RA-884: Posting activities for file/folder added/updated
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126911 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:09:51 +00:00
Ancuta Morarasu
587a169e0e
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126564 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124548 jvonka: RA-834, RA-678: create "renditions" request only applicable when creating/uploading file via multipart/form-data (not when creating empty file via json request)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126910 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:09:42 +00:00
Ancuta Morarasu
87bc714cfc
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126563 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124538 jvonka: RA-896: Nodes API - fix list children filter
- return all results if no filter specified
- return 400 if both isFile and isFolder are true, or nodeType is specified along with isFile or isFolder
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126909 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:09:33 +00:00
Ancuta Morarasu
b6453a149c
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126562 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124337 jvonka: RA-834, RA-678: Optionally request generation of a rendition on content creation (eg. file upload)
- for some reason works locally but not on build machine
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126908 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:09:24 +00:00
Ancuta Morarasu
c6c6de6783
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126561 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124331 jvonka: RA-834, RA-678: Optionally request generation of a rendition on content creation (eg. file upload)
- one more attempt (works locally, but for some reason is failing on build machines)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126907 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:09:14 +00:00
Ancuta Morarasu
5a6fe335dc
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126560 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124327 jvonka: RA-834, RA-678: Optionally request generation of a rendition on content creation (eg. file upload)
- add/fix missing test file
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126906 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:09:04 +00:00
Ancuta Morarasu
5c719b8f02
Merged HEAD (5.2) to 5.2.N (5.2.1)
...
126559 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124300 jvonka: RA-834, RA-678: Optionally request generation of a rendition on content creation (eg. file upload)
- more test tweaks
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126905 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:08:53 +00:00