inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,539 Commits 339 Branches 2,245 Tags
29945e32051a2a5ae935cdfe9828f667ea341191
Commit Graph

11 Commits

Author SHA1 Message Date
Alan Davis
84841e063f Merged 5.2.N (5.2.1) to HEAD (5.2) 
125788 rmunteanu: 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/HEAD/root@127810 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 17:08:06 +00:00
Alan Davis
12769c2923 Merged 5.2.N (5.2.1) to HEAD (5.2) 
125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 16:45:04 +00:00
Alan Davis
91eb2644ad Merged 5.2.N (5.2.1) to HEAD (5.2) 
125781 rmunteanu: 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/HEAD/root@127808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-06-03 16:40:56 +00:00
Alan Davis
c6eef005f3 Merged 5.1.N (5.1.1) to HEAD (5.2) 
122735 adragoi: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122668 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122625 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122548 rmunteanu: Merged DEV to V4.2.6 (4.2.6)
               122546: MNT-14204: Enterprise bulkimport tool is not versioning for inplace import from two different batches
                  - If only version files are imported, version history is no longer removed and the version number is incremented
                  - Added new in-place import test and updated one streaming import test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123684 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-03-11 22:32:08 +00:00
Alan Davis
d70e9ad7ad Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
59474: BDE-195: bring back BulkImportTest into its own JVM + filter out CommentsApiTest, not run in Ant (for now?)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62139 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-12 01:35:27 +00:00
Alan Davis
b9507acf29 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
58794: Further experimentation with running tests together vs in their own jvm.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62035 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-12 00:12:23 +00:00
Alan Davis
c0de7292bc Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
58520: Upped the memory for the sameVM tests and categorised the AVM tests


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