Commit Graph

8 Commits

Author SHA1 Message Date
Constantin Popa
0138579bac Merged 5.1.N (5.1.3) to 5.2.N (5.2.1)
135139 cpopa: Merged WEBAPP-API (5.2.1) to 5.1.N (5.1.3)
      135063 cpopa: MNT-17341 : External users with Manager role cannot invite other external users to the site because site invitation accept fails
         - added the @Category(BaseSpringTestsCategory.class) to ActivitiInvitationServiceImplTests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135149 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-02-14 16:31:31 +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
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
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
Ahmed Owian
aa13c807e9 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/HEAD/root@113855 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-07 20:10:53 +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
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