inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,497 Commits 339 Branches 2,245 Tags
dad03ca47253c68ca5bca04bfb05103bd9908042
Commit Graph

5895 Commits

Author SHA1 Message Date
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
Andreea Dragoi
17f25f685c Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125832 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125670 abalmus: MNT-16188 : [Kerberos] Users Search doesn't work
         MNT-15038 : Unexpected behavior when disabling Active Directory user (New feature to sync userAccountControl)
            - Fixed NPE in AuthenticationServiceImpl.getAuthenticationEnabled (I guess sometimes the PersonService bean is not injected)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125865 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-27 12:28:45 +00:00
Andreea Dragoi
4278099cea Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125817 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125673 abalmus: MNT-15421 : Intermittent failure SubsystemsTest.testAbstractPropertyBackedBean_performEarlyPropertyChecks_PortEarlyPropertyChecker
         - Fixed intermittently failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125859 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-27 12:22:40 +00:00
Raluca Munteanu
30a63154fb Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125734 rmunteanu: MNT-16201 : Failing test: AJExtensionsCompileTest
      - Fixed failing tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 14:23:04 +00:00
Raluca Munteanu
5ad2a0e334 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125702 mward: ACE-5052: backed out r125594:125595
   Closing the file results in the channel being closed, so we can't do that.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125797 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 14:21:57 +00:00
Raluca Munteanu
f66e5bcb4f Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125629 abalmus: MNT-15038 : Unexpected behavior when disabling Active Directory user (New feature to sync userAccountControl)
      - Fixed build on 5.1.N (Plat) due to new license header plugin checks (updated headers to the 3 new files)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 14:19:12 +00:00
Raluca Munteanu
9b22c4303f Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125621 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125577 abalmus: MNT-15038 : Unexpected behavior when disabling Active Directory user (New feature to sync userAccountControl)
         - Implemented new requirements and tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125792 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 14:18:45 +00:00
Raluca Munteanu
c14fbf0467 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125618 rmunteanu: 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@125790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 13:49:45 +00:00
Raluca Munteanu
6afb44e712 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 13:45:01 +00:00
Raluca Munteanu
dc6b2852d0 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 13:03:25 +00:00
Raluca Munteanu
8674e2bfc8 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 12:48:49 +00:00
Raluca Munteanu
96e14d1f6f Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125602 adragoi: MNT-16175 : CLONE - Time Consumed for Updating Folder Permission
      - added setInheritParentPermissions implementation to fix compilation error 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 12:20:26 +00:00
Raluca Munteanu
21563c3946 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125597 mward: ACE-5052: close stream


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125779 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 12:19:38 +00:00
Raluca Munteanu
118bed4ed5 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125596 mward: ACE-5052: added comment regarding close() expectations.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125778 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 12:19:23 +00:00
Raluca Munteanu
2938c9620a Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125595 mward: ACE-5052: close file


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125777 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 12:19:08 +00:00
Raluca Munteanu
90b0d1072e Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125594 mward: ACE-5052: close file


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125776 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 12:18:54 +00:00
Raluca Munteanu
fd071daef2 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125593 mward: ACE-5052: close stream


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 12:18:32 +00:00
Raluca Munteanu
6bd3928c70 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125591 mward: ACE-5052: close FileInputStream


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125773 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 12:17:55 +00:00
Raluca Munteanu
b2eb37c75e Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125587 mward: ACE-5052: close spring application context in FTPServerBean


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125772 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 12:17:24 +00:00
Raluca Munteanu
27e7f6fd21 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125586 mward: ACE-5052: close spring application context in CIFSServerBean


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 12:17:06 +00:00
Raluca Munteanu
622390d88f Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125473 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125055 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) (PARTIAL MERGE)
         124999 adragoi: Merged DEV to V4.2-BUG-FIX (4.2.7)
            124402 adragoi: MNT-15368 : Time Consumed for Updating Folder Permission
               - implemented an approach that uses a separate, asynchronous processes that sets fixed ACL's


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125767 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 12:15:31 +00:00
Raluca Munteanu
3d05032155 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125470 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125051 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124925 adragoi: Merged DEV to V4.2-BUG-FIX (4.2.7)
            124738 adragoi: MNT-14882 : NFS Client: Issuing 'list' command on a mounted directory with over 1000 entries does not return
               - save resumeId state on ContentSearchContext


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125766 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 12:14:53 +00:00
Raluca Munteanu
e574e67bac Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125454 amorarasu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125307 gjames: ACE-5091: Changed the javadoc formatting for TransactionService


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 12:14:15 +00:00
Ancuta Morarasu
2de22b5ec5 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125335 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125223 amukha: MNT-15743: documentlibrary generation anomaly in Share
         - Added a check to ensure that a proper doc lib container would be created.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125442 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-15 12:16:07 +00:00
Ancuta Morarasu
b6cc69db9b Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125333 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125215 bhorje: ACE-5308 set valid parent association qname 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125440 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-15 12:15:32 +00:00
Ancuta Morarasu
f12308b25d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125304 mward: ACE-5052: close spring application context in EmailServer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125437 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-15 12:13:32 +00:00
Ramona Neamtu
14d4cb8166 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125250 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125148 bhorje: ACE-5307 the title property remains unset for smart virtual folders  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-14 11:25:50 +00:00
Ramona Neamtu
fefddb593a Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125247 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125138 bhorje: ACE-5306 added cm:titled aspect to virtual smart folder entries  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-14 11:24:43 +00:00
Cristian Turlica
4b0a7f9650 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124939 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124889 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
         124745: MNT-15211: Follow-on (note: only affects NDB) - tweaks for further repo test fixes, including:
         - FileFolderServiceImplTest.testMove


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125039 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-08 14:40:10 +00:00
Cristian Turlica
fa503e9c2d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124938 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124888 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
         124735: MNT-15211: Follow-on (note: only affects NDB) - tweaks for further repo tests, including:
         - FileFolderServiceImplTest.testMoveCopyLotsOfFiles
         - DbNodeServiceImplTest.testDuplicateCatch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125038 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-08 14:39:58 +00:00