Commit Graph

13 Commits

Author SHA1 Message Date
Ancuta Morarasu
22d42b4761 Merged HEAD (5.2) to 5.2.N (5.2.1)
126580 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124739 gjames: ACE-5295: listArchivedNodes now works for non-admin users


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126925 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:12:03 +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
Raluca Munteanu
c9032ad3e7 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124582 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124539 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
         124514: MNT-15211: NDB-specific workaround fix for trashcan restore (since NDB does not support partial rollback on constraint violation)
         - this fix is dialect-specific (hence does not impact existing supported DB types)
         - note: MySQL Cluster NDB - experimental/unsupported


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124656 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-31 14:43:48 +00:00
Alan Davis
e39037672c Merged 5.1.N (5.1.1) to HEAD (5.1)
120105 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120045 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
         119806 gjames: MNT-15211 Re-enabled the non-auditable test, and corrected the createnode.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123612 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:34:41 +00:00
Alan Davis
4a5059192b Merged 5.1.N (5.1.1) to HEAD (5.1)
120104 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120044 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
         119749 gjames: MNT-15211 Disabled the non-auditable test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123611 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:34:32 +00:00
Alan Davis
fd3c5c2b64 Merged 5.1.N (5.1.1) to HEAD (5.1)
120103 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120043 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
         119724 gjames: MNT-15211 Added a test for restoring non-auditable


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123609 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:34:22 +00:00
Alan Davis
3929596255 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94232: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94116: MNT-13089 Reinstate the tests that had been disabled on SQLServer, before we understood the problem was with transaction isolation
      Reverted following commits:
         93292: Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelCreate in case of SQL Server
         93342: Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelDelete in case of MS SQl Server.
         93522: Disabled org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionRestore and org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionPurge in case of MS SQL Server.
         93680: Disabled org.alfresco.repo.rendition.RenditionServiceIntegrationTest.testCompositeReformatAndResizeRendition in case of SQL Server
         93772: Disabled for MS SQL Server AuthenticationTest.testLoginNotExistingTenant, RenditionServiceIntegrationTest.testALF3733, RenditionServiceIntegrationTest.testJavascriptAPI.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95059 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:35:56 +00:00
Alan Davis
faf2708844 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93590: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93522: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
      Disabled org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionRestore and org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionPurge in case of MS SQL Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94977 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:28:25 +00:00
Alex Mukha
0c9de67714 Merged DEV (5.0.0) to HEAD (5.0/Cloud)
86091: ACE-1061 : SQL Server: ArchiveAndRestoreTest.testListArchivedNodesFilter fails
   Disabled case-sensitive filtering as not required.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-03 06:17:59 +00:00
Alan Davis
068939e250 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58376: Added additional tests to ownJVMCategory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61971 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:20:56 +00:00
Jamal Kaabi-Mofrad
fa8910384a fix for CLOUD-2150: Trashcan for network admins only shows their deleted content.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@57583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-04 10:10:02 +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