Commit Graph

3 Commits

Author SHA1 Message Date
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
Tatyana Valkevych
7dd2291753 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
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
2015-07-02 16:13:03 +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