Commit Graph

10 Commits

Author SHA1 Message Date
Alan Davis
c791da212f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57640: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57627: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57566: Reverse Merged: Appears to have caused build failures https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV41BUGFIX-829
            57419: Merged DEV to V4.1-BUG-FIX (4.1.8)
               MNT-9794: Authorities with duplicate names can be easilly created using AuthorityService
                  - ContentModel.PROP_NAME was added for preventing the generation of new uid for every new authority nodes with the duplicated names in 'child_node_name' field into 'alf_child_assoc' table.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:21:07 +00:00
Alan Davis
881e324c76 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57639: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57626: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57419: Merged DEV to V4.1-BUG-FIX (4.1.8)
            - correction to the merge


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:20:19 +00:00
Alan Davis
3fc589c168 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57638: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57625: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57419: Merged DEV to V4.1-BUG-FIX (4.1.8)
            MNT-9794: Authorities with duplicate names can be easilly created using AuthorityService
               - ContentModel.PROP_NAME was added for preventing the generation of new uid for every new authority nodes with the duplicated names in 'child_node_name' field into 'alf_child_assoc' table.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:19:30 +00:00
Alan Davis
a807469fba Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57241: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57221: Reverse Merge as it caused SiteServiceImplMoreTest deleteSiteAndRestoreEnsuringSiteGroupsAreRecovered to fail
         57067: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
            56942: Merged DEV to V4.1-BUG-FIX (4.1.7)
               56883 : MNT-9794: Authorities with duplicate names can be easilly created using « AuthorityService »
                  - Creation of the duplicated authorities is fixed. Unit tests are added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:27:29 +00:00
Alan Davis
71791b0c00 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57228: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57067: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56942: Merged DEV to V4.1-BUG-FIX (4.1.7)
            56883 : MNT-9794: Authorities with duplicate names can be easilly created using « AuthorityService »
               - Creation of the duplicated authorities is fixed. Unit tests are added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:17:00 +00:00
Alan Davis
1230bde9a6 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57164: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57017: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         57004: MNT-9375: Fixed the test that caused a lot of build errors (running SecurityTestSuite) when merged with 4.2 Bug Fix (build #7) 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:15:16 +00:00
Alan Davis
7ec5353411 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57163: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57016: Reverse Merge to the original
         56761: Reverse Merge: Caused lots of build errors running SecurityTestSuite. Specifically HomeFolderProviderSynchronizerTest
               which ran after AuthorityBridgeTableAsynchronouslyRefreshedCacheTest.
               See https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-7 (#11 has 30 errors including 26 from HFPST and ABTARCT)
            56562: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               56138: Merged DEV to V4.1-BUG-FIX (4.1.7)
                  56075: MNT-9375 (related to MNT-9485): MT - when users are added to site with a group addition versus individual, they are not handled as members of site
                  Added JUnit test for the issue. Added the test to SecurityTestSuite.
            56580: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               56026: Merged DEV to V4.1-BUG-FIX (4.1.7)
                  55892: MNT-9485: MT Users added to Alfresco Administrators group via Group addition do not have 'admin' privileges
                   - Build bridge cache on behalf of provided tenant user. 
            56581: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               << last commit missed a file >>
               56026: Merged DEV to V4.1-BUG-FIX (4.1.7)
                  55892: MNT-9485: MT Users added to Alfresco Administrators group via Group addition do not have 'admin' privileges
                   - Build bridge cache on behalf of provided tenant user. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:14:29 +00:00
Alan Davis
4f4d6ec937 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57112: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56761: Reverse Merge: Caused lots of build errors running SecurityTestSuite. Specifically HomeFolderProviderSynchronizerTest
            which ran after AuthorityBridgeTableAsynchronouslyRefreshedCacheTest.
            See https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-7 (#11 has 30 errors including 26 from HFPST and ABTARCT)
         56562: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
            56138: Merged DEV to V4.1-BUG-FIX (4.1.7)
               56075: MNT-9375 (related to MNT-9485): MT - when users are added to site with a group addition versus individual, they are not handled as members of site
               Added JUnit test for the issue. Added the test to SecurityTestSuite.
         56580: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
            56026: Merged DEV to V4.1-BUG-FIX (4.1.7)
               55892: MNT-9485: MT Users added to Alfresco Administrators group via Group addition do not have 'admin' privileges
                - Build bridge cache on behalf of provided tenant user. 
         56581: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
            << last commit missed a file >>
            56026: Merged DEV to V4.1-BUG-FIX (4.1.7)
               55892: MNT-9485: MT Users added to Alfresco Administrators group via Group addition do not have 'admin' privileges
                - Build bridge cache on behalf of provided tenant user. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61742 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 19:44:32 +00:00
Alan Davis
78c78f13b1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57075: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56562: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56138: Merged DEV to V4.1-BUG-FIX (4.1.7)
            56075: MNT-9375 (related to MNT-9485): MT - when users are added to site with a group addition versus individual, they are not handled as members of site
            Added JUnit test for the issue. Added the test to SecurityTestSuite.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61706 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 19:16:37 +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