Commit Graph

4 Commits

Author SHA1 Message Date
Alan Davis
76f8740cd3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57041: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56508: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1)
         55931: <<NOT IN 4.1.6>> Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
            55872: Merged DEV to V4.1-BUG-FIX (4.1.7)
               55854: MNT-9067: bulkimport "Replace existing files" option does not work when versioning is enabled
                  Clear version history on import versioned file and replace existing versioned file.
                  Remove versionable aspect on import non versioned file and replace existing versioned file.
                  Added unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 18:52:11 +00:00
Alan Davis
6deb31c4c5 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57039: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56506: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1)
         55929: <<NOT IN 4.1.6>> Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
            55812: MNT-9076: Penultimate version cannot be accessed from Share when uploading using bulkimport
            Cleaned up the source files (the tabs and EOL chars).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61673 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 18:50:26 +00:00
Alan Davis
5f53db226d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57038: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56505: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1)
         55928: <<NOT IN 4.1.6>> Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
            55811: Merged DEV to V4.1-BUG-FIX (4.1.7)
               55751: MNT-9076: Penultimate version cannot be accessed from Share when uploading using bulkimport
                  The changes related to creating a version for HEAD revision of imported file. 
                  Added unit test.


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