Commit Graph

5924 Commits

Author SHA1 Message Date
Ramona Neamtu
49f9e3d0e8 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128509 rneamtu: MNT-16488 : CLONE - Activities dashlet displays group indentifier instead of group name
      - Added activiti for add/remove group to the site with autorityDisplayName instead of authorityName


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128529 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-04 10:51:19 +00:00
Martin Muller
88818dca9a Fixed some javadoc errors. REPO-466
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128510 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-01 08:34:26 +00:00
Jan Vonka
fc5f03fc96 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128382 jvonka: MNT-16446: Edit Comment permission (part 3b) 
   - follow-on to fix test fallout
   - for CMIS (and future v1 Nodes REST)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-27 19:17:09 +00:00
Jan Vonka
ecd686b049 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128375 jvonka: MNT-16446: Edit Comment permission (part 3) 
   - for CMIS (and also future v1 Nodes REST API)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128386 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-27 19:08:30 +00:00
Alan Davis
127086afed Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128341 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      128260 adavis: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         128213 arebegea: MNT-16437 : CLONE - 4.2.N - 4.2.3 CMIS Bulk Update Properties only updates the properties of one document when more than one document is in the objectIdAndChangeTokens list
            Merged V4.2.3 (4.2.3.25) to V4.2-BUG-FIX (4.2.7)
               128177 arebegea: MNT-16376 : 4.2.3 CMIS Bulk Update Properties only updates the properties of one document when more than one document is in the objectIdAndChangeTokens list
                  - The batch worker threads did not have the thread context to know that they were dealing with CMIS version 1.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128360 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-27 07:05:21 +00:00
Alan Davis
07ff4b3d51 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128253 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      128241 adavis: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         128225 adavis: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
            128166 amorarasu: Merged V4.1.9 (4.1.9.16) to V4.1-BUG-FIX (4.1.11)
               128155 amorarasu: MNT-16316: GET /alfresco/service/api/groups API slow performance when the 'zone' filter is used.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128332 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-24 15:36:50 +00:00
Alan Davis
ecadec2d73 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128192 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      128165 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         128151 rneamtu: MNT-15855 : Restoring a site or a folder with a locked for offline edit file does not work
            - restored associations between working copy and original node after a parent node is deleted
            - added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-21 11:06:09 +00:00
Alan Davis
bf346dba70 MNT-16381 Transformers must validate the content stream mimetype
- Tika has problems identifying eps - it guesses ps, so allow this through.
   - Fix lost line in DifferrentMimeTypeTest

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128176 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-16 15:23:07 +00:00
Alan Davis
60a8b718bc MNT-16381 Transformers must validate the content stream mimetype
- Addition of AbstractContentTransformer2.strictMimeTypeCheck(...) to check that the
     declared mimetype is the same as the Tika derived mimetype. Controlled by a new alfresco
     global property content.transformer.strict.mimetype.check (set to true by default).
   - Added the UnsupportedTransformationException to a number of transformation callers as
     they should have been handling it already.
   - Modified DifferrentMimeTypeTest to test the new strictMimeTypeCheck.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-15 16:11:15 +00:00
Ramona Neamtu
c4c30abae0 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
128140 cpopa: MNT-14026: LDAP sync fails to update attribute's value deletion
      - Update to null, the node properties for which the corresponding LDAP attribute is missing.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128144 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-13 14:39:16 +00:00
Alan Davis
d4b7650088 Merged HEAD (5.2) to 5.2.N (5.2.1)
127898 adavis: Reverse Merge WITHOUT mergeinfo a commit that was merged to HEAD via API-STRIKES-BACK and 5.2.N!
      127890 Merged 5.2.N (5.2.1) to HEAD (5.2)
         127465 aleahu: 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).
      - ENDED UP WITH DUPLICATE CODE ALREADY MERGED BY:
         127615 Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
            127462 jkaabimofrad: Merged 5.1.N (5.1.2) to API-STRIKES-BACK (5.2.0)
               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@127900 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 11:13:37 +00:00
Alan Davis
29cc2d9ca8 Merged HEAD (5.2) to 5.2.N (5.2.1)
127615 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127462 jkaabimofrad: Merged 5.1.N (5.1.2) to API-STRIKES-BACK (5.2.0)
         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@127722 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:19:17 +00:00
Alan Davis
6a4c63b03d Merged HEAD (5.2) to 5.2.N (5.2.1)
127610 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127443 jvonka: Fix trivial typo
      - RA-1092


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127717 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:18:47 +00:00
Alan Davis
f0edad1199 Merged HEAD (5.2) to 5.2.N (5.2.1)
127605 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127418 jvonka: FileFolderService / GetChildrenCannedQuery - optional support for filtering by assocType(s)
      - eg. as required by new V1 REST API
      - RA-1053, RA-1092


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127712 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:18:16 +00:00
Alan Davis
7ef9bb67be Merged HEAD (5.2) to 5.2.N (5.2.1)
127594 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127283 jvonka: Permissions: tweak to add AssociationRef to ACLEntryAfterInvocationProvider
      - required for introduction of RA-1062


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127686 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 14:47:56 +00:00
Alan Davis
4621b16359 Merged HEAD (5.2) to 5.2.N (5.2.1)
127588 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127088 jvonka: FileFolderService / GetChildrenCannedQuery - optional support for filtering by isPrimary child assoc (true/false) 
      - eg. as required by new V1 REST API
      - RA-1053


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127680 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 14:16:11 +00:00
Alexandra Leahu
672949638f MNT-16224, RA-1093: Fixed compilation issue that occurred during merge (methods were already present in the 5.2.N branch)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-01 15:58:44 +00:00
Alexandra Leahu
f0ac5fd4e9 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
f36baf58d1 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127377 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127306 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         127272 arebegea: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
            127195 cpopa: MNT-14453 : Deleting tag using TaggingService.deleteTag() causes issue where no more tags can be added to node
               - Amended TaggingService.deleteTag() so as to remove references to a tag before being deleted. 
               - Added 'nodeService.exists(beforeNodeRef)' checks in TaggingService.updateTags in order to protect against InvalidNodeRefException which may be thrown on nodes that still have references to tags deleted using the  current(incorrect) implementation of TaggingService.deleteTag() 
               - Created DOCS-2060 in order document the manual procedure of tag scope refresh.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127399 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-25 14:41:02 +00:00
Raluca Munteanu
0d69fc8eb1 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127370 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      127309 aleahu: MNT-14332 : Alfresco stops working when Type Hierarchy creates a circular reference
         - added validation to check if circular dependency was introduced when a new namespace is imported


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-25 14:39:22 +00:00
Raluca Munteanu
b3dcbae981 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127307 cturlica: Merged 5.1.0 (5.1.0.6) to 5.1.N (5.1.2)
      127235 cturlica: MNT-16292: Unzipped files which have folders do not get the cm:titled aspect applied
         - updated ImporterActionExecuter to add titled aspect
         - added test case for change and refactored test class


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-24 14:36:04 +00:00
Cristian Turlica
0d69a6a3d7 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127263 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127236 dungureanu: MNT-15149 : Rule set with "Rule applied to subfolder" also applies to a comment node.
         - added fm:post into ignored types list
         - externalised list into the spring config 
         - created test for ignored types


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127288 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-20 13:17:33 +00:00
Cristian Turlica
7992f174cf Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127262 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127234 cpopa: MNT-16063 : Activiti workflows without userTask does not work
         - Prevent tasks retrieval from finished executions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127287 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-20 13:17:01 +00:00
Andrei Rebegea
0cd4e43ec5 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127217 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127179 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         127119 adragoi: MNT-16270 : Audit logger org.alfresco.repo.audit.inbound fails to log inbound auditable values
            - checked inboundLogger level value on areAuditValuesRequired() method


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-19 14:53:36 +00:00
Cristian Turlica
3cb8d094ef Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127134 cturlica: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127102 rmunteanu: MNT-15614 : Site with name "IT" cannot be managed properly
         - Changed the way the role name is striped out.
         - Implemented tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127160 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-17 14:13:46 +00:00
Cristian Turlica
b861424c72 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127078 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127046 amorarasu: MNT-16277: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         126884 amorarasu: MNT-15710: No invalid synchronizations should appear in the cloud sync manager (step 2 - clean invalid synchronizations already created).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127124 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-16 14:47:10 +00:00
Cristian Turlica
4d0939f110 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127075 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      127055 gjames: MNT-16259, MNT-16265. Adding a patch to cleanup the admin user default password.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-16 14:46:34 +00:00
Ancuta Morarasu
0ba905fa78 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
126675 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      126654 amukha: MNT-16272: User usages prevent some CMIS sessions from starting under load
         - Removed JobLock from RepoUsageComponent.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127010 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-12 08:41:13 +00:00
Ancuta Morarasu
b406f49bda Update source headers - add new Copyrights for new Java files synced from Head (fix for part 2).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126999 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 14:38:18 +00:00
Ancuta Morarasu
dad03ca472 Update source headers - add new Copyrights for new Java files synced from Head (part 2).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126997 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 13:58:06 +00:00
Ancuta Morarasu
dacf947758 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
fc05d0dc39 Merged HEAD (5.2) to 5.2.N (5.2.1)
126602 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124972 gjames: RA-884: Posting download/delete activites using a transaction listener


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126947 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:15:19 +00:00
Ancuta Morarasu
22d42b4761 Merged HEAD (5.2) to 5.2.N (5.2.1)
126580 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124739 gjames: ACE-5295: listArchivedNodes now works for non-admin users


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126925 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:12:03 +00:00
Ancuta Morarasu
03b2b9ea85 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
85decb5bd2 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
58cb31090a 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
45b9f6b043 Merged HEAD (5.2) to 5.2.N (5.2.1)
126547 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124158 jkaabimofrad: SFS-405, RA-778: (WIP)
         - Added quick-share client registry config.
         - Modified the send shared-link email API, based on the revised acceptance criteria.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126893 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:06:58 +00:00
Ancuta Morarasu
76971dbbf3 Merged HEAD (5.2) to 5.2.N (5.2.1)
126535 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      123185 jvonka: RA-706, ACE-5113: Revese merge 123162 & 123163 (needs more thought, re: impact on existing tests etc)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:03:25 +00:00
Ancuta Morarasu
9aeabb0398 Merged HEAD (5.2) to 5.2.N (5.2.1)
126530 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      123162 jvonka: ACE-5113: Platform - OwnableService - when setting owner check that username currently exists (at time of property update)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126874 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:01:28 +00:00
Ancuta Morarasu
0f395c1339 Merged HEAD (5.2) to 5.2.N (5.2.1)
126459 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122183 jvonka: FileFolderService / GetChildrenCQ - list children may ignore specific node type filter (and return all rather than none)
      - initially fixed on BRANCHES/DEV/FILE-FOLDER-API (see also RA-811)
      - will eventually be merged to HEAD for 5.N (although this specific commit could be cherry-picked sooner, if needed)
      ACE-5114, RA-811


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126803 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:24:17 +00:00
Ancuta Morarasu
112ddee5ba Merged HEAD (5.2) to 5.2.N (5.2.1)
126437 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121919 jkaabimofrad: RA-778: Removed unused import.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:19:37 +00:00
Ancuta Morarasu
85ec13f0be Merged HEAD (5.2) to 5.2.N (5.2.1)
126436 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121917 jkaabimofrad: RA-778: Added support for QuickShare service to email users notifying them that a content has been shared with them.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126782 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:19:27 +00:00
Andreea Dragoi
2fbfe83fa0 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
126126 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      126091 gjames: MNT-16161: Updated the javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-06 13:11:34 +00:00
Alex Mukha
89f8a6c95a Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
126058 jkaabimofrad: ACE-5001: Added a utility class to calculate the number of days between the start and end dates, so we could have a single source when dealing with such functionality. Also, changed the RepoUsageComponentImpl class to use this util class.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-04 14:07:46 +00:00
Alexandra Leahu
5ffc53461d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
126025 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125910 rmunteanu: MNT-15553 : Inconsistent search result with .eml files.
         - Fix transformation for eml files containing nested alternative parts.
         - Added test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126063 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-04 12:38:32 +00:00
Alexandra Leahu
a2a1443cd1 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125935 aleahu: MNT-16155 : Change source headers to new version
      - fixed more license headers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126008 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-29 11:37:57 +00:00
Alexandra Leahu
4d3e4f9c0a Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125933 aleahu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125907 mward: ACE-5052: close PrintWriter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-29 11:37:29 +00:00
Alexandra Leahu
fc20674988 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125892 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125842 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) (PARTIAL MERGE)
         125700 adavis: Merged V4.2.5 (4.2.5.7) to V4.2-BUG-FIX (4.2.7)
            125698: Merged DEV to V4.2.5 (4.2.5.7)
               125677 arebegea: MNT-15219 : Excel (.xlsx) containing xmls (shapes/drawings) with multi byte characters may cause OutOfMemory in Tika
                  - Should not have updated version.properties as the original commit needs to be merged forwards.,
            125696: Merged DEV to V4.2.5 (4.2.5.7)
               125677 arebegea: MNT-15219 : Excel (.xlsx) containing xmls (shapes/drawings) with multi byte characters may cause OutOfMemory in Tika
                  - Modified tika parser and tika core jars to allow some configuration parameters to be sent from Alfresco side using the metadata map parameter
                  - Excluded by default the parsing of drawings/shapes xmls because there was little valuable data that could be extracted from those xmls


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-29 11:36:11 +00:00
Alexandra Leahu
72b275c451 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125891 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125841 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         125680 sglover: Merged BRANCHES/DEV/SG/MNT15914 to V4.2-BUG-FIX (4.2.7)
               125540 sglover MNT-15914 "Add multi-threaded workers for FixedAclUpdater"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-29 11:32:48 +00:00
Andreea Dragoi
7aafbaccd2 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125833 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125718 cpopa: MNT-15160 : Unable to transform DWT/XLAM files to JPEG
            - Disabled ImageMagick support for DWT mimetype


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125866 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-27 12:30:06 +00:00