Commit Graph

5 Commits

Author SHA1 Message Date
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