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
9,370 Commits 339 Branches 2,245 Tags
595d281c20ccbccf2051fb435e7923af7157dfd1
Commit Graph

6326 Commits

Author SHA1 Message Date
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
Ramona Neamtu
931613e7f8 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.1.N/root@126675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-11 08:57:54 +00:00
Jamal Kaabi-Mofrad
a5a0dba0c1 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/HEAD/root@126610 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 11:50:11 +00:00
Jamal Kaabi-Mofrad
84c24a10dd 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/HEAD/root@126602 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 11:45:19 +00:00
Jamal Kaabi-Mofrad
ce22405fd1 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/HEAD/root@126580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 11:38:09 +00:00
Jamal Kaabi-Mofrad
57310498c9 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/HEAD/root@126573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 11:35:15 +00:00
Jamal Kaabi-Mofrad
3d874e3334 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/HEAD/root@126566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 11:30:19 +00:00
Jamal Kaabi-Mofrad
96c682e07d 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/HEAD/root@126565 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 11:30:06 +00:00
Jamal Kaabi-Mofrad
a7183f19c5 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/HEAD/root@126547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 11:26:33 +00:00
Jamal Kaabi-Mofrad
e0cff00b63 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/HEAD/root@126535 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 11:23:09 +00:00
Jamal Kaabi-Mofrad
56fdd2741a 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/HEAD/root@126530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 11:21:36 +00:00
Jamal Kaabi-Mofrad
2341e9f573 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/HEAD/root@126459 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 11:03:22 +00:00
Jamal Kaabi-Mofrad
6d2906efcc 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/HEAD/root@126437 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:55:01 +00:00
Jamal Kaabi-Mofrad
aa9a557f4d 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/HEAD/root@126436 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-10 10:54:46 +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
Alexandra Leahu
feb9c53270 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.1.N/root@126126 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-05 12:58:03 +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
Jamal Kaabi-Mofrad
875e2f5977 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.1.N/root@126058 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-04 10:56:02 +00:00
Alexandra Leahu
781825b1fd 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.1.N/root@126025 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-29 12:52:15 +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
Alexandra Leahu
f1703a43c9 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.1.N/root@125935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-28 09:30:08 +00:00
Alexandra Leahu
e52c6301a4 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.1.N/root@125933 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-28 09:15:22 +00:00
Andreea Dragoi
e503014fe7 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.1.N/root@125892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-27 12:52:28 +00:00
Andreea Dragoi
9f259b87b6 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.1.N/root@125891 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-27 12:49:20 +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
81ec14e8c7 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.1.N/root@125833 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 15:30:36 +00:00
Raluca Munteanu
0ff5920bc3 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.1.N/root@125832 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 15:30:11 +00:00
Raluca Munteanu
e041d25619 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.1.N/root@125817 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 14:58:23 +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