Commit Graph

14 Commits

Author SHA1 Message Date
Alan Davis
42c7df23b3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57576: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57564: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57560: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            57546: Merged DEV to V4.1.7 (4.1.7)
               57541:  MNT-9618: Consecutive white spaces in cm:name are not return by the CMIS AtomPub binding
                  - compress directive was removed from children.get.atomfeed.ftl and item.get.atomentry.ftl templates. Also,appropriate unit tests were added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61852 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:11:29 +00:00
Alan Davis
a5295c4fe7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57488: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57318: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.0)
         56965 : Merged DEV to V4.1-BUG-FIX (4.1.7)
            55964 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
                - Prevent folders to take part in any kind of shuffle operation.
            56308 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
               - Unit test that demonstrate issue.
            - Fixed unit test failure that causes prevous merge (r57176) to be reverted.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:53:09 +00:00
Alan Davis
ee1383c3cb Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57476: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57286: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         57220: MNT-9350: Registered Mimetypes WebScript doesn't know about the Alfresco Transformation Server
            - Added the notion of known workers and label message map
            - Added ability to override the label message map for custom implementations
            - Separated building of labels for complex and proxy transformers into their own methods
            - Added message formatting for bean names


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61818 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:43:29 +00:00
Alan Davis
25ae654abe Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57386: Following changes for MNT-9759, I think this test should now use _ in the page name.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61813 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:39:28 +00:00
Alan Davis
72c9c7e361 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57245: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57225: Reverse Merged as it caused the MoveMethodTest build error in https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-25 
         57176: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.0)
            56965 : Merged DEV to V4.1-BUG-FIX (4.1.7)
               55964 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
                  - Prevent folders to take part in any kind of shuffle operation.
               56308 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
                  - Unit test that demonstrate issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61800 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:30:41 +00:00
Alan Davis
9fa8b8ac87 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57237: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57176: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.0)
         56965 : Merged DEV to V4.1-BUG-FIX (4.1.7)
            55964 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
               - Prevent folders to take part in any kind of shuffle operation.
            56308 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
               - Unit test that demonstrate issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61792 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:24:15 +00:00
Alan Davis
6d29eb307f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57073: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56560: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56114: MNT-9104: If username contains uppercase letters the action of joining a site will not be displayed in "My activities"
          Added the license to new test classes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 19:15:04 +00:00
Alan Davis
207072be45 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57027: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56494: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1)
         55500: <<NOT IN 4.1.6>> Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
            55434: Merged DEV to V4.1-BUG-FIX (4.1.7)
               54939 : MNT-9413 : NullPointerException thrown when a wiki page with a null title is renamed using Share
                  - Using wiki page name, if page title isn't provided
                  - Unit test was added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61660 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 18:41:12 +00:00
Gavin Cornwell
d51b5639d0 Merged BRANCHES/DEV/HEAD-BUG-FIX to HEAD (to fix CLOUD-2269):
60725: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
        60641: MNT-10103: Merged DEV to V4.2-BUG-FIX.
           59571: MNT-10103 Advanced Search by Tag or custom fields not working in 4.2
           59704: MNT-10103 Advanced Search by Tag or custom fields not working in 4.2
              - Was added AdvancedSearchTest test.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@60796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-30 21:47:20 +00:00
Pavel Yurke
92fa883f7a Merged /BRANCHES/DEV/BELARUS/V4.2-BUG-FIX-2013_12_09 to HEAD (4.3/Cloud)
58842 : CLOUD-2204 : Cloud2. Litmus tests. Some regression failures 
      - GetLockState including tenant
   58806 : CLOUD-2204 : Cloud2. Litmus tests. Some regression failures 
      - WebDAV-lock behavior test added for multy-tenancy 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@58873 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-11 15:04:25 +00:00
Derek Hulley
403fd26ace Turned WebScripts registry into an asynchronously-refreshed component
- The size of the object and the nature in which it is read means that it does not really
   fit into the clustered cache model.  We just notify the cluster if the cache entry it needs to be
   reloaded, serving stale data for a short while
 - ALF-19982: BM-0013: Reindex: WebScripts registry is repeatedly reset (DeclarativeRegistry)
 - ALF-19983 BM-0013: Reindex: Solr reindex works very slowly 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55415 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-17 14:39:25 +00:00
Brian Remmington
7f8effa1f4 Merged BRANCHES/V4.2 to HEAD:
55206: Branch created for 4.2.x releases.
   55209: Merged HEAD to BRANCHES/V4.2:
        55208: Added Sharepoint config to unit test classpath to fix VtiRequestDispatcherTest.
   55222: Merged HEAD-BUG-FIX to V4.2
        55220: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
           55218: Fix for ALF-19894 Site is not displayed after restoring from Trashcan
             This bug was reported on 4.2, but the bug is also present on 4.1.
             I have added a testcase to reproduce the bug along with a fix.
             The problem was in SiteServiceImpl.delete where the code was writing an empty property value into the {}memberships property
             and therefore there was no record of which users had been members of the deleted site.
   55245: Fixed javadoc while checking that ALF-19055 was fixed.  ActivityService no longer uses 'format
   55246: CLOUD-2050 -Content changes are not synced from Cloud to On-Premise (errors in the logs)
   55249: Hazelcast: Added ability to create cache with 'read-backup-data' via property *.readBackupData
   55250: Hazelcast cache builder now accepts 'async-backup-count' value and any error in setting a value logs the full exception
   55251: Asynchronous cache: Better logging of in- and after-transaction processes
   55252: Asynchronous cache: Better logging of in- and after-transaction processes
   55266: Workflow REST API fix for variable retrieval
   55276: Merged HEAD to BRANCHES/V4.2:
        55274: Disabling Sharepoint unit tests until we can make them run properly in the build.
   55278: ALF-19889 - String for Brazilian Portuguese
   55279: Merged DEV to 4.2
        ALF-17464 : Replication jobs aren't displayed until sorting by some characteristic
           - Changing not exact equals (!==) to not euqals (!=)
   55280: Fix for ALF-19865 - Forgot password link redirects to Login page. Also cleaned up the mess that is the 'Sign in to Alfresco in the cloud' dialog.
   55281: Probable fix for ALF-19225 Intermittent test failures in SubscriptionServiceActivitiesTest
   55282: ALF-19865 - Cloud Sync profile area now looks like the rest of profile area.
   55285: Merged BRANCHES/DEV/BELARUS/HEAD-2013_08_27 to BRANCHES/V4.2:
        55068: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document
   55286: Merged BRANCHES/DEV/BELARUS/HEAD-2013_08_29 to BRANCHES/V4.2:
        55207: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document
        55210: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document
   55297: As part of prep work for fixing ALF-20023 Recent Sites and Favorite Sites in copy/move pickers empty,
   55299: ALF-19556: IE10 specific fix for file upload browse (impressive how IE finds more and more innovative ways to spoil things for itself)
   55300: Fixed date issue when creating a new process instance
   55308: Resync to HEAD@55302


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55309 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-15 15:00:13 +00:00
Samuel Langlois
2eb4f9e135 Merged HEAD-BUG-FIX to HEAD (4.2.0)
55103: Move GetMethodTest to the test-java folder, where it belongs


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55104 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-09 08:40:29 +00:00
Samuel Langlois
788d3c9c89 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