113855 aowian: Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1)
113531 ragauss: ACE-4268: Added Users' Activiti Tasks Remain Active After Invitation Accepted
- Added check for no in-progress tasks to *disabled and broken* integration test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114050 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
106201: SHA-1021: Add Leave Site Link to Email Template
- Added siteLeaveLink to properties for email generation in InviteSender
- Added link and styling to email template
- Updated InviteSenderTest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
106196: SHA-993: Create Site Link in Email
- Modified InviteSender to add siteDashboardLink as a property being sent to the email generation
- Updated email template with siteDashboardLink
- Updated InviteSenderTest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110794 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
105365: SHA-957: Create New Email Template
- Changed InviteHelper and InviteSender methods to accept emailTemplateXpath and emailSubjectKey rather than using hardcoded defaults
- Changed existing email send delegates to declare their respective emailTemplateXpath and emailSubjectKey
- Added SendNominatedInviteAddDirectDelegate with new emailTemplateXpath and emailSubjectKey
- Added SendNominatedInviteAddDirectDelegate bean definition
- Added localization messages for subject and space
- Changed sendInvite in workflow to use SendNominatedInviteAddDirectDelegate
- Updated InviteSenderTest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110791 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
107413: Merged DEV to 5.0.N (5.0.3)
106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
- Cleaning of Javadoc,
107565: MNT-13545 Fix compilation after merge of Javadoc
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
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
59278: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
59275: MNT-10109 (and MNT-10237): Permissions are not restored when a deleted site is recovered from the trashcan
Fix InvitationCleanupTest failure by purging archived test site from trashcan so that sitename can be reused
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62128 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
