Commit Graph

1197 Commits

Author SHA1 Message Date
Alan Davis
3e5a51b778 Merged 5.2.N (5.2.1) to HEAD (5.2)
124656 rmunteanu: 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/HEAD/root@127764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:04:54 +00:00
Alan Davis
0c7488b7e7 Merged 5.2.N (5.2.1) to HEAD (5.2)
124520 rmunteanu: 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/HEAD/root@127761 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:04:15 +00:00
Alan Davis
9abc53e701 Merged 5.2.N (5.2.1) to HEAD (5.2)
124519 rmunteanu: 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/HEAD/root@127760 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:04:09 +00:00
Alan Davis
28fcd6efb9 Merged 5.2.N (5.2.1) to HEAD (5.2)
124414 aleahu: 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/HEAD/root@127754 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:03:35 +00:00
Alan Davis
c8aa156dda Merged 5.2.N (5.2.1) to HEAD (5.2)
124364 adragoi: 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/HEAD/root@127752 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:03:24 +00:00
Alan Davis
bffa610ff9 Merged 5.2.N (5.2.1) to HEAD (5.2)
124310 adragoi: 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/HEAD/root@127751 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:03:18 +00:00
Alan Davis
d6119f7d57 Merged 5.2.N (5.2.1) to HEAD (5.2)
124278 adavis: 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/HEAD/root@127748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:00:41 +00:00
Alan Davis
ccfb98ccbd Merged 5.2.N (5.2.1) to HEAD (5.2)
124277 adavis: 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/HEAD/root@127747 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:00:35 +00:00
Alan Davis
cd61c4f1e0 Merged 5.2.N (5.2.1) to HEAD (5.2)
124222 amorarasu: 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/HEAD/root@127740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:55:11 +00:00
Alan Davis
53439f9771 Merged 5.2.N (5.2.1) to HEAD (5.2)
124217 amorarasu: 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/HEAD/root@127737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:54:52 +00:00
Alan Davis
638de653ab Merged 5.2.N (5.2.1) to HEAD (5.2)
124215 amorarasu: 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/HEAD/root@127735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:54:40 +00:00
Alan Davis
5cd5cf6dc0 Merged 5.2.N (5.2.1) to HEAD (5.2)
124214 amorarasu: 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/HEAD/root@127734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:54:34 +00:00
Alan Davis
b7978ab162 Merged 5.2.N (5.2.1) to HEAD (5.2)
124213 amorarasu: 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/HEAD/root@127733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:54:28 +00:00
Alan Davis
56e3fec00c Merged 5.2.N (5.2.1) to HEAD (5.2)
124211 amorarasu: 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/HEAD/root@127731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 15:54:16 +00:00
Alan Davis
4621b16359 Merged HEAD (5.2) to 5.2.N (5.2.1)
127588 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127088 jvonka: FileFolderService / GetChildrenCannedQuery - optional support for filtering by isPrimary child assoc (true/false) 
      - eg. as required by new V1 REST API
      - RA-1053


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127680 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 14:16:11 +00:00
Jamal Kaabi-Mofrad
a57b8c5e34 Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
127462 jkaabimofrad: Merged 5.1.N (5.1.2) to API-STRIKES-BACK (5.2.0)
      127454 jkaabimofrad: MNT-16224, RA-1093: Fixed Quickshare issue where deleting a shared node didn't remove the 'shared' aspect. The fix also takes care of the shared nodes that have been deleted but not yet restored, as well as, shared nodes that have already been restored from the trashcan (allow the user to un-share).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 22:25:00 +00:00
Jamal Kaabi-Mofrad
998388eb2d Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
127088 jvonka: FileFolderService / GetChildrenCannedQuery - optional support for filtering by isPrimary child assoc (true/false) 
   - eg. as required by new V1 REST API
   - RA-1053


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127588 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 22:08:08 +00:00
Alexandra Leahu
f0ac5fd4e9 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127454 jkaabimofrad: MNT-16224, RA-1093: Fixed Quickshare issue where deleting a shared node didn't remove the 'shared' aspect. The fix also takes care of the shared nodes that have been deleted but not yet restored, as well as, shared nodes that have already been restored from the trashcan (allow the user to un-share).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127465 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-01 13:26:30 +00:00
Jamal Kaabi-Mofrad
1cabca593c MNT-16224, RA-1093: Fixed Quickshare issue where deleting a shared node didn't remove the 'shared' aspect. The fix also takes care of the shared nodes that have been deleted but not yet restored, as well as, shared nodes that have already been restored from the trashcan (allow the user to un-share).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@127454 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-31 16:57:14 +00:00
Raluca Munteanu
f36baf58d1 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127377 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127306 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         127272 arebegea: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
            127195 cpopa: MNT-14453 : Deleting tag using TaggingService.deleteTag() causes issue where no more tags can be added to node
               - Amended TaggingService.deleteTag() so as to remove references to a tag before being deleted. 
               - Added 'nodeService.exists(beforeNodeRef)' checks in TaggingService.updateTags in order to protect against InvalidNodeRefException which may be thrown on nodes that still have references to tags deleted using the  current(incorrect) implementation of TaggingService.deleteTag() 
               - Created DOCS-2060 in order document the manual procedure of tag scope refresh.


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-25 14:39:22 +00:00
Raluca Munteanu
108127f169 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127369 rmunteanu: 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.2.N/root@127392 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-25 14:38:49 +00:00
Raluca Munteanu
29c85366ed Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
127306 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      127272 arebegea: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
         127195 cpopa: MNT-14453 : Deleting tag using TaggingService.deleteTag() causes issue where no more tags can be added to node
            - Amended TaggingService.deleteTag() so as to remove references to a tag before being deleted. 
            - Added 'nodeService.exists(beforeNodeRef)' checks in TaggingService.updateTags in order to protect against InvalidNodeRefException which may be thrown on nodes that still have references to tags deleted using the  current(incorrect) implementation of TaggingService.deleteTag() 
            - Created DOCS-2060 in order document the manual procedure of tag scope refresh.


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


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


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127287 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-20 13:17:01 +00:00
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
3cb8d094ef Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127134 cturlica: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127102 rmunteanu: MNT-15614 : Site with name "IT" cannot be managed properly
         - Changed the way the role name is striped out.
         - Implemented tests.


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


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127010 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-12 08:41:13 +00:00
Ancuta Morarasu
b406f49bda Update source headers - add new Copyrights for new Java files synced from Head (fix for part 2).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126999 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 14:38:18 +00:00
Ancuta Morarasu
dad03ca472 Update source headers - add new Copyrights for new Java files synced from Head (part 2).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126997 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 13:58:06 +00:00
Ancuta Morarasu
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
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
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
2cc922696b Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
125360 gjames: Merged 5.0.N (5.0.4) to FILE-FOLDER-API (5.2.0)
      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/HEAD/root@126621 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:53:12 +00:00
Jamal Kaabi-Mofrad
9a8b3972b9 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
125359 gjames: Merged 5.0.N (5.0.4) to FILE-FOLDER-API (5.2.0)
      124119 gjames: MNT-15830: Moved DynamicallySizedThreadPoolExecutorTest to alfresco-core


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:53:04 +00:00