Commit Graph

7 Commits

Author SHA1 Message Date
Alan Davis
eaeae43110 Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
112545: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      112271: Merged DEV to V4.2-BUG-FIX (4.2.6)
         111087: MNT-11957 - move approveModeratedInvitation to InvitationService so its auditable
         111792: MNT-11957: Approving a request to join site not available for auditing
            - move rejectModeratedInvitation to InvitationService so its auditable
         111854: MNT-11957: Approving a request to join site not available for auditing
            - move acceptNominatedInvitation and cancelInvitation to InvitationService so its auditable
         111890: MNT-11957: Approving a request to join site not available for auditing
            - Removed obsolete methods from InviteHelper
         111991: MNT-11957: Approving a request to join site not available for auditing
            - move deleteAuthenticationIfUnused and sendNominatedInvitationto InvitationService so its auditable. Excluded InviteHelper.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@112558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-22 09:33:33 +00:00
Ray Gauss
39a3ac65fd Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)
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
2015-08-25 14:01:33 +00:00
Gavin Cornwell
79093bd8ae Coding standards and consistency sweep across new services code in repository project.
Covers spacing, trailing {, @since tags, tabs and copyright headers.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30211 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-09-02 21:10:49 +00:00
N Smith
b746747d4a Fixed a bug with the URL generated in the Inviatation Email.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30095 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-08-26 13:01:47 +00:00
N Smith
2489bf0bdf Finished refactoring InvitationServiceImpl to use Activiti worklfow engine.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30084 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-08-26 10:17:35 +00:00
N Smith
fba09d9b2a Started efactoring InviatationServiceImpl so that it uses Activit workflow engine.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29990 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-08-23 13:24:42 +00:00
N Smith
6ee8c66098 Refactored the Invitation Workflow Actions and Delegates. Pulled most of the functionality out into an InviteHelper class.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29833 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-08-17 14:22:55 +00:00