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,569 Commits 339 Branches 2,245 Tags
20efda458a8a191ff6e935ae49f82876f2547823
Commit Graph

800 Commits

Author SHA1 Message Date
Raluca Munteanu
20efda458a Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 
127311 aleahu: MNT-14332 : Alfresco stops working when Type Hierarchy creates a circular reference
      - fixed compilation error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127371 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-24 14:41:55 +00:00
Raluca Munteanu
b19fb09568 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.1.N/root@127370 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-24 14:41:40 +00:00
Raluca Munteanu
8d8efc16ec Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 
127276 aleahu: MNT-15345 : Dynamic Deployment of Models can cause a stack overlow error that causes excessive logging
      - checking if a model's namespace is also imported, if so throwing a compilation error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127369 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-24 14:40:52 +00:00
Cristian Turlica
abc42c895e 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.1.N/root@127307 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-20 14:10:12 +00:00
Ramona Neamtu
e3df2f6508 MNT-16043 : Site Manager is able to delete/move/copy locked files 
- Added test case for scenario

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127279 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-20 09:46:17 +00:00
Andrei Rebegea
a710e77559 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.1.N/root@127263 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-19 15:05:40 +00:00
Andrei Rebegea
4dcd2ce286 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.1.N/root@127262 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-19 15:05:12 +00:00
Cristian Turlica
bd12ec9489 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.1.N/root@127134 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-16 14:53:18 +00:00
Ramona Neamtu
cfa7b2b72f 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.1.N/root@127078 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-05-13 13:38:23 +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
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
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
Raluca Munteanu
de37b8662d 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.1.N/root@125621 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-20 12:40:15 +00:00
Raluca Munteanu
e88080bb6d 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@125618 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-20 12:36:42 +00:00
Raluca Munteanu
94228f57a2 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.1.N/root@125606 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-20 10:55:49 +00:00
Raluca Munteanu
e76a93cf89 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.1.N/root@125605 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-20 10:30:21 +00:00
Raluca Munteanu
86dc6f3402 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.1.N/root@125603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-20 10:21:07 +00:00
Ancuta Morarasu
3e0bd2e8ff 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.1.N/root@125473 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-15 12:56:00 +00:00
Ramona Neamtu
bd6f8dc5b0 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.1.N/root@125339 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-14 11:37:20 +00:00
Ramona Neamtu
9179d37c1e 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.1.N/root@125333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-14 11:32:33 +00:00
Ramona Neamtu
bfb4c39628 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.1.N/root@125250 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-13 13:37:00 +00:00
Ramona Neamtu
c1966f458d 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.1.N/root@125247 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-13 13:34:37 +00:00
Andrei Rebegea
e303d5348c 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.1.N/root@124938 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-06 14:50:52 +00:00
Andrei Rebegea
5dbcd554d2 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.1.N/root@124936 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-06 14:50:26 +00:00
Andrei Rebegea
7dd9c0636b 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.1.N/root@124935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-06 14:49:49 +00:00
Raluca Munteanu
33cc415ab0 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.1.N/root@124703 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-01 08:27:45 +00:00
Raluca Munteanu
c9f13752c3 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.1.N/root@124582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-30 08:01:49 +00:00
Alexandra Leahu
363efe70ae 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.1.N/root@124492 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-25 13:14:00 +00:00
Alexandra Leahu
25d3a86f0b 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.1.N/root@124491 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-25 13:13:42 +00:00
Andreea Dragoi
6d9504bb1c 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.1.N/root@124374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-22 14:39:32 +00:00
Andreea Dragoi
77cbbce481 MNT-15909: 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.1.N/root@124313 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-21 15:24:58 +00:00
Ramona Neamtu
88c3c0e730 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.1.N/root@124303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-21 13:05:37 +00:00
Ancuta Morarasu
0e2d8b083a 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.1.N/root@124237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-18 13:00:05 +00:00
Ancuta Morarasu
45c9d15805 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.1.N/root@124236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-18 12:57:18 +00:00
Ramona Neamtu
4842e4c4df 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.1.N/root@124143 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-16 14:23:30 +00:00
Ramona Neamtu
44b9155c7a 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.1.N/root@124142 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-16 14:23:17 +00:00
Ancuta Morarasu
0bedf1813d 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.1.N/root@124096 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 15:06:16 +00:00
Ancuta Morarasu
5ad98616ca Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 
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.1.N/root@124094 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 15:04:08 +00:00
Ancuta Morarasu
4d73aa02c2 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.1.N/root@124091 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 14:59:50 +00:00
Ancuta Morarasu
df3a28d0cc 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.1.N/root@124089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 14:59:04 +00:00
Ancuta Morarasu
fd2ea599b0 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.1.N/root@124088 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 14:58:44 +00:00
Ancuta Morarasu
94cdf0dc06 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.1.N/root@124087 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 14:58:21 +00:00
Ancuta Morarasu
f74239ffff 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.1.N/root@124085 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-15 14:57:39 +00:00
Alan Davis
ac86882aee Reverse merged 5.1.N (5.1.1) to get a green build 
123552: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123511 mward: MNT-15815: fix failing test due to prefix clash,
         123550: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123490 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123221 mward: ACE-5120: further fixes (ADMLuceneTest),
         123549: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            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,
         123548: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123488 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123145 mward: ACE-5120: fix ADMLuceneCategoryTest,
         123547: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123487 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123142 mward: ACE-5120: further test fixes,
         123546: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123486 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123028 mward: ACE-5120: test fixes,
         123545: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123483 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123000 mward: ACE-5120: Dictionary should not allow duplication of namespace prefixes,
         123543: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            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.1.N/root@123739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-12 10:16:48 +00:00
Alan Davis
666a4bd587 Tidy up after merge from 5.1.N to HEAD 
- This batch are to do with Mark's commits and reverts
     The 5.1.N 119393 record only merge should have had some changes from HEAD 118791

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-12 00:05:06 +00:00
Andrei Rebegea
6ca2b29df0 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
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.1.N/root@123550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-11 15:35:49 +00:00
Andrei Rebegea
9688b1ffd6 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
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.1.N/root@123548 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-11 15:33:29 +00:00
Andrei Rebegea
5cc6af9956 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
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.1.N/root@123547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-11 15:33:09 +00:00
Andrei Rebegea
f3accd27c6 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
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.1.N/root@123546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-11 15:32:53 +00:00