inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,442 Commits 337 Branches 2,253 Tags
c38cc1d4a977d601bd51a2d24fc1882b52ef5740
Commit Graph

8442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raluca Munteanu
c38cc1d4a9 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125476 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125351 adragoi: MNT-16131 : CronTriggerBeanSystemTest : testAllCronTriggerBeansHaveDelay fails
         - added startDelayMinutes for fixedAclUpdaterTrigger


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125768 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 12:15:54 +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
6c102b315e Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125339 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125269 amukha: MNT-15976: A few Oracle tests sometimes take hours to complete
         - disabled long running tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-15 12:20:02 +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
Ramona Neamtu
1302db3e38 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125202 adavis: Merged 5.1.0-CLOUD43 (Cloud ) to 5.1.N (5.1.2)
      124400 gbroadbent: FRENCH: Cloud_Plat updated file as per EN rev123892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125235 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-13 13:24:54 +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
Cristian Turlica
8ef6cf6e78 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124936 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124872 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124789 adavis: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            124719 rmunteanu: Merged DEV to V4.2.6 (4.2.6)
               124647: MNT-15847 : The RepoTransferReceiverImplTest.testNodeDeleteAndRestore fails intermittently on SQL Server and DB2
                  - reset mockedPolicyHandler before doCommitCB to ensure that only onEndInboundTransfer calls from doCommitCB are counted


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125037 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-08 14:39:46 +00:00
Cristian Turlica
fa37265633 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124935 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124871 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124788 adavis: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            124676 arebegea: MNT-15844 : CheckOutCheckInServiceImplTest.testCheckOutPermissions_ALF7680_ALF535 fails on SQL Server
               - fix the tests by doing the initialization of the test data in a new retrying transaction


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125036 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-08 14:39:34 +00:00
Andrei Rebegea
2fec403f87 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124933 arebegea: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      124849 ccesarini: GERMAN: updated translation of one string (Foren-Arbeitsbereich with en dash) in PLAT 5.1.1 based on English rev-124830


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124960 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-06 15:12:02 +00:00
Andrei Rebegea
ea06bb4b62 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124932 arebegea: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      124841 ccesarini: ITALIAN: updated translation of "business process" (in a BPM context) in PLAT 5.1.1 based on English rev-124830 (now consistent with Activiti)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124959 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-06 15:11:46 +00:00
Andrei Rebegea
fdf389e73e Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124931 arebegea: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      124832 ccesarini: SPANISH: updated translation of "business process" (in a BPM context) in PLAT 5.1.1 based on English rev-124830 (now consistent with Activiti)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-06 15:11:21 +00:00
Cristian Turlica
58ccab6683 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124799 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124794 adavis: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124785 adavis: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
            124784 adavis: Merged V4.1.10 (4.1.10.10) to V4.1-BUG-FIX (4.1.11)
               124775 cturlica: MNT-15921: CLONE - 4.1.10: [Security] HTML injection into invite and other emails
                  - updated the imap spaces templates by escaping html code


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124858 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-05 12:55:58 +00:00
Cristian Turlica
95332d3c8b Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124703 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124682 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
         124674: MNT-15211: Follow-on (note: only affects NDB)
         - use string_value 400 to enable schema bootstrap (and be consistent with existing customer pilot DBs)
         - minor tweaks to unit test cases (note: only affects NDB)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124856 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-05 12:55:11 +00:00
Alan Davis
1d21881568 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124814 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      << Similar change required in nb, pt_BR, ru, zh_CN files that don't exist in 5.0.N >> 
      124691 amukha: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124688 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
            124686 amukha: Merged 5.0.2-CLOUD42 (Cloud ) to V4.1-BUG-FIX (4.1.11)
               124681 cturlica: MNT-15919: [Security] HTML injection into invite and other emails
                  - on premise email template changes part III


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124817 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-04 15:45:32 +00:00
Alex Mukha
2dc0ed5a90 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124693 amukha: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124691 amukha: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124688 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
            124686 amukha: Merged 5.0.2-CLOUD42 (Cloud ) to V4.1-BUG-FIX (4.1.11)
               124681 cturlica: MNT-15919: [Security] HTML injection into invite and other emails
                  - on premise email template changes part III


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124697 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-31 19:33:14 +00:00
Raluca Munteanu
c9032ad3e7 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124582 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124539 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
         124514: MNT-15211: NDB-specific workaround fix for trashcan restore (since NDB does not support partial rollback on constraint violation)
         - this fix is dialect-specific (hence does not impact existing supported DB types)
         - note: MySQL Cluster NDB - experimental/unsupported


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124656 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-31 14:43:48 +00:00
Alex Mukha
a6ed15d902 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124625 amukha: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124619 amukha: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124611 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
            124609 amukha: Merged V4.1.10 (4.1.10.10) to V4.1-BUG-FIX (4.1.11)
               124606 amukha: MNT-15921: Merged 5.0.2-CLOUD42 (Cloud ) to V4.1.10 (4.1.10.10)
                  124594 cturlica: MNT-15919: [Security] HTML injection into invite and other emails
                     - on premise email template changes part II


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-30 18:12:58 +00:00
Alex Mukha
35953f4a0b Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124624 amukha: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124618 amukha: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124610 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
            124608 amukha: Merged V4.1.10 (4.1.10.10) to V4.1-BUG-FIX (4.1.11)
               124605 amukha: MNT-15921: Merged 5.0.2-CLOUD42 (Cloud ) to V4.1.10 (4.1.10.10)
                  124567 cturlica: MNT-15919: [Security] HTML injection into invite and other emails
                     - on premise email template changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-30 18:12:46 +00:00
Raluca Munteanu
88dee4b596 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124492 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124466 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124434 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            124387 amorarasu: MNT-15888: The ImapServiceImplTest fails intermittently on MySQL and MariaDB
               - The re-authentication is done in a retrying transaction. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124520 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-28 08:02:11 +00:00
Raluca Munteanu
b2188fa39a Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124491 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124465 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124433 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            124363 adragoi: MNT-15846 : The RenditionServiceIntegrationTest.testRenderPdfDocumentLongRunningCheckout fails on DB2
               - wait thread to finish checkout 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124519 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-28 08:01:42 +00:00
Alexandra Leahu
463aa9508f Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124472 dhulley: Formatting during investigations


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124480 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-25 13:07:37 +00:00
Alexandra Leahu
60e2030fcb Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124374 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124321 adragoi: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124240 amorarasu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            124201 amorarasu: MNT-15419: Failing test TaggingServiceImplTest.testALF_17260() on various databases
               - increased the waiting time


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124414 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-23 14:40:51 +00:00
Andreea Dragoi
5d13806c7e Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124313 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124244 abalmus: MNT-15497 : Keyword tags generated from metadata extraction are formed into a single string rather than split on delimiter
         - Fixed tag separation on delimiter
         - Enhanced existing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124364 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-22 14:32:10 +00:00
Andreea Dragoi
fc26cc8af1 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124303 rneamtu: MNT-15881 : CLONE - Share rule constraints missing due to ActionExecuterAbstractBase's regression
      Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124129 rneamtu: Merged DEV to 5.0.N (5.0.4)
            124118 rneamtu: MNT-15802: Share rule constraints missing due to ActionExecuterAbstractBase's regression
               - Set parameter constraint name for localized parameters
               - Added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-21 15:18:46 +00:00
Alan Davis
47464aa8c2 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124237 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124191 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124133 arebegea: MNT-14671 : Site with document locked for Edit Offline cannot be deleted
            - disabled the ASPECT_LOCKABLE when deleting a site
            - added tests for delete and restore site


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124278 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-21 11:06:14 +00:00
Alan Davis
741769a993 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124236 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (PARTIAL MERGE)
      124190 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124132 arebegea: MNT-15573 : Site finder slow for a user who's member of many sites
            - added a new method to InvitationService to make use of the limit in the searchInvitation
            - sent and used the 200 limit from the site-finder.get.js in the script/ScriptInvitationService.java and passed the new parameter
            - for searchModeratedInvitations and searchNominatedInvitations methods of InvitationServiceImpl.java I added the use of the limit parameter
            - added some comments on ActivitiWorkflowEngine.java and TaskComponent.java to inform developers about the performance issues and possible improvement
            - added junit tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124277 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-21 11:05:59 +00:00
Ancuta Morarasu
d20141eb13 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124145 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124106 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124105 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
            123915 rmunteanu: Merged V4.1.7 (4.1.7.18) to V4.1-BUG-FIX (4.1.11)
               MNT-15801 : onContentUpdate policies not working for updates via webdav
                  - Reverted changes made for MNT-11185 and MNT-10966 , reverts that will fix MNT-15746
                  - Changed fix for MNT-5882 by adding the ASPECT_NO_CONTENT after the content is updated, this way preventing MNT-10966 from reproducing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124228 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-18 12:50:49 +00:00
Ancuta Morarasu
d8a66822f4 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124143 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124120 gjames: MNT-15830: Moved DynamicallySizedThreadPoolExecutorTest to alfresco-core, and removed from unit tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124226 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-18 12:50:32 +00:00
Ancuta Morarasu
851b1bf662 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124142 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124119 gjames: MNT-15830: Moved DynamicallySizedThreadPoolExecutorTest to alfresco-core


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124225 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-18 12:50:23 +00:00
Ancuta Morarasu
4ffff16e08 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124125 mward: MNT-15815: further test data fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124224 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-18 12:50:15 +00:00
Ancuta Morarasu
fef6fa3dd0 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124096 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123996 sglover: MNT-15655 "Possible to violate child cm:name uniqueness constraint via NodeService.addAspect"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-18 12:49:57 +00:00
Ancuta Morarasu
a0f1ae7a03 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124092 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123511 mward: MNT-15815: fix failing test due to prefix clash


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124218 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-18 12:49:23 +00:00
Ancuta Morarasu
a2d76025ad Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124091 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123490 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123221 mward: ACE-5120: further fixes (ADMLuceneTest)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-18 12:49:14 +00:00
Ancuta Morarasu
4e7254d49d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124090 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123489 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123148 mward: ACE-5120: change NS prefix in test to avoid clash


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124216 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-18 12:49:05 +00:00
Ancuta Morarasu
6f2b0f90ef Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124089 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123488 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123145 mward: ACE-5120: fix ADMLuceneCategoryTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-18 12:48:57 +00:00
Ancuta Morarasu
92500f8d91 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124088 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123487 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123142 mward: ACE-5120: further test fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124214 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-18 12:48:48 +00:00
Ancuta Morarasu
eb64e2d3f3 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124087 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123486 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123028 mward: ACE-5120: test fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124213 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-18 12:48:38 +00:00
Ancuta Morarasu
f43892ca62 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
124085 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      123477 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123368 gjames: MNT-15114: Test to ensure the policy fires


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124211 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-18 12:47:11 +00:00
Alan Davis
941ca950a9 Merged 5.0.N (5.0.4) to 5.2.N (5.2.1) 
123880 rneamtu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123574 amorarasu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
         123414 123524 amorarasu: MNT-15798: CLONE - call to guessMimetype() on a node that has no content creates a content property
            - Content Data should be created only when it has a binary, not as a side effect of getters on ScriptNode.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@123892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-14 16:15:59 +00:00
Alan Davis
a93850565c Incremented version to 5.2.1 and schema to 10050 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@123830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-12 14:08:35 +00:00
Alan Davis
8975144c20 Merged 5.1.N (5.1.1) to HEAD (5.2) 
123741 adavis: Merged 5.1.0 (5.1.0.1) to 5.1.N (5.1.1)
      123740 adavis: Reverse out incomplete ACE-5044 patching
         - increased number to 100,000 as we just used 10,000


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123742 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-12 10:33:01 +00:00
Alan Davis
3a2c7376a8 Corrections merges to pom.xml files to get 5.1.N and HEAD in line 
- root/projects/repository/pom.xml HEAD 117615 did not take the whole of 5.1.N 1171515

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-12 10:07:19 +00:00
Alan Davis
1b0bf4532f Minor fixing up of HEAD from values in 5.1.N after merge 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123729 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-11 23:10:13 +00:00