Commit Graph

7 Commits

Author SHA1 Message Date
Alan Davis
4a18a13f7b Merged HEAD (5.2) to 5.2.N (5.2.1)
127619 jkaabimofrad: Missed changes during resolving conflicts.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:19:40 +00:00
Alan Davis
6234640d11 Merged HEAD (5.2) to 5.2.N (5.2.1)
127583 jkaabimofrad: reverted r126691.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127676 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 14:15:04 +00:00
Alan Davis
e0341bbabd Merged HEAD (5.2) to 5.2.N (5.2.1)
127582 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      126691 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to API-STRIKES-BACK (5.2.0)
         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@127675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 14:14:58 +00:00
Ramona Neamtu
a6b71fb280 Update source headers - add new Copyrights for new Java files synced from Head (part 4).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127000 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 14:39:44 +00:00
Ancuta Morarasu
1813923c76 Merged HEAD (5.2) to 5.2.N (5.2.1)
126690 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      126664 jkaabimofrad: RA-1045: Removed unused imports.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126990 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:58:36 +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
89c224d811 Merged HEAD (5.2) to 5.2.N (5.2.1)
126512 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122825 jvonka: (Quick) Shared Links API - add missing file, oops.
      RA-830


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126856 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:48:00 +00:00