Commit Graph

14 Commits

Author SHA1 Message Date
Jamal Kaabi-Mofrad
3053256b6f Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
135805 jkaabimofrad: fixed tests failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135932 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-03-16 19:39:37 +00:00
Constantin Popa
461db4a173 Merged 5.1.N (5.1.3) to 5.2.N (5.2.1)
135141 cpopa: Merged WEBAPP-API (5.2.1) to 5.1.N (5.1.3)
      135076 cpopa: MNT-17341 : External users with Manager role cannot invite other external users to the site because site invitation accept fails
         - removed redundant test which was also causing problems to AbstractInvitationServiceImplTest because of a name clash
           SiteService.deleteSite doesn't remove a site completely, instead it leaves behind authorities and permissions, thus a SiteService.createSite would throw an exception
           even though SiteService.getSite returns null.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135151 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-02-14 16:32:38 +00:00
Constantin Popa
ff91dc2cbb Merged 5.1.N (5.1.3) to 5.2.N (5.2.1)
135137 cpopa: Merged WEBAPP-API (5.2.1) to 5.1.N (5.1.3)
      135050 cpopa: MNT-17341 : External users with Manager role cannot invite other external users to the site because site invitation accept fails
         - Enabled test ActivitiInvitationServiceImplTests by adding it to AllUnitTestsSuite
         - Fixed a couple of failing tests from ActivitiInvitationServiceImplTests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135147 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-02-14 16:28:30 +00:00
Constantin Popa
80586e5a72 Merged 5.1.N (5.1.3) to 5.2.N (5.2.1)
135136 cpopa: Merged WEBAPP-API (5.2.1) to 5.1.N (5.1.3)
      135040 cpopa: MNT-17341 : External users with Manager role cannot invite other external users to the site because site invitation accept fails
         - Remove the ASPECT_ANULLABLE from an invited user if the invitation is accepted successfully


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135146 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-02-14 16:22:55 +00:00
Alex Mukha
33ee24817c Merged DEV to 5.2.N (5.2.1)
131050 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
   131057 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate / fix test CMISTest.testModelAvailability
   131064 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - added patch to remove JBPM database tables
   131169 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - replaced generic DB script with database specific scripts
   131171 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - Fix DB2 patch
   131213 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - Fix JBPM table removal patch

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-10 17:34:57 +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
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
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
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
Ray Gauss
aee14f6158 Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)
105016: SHA-935: Repository Invite Flow Changes
     - Added new invitation-add-direct.bpmn20.xml workflow
     - Added bootstrapping of new workflow
     - Changed InvitationServiceImpl to allow setting of workflows used
     - Added configuration of workflows used in invitationService bean
     - Added repository properties for default workflows
     - Changed InvitationServiceImpl.getWorkflowDefinition to take an enum argument
     - Changed abstract testNominatedInvitationExistingUser to accommodate both current and new invite flows
     - Added test of new flow to Activiti test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 14:00:26 +00:00
Alan Davis
3eb7e5d52b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
85568: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      85476: Merged DEV to V4.2-BUG-FIX
       84330 : MNT-11775 : The (reject) review comment value is never shown in a moderated site rejection email.
        Corrected invitation-moderated.bpmn20.xml file . 
       85450 : MNT-11775 : The (reject) review comment value is never shown in a moderated site rejection email.
        Corrected some unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94505 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:32:01 +00:00
Alan Davis
7426972237 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83530: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      81658: Merge DEV to V4.2-BUG-FIX
       81644 : MNT-11775 : The (reject) review comment value is never shown in a moderated site rejection email.
        Fixed some code for getting correct rejection email. Added unit test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:08:41 +00:00
Alan Davis
d817f0522d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57912: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57879: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57877: MNT-9926: reformat code changes from
            53236: MNT-9101 Share: Cancelling an invitation for a disabled user, the user gets deleted in the process.
            	-add tests for both internal and external user invite cancellation
                -add new aspect to identify external invites and exclude from post invite cancellation cleanup


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61905 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:25:56 +00:00
Samuel Langlois
ab4ca7177f Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00