Commit Graph

2894 Commits

Author SHA1 Message Date
Alan Davis
e655441df0 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57923: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57922: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57904: Fix for MNT-9947 - Advanced search returns no result if using numberrange.ftl control


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61909 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:29:13 +00:00
Alan Davis
31506b14d3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57915: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57908: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57900: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            57890: Merged DEV to V4.1.7 (4.1.7)
               57718:  MNT-9500: After editing one occurrence of recurrent event the recurrence disappears
                  - Implemented the functionality that allow updating series in outlook calendar.
               57846: MNT-9500: After editing one occurrence of recurrent event the recurrence disappears
                 - Unit tests and unforeseen behaviour (deletion of updated occurrence; update of recurrence, when occurrence was deleted) were implemented. Also, mini calendar dashlet was updated.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61908 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:28:24 +00:00
Alan Davis
ff2080895e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57866: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57858: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57816: Merged DEV to V4.1-BUG-FIX (4.1.8)
            57643: MNT-8989: MP4 and mov accessed over WebDav on safari or Chrome cause exceptions in log
               Added ClientAbortException check.
               Added unit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61899 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:21:05 +00:00
Alan Davis
e2b3f25e25 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57852: BDE-195 Try to fix remote-api tests in Maven build: do not run rest API twice, and use JUnit category to run some tests in their own JVM


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:19:28 +00:00
Alan Davis
eb7349094a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57702: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57699: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57698: MNT-9770: WebDAV uploads over 2gb in size fails.
            - Handle null header content length (failed a test when merged to 4.2-BUG-FIX)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61870 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:26:05 +00:00
Alan Davis
2d53704b85 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57701: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57648: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57594: MNT-9770 : Merged from DEV to V4.1-BUG-FIX
          57002: MNT-9770 : WebDAV uploads over 2gb in size fails.
          Change int type to long, as content length from http request more than Integer.MAX_VALUE . 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61869 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:25:14 +00:00
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
31230b70a6 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57529: Merded DEV to HEAD-BUG-FIX (4.3)
      57218: MNT-9727 : Remove Ant from packaged libraries
      Excluded ant-1.7.1.jar from build path of Data Model project.
      Fixed the tests and source files to use java.util.zip.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61843 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:04:15 +00:00
Alan Davis
1f29cc1d57 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57512: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57418: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         57405: Merged DEV to V4.1-BUG-FIX (4.1.7)
            51086: MNT-8905 : Additional logging required in .tag.delete.js. and .tag.put.json.ps.
               - Printing information about cause of failure of tag deleting (changing) was added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61842 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:03:21 +00:00
Alan Davis
4632be0702 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57508: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57359: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         57305: Fix for MNT-9779


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61838 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:00:08 +00:00
Alan Davis
bfc32bbcc9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57501: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57338: Moved duplicate tests for ALF-19784 (MNT-9866): Duplicated tests in thor in package org.alfresco.rest.api.tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61833 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:56:01 +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
eba96fecfa Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57479: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57289: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         57269: MNT-9255: Metadata of a document should be extracted before a new version is created
            - Moved extraction of metadata before checkin of node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61821 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:45:54 +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
41e8df3b42 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57453: Upgraded mockito to fix failing tests, used a constant version number across all projects, BDE-195


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61816 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:41:54 +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
f480af9949 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57144: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56927: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56870: Merged DEV to V4.1-BUG-FIX (4.1.7)
            50589 : MNT-8908 : Incorrect display number of post in blog pagination.
               - The functionality was introduced to display the "pagination.template.page-report.more" (Showing items {startRecord} - {endRecord} of {totalRecords}++) message for pagination in Share UI, when items (blogs) more than limited (default is 100).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61769 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:05:52 +00:00
Alan Davis
81cdd77189 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57125: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56907: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56679: Merged DEV to V4.1-BUG-FIX (4.1.7)
            54636, 56602 : MNT-9526 : REST API call like .http://localhost:8080/alfresco/service/api/classes/cm_content/property/cm_name. never returns constraint.
               - Changing propertydefinition.lib.ftl for appropriate output


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 19:50:54 +00:00
Alan Davis
e540f243bb Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57100: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56606: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56599: MNT-6294 : Fields in "Create space form" out of form
            - Changing value of size of createSpacePanel


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61729 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 19:35:02 +00:00
Alan Davis
d567410eee Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57078: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56565: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56238:  Merged DEV to V4.1-BUG-FIX (4.1.7)
            50368: MNT-9500: After editing one occurrence of recurrent event the recurrence disappears
              - Implemented the new functionality that allow update occurrences in a recurrence event. Now we have ability to update the following properties through outlook: start, end, subject, location. Calendar web script was updated to display event\events information correctly. Also appropriate unit tests were added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61709 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 19:19:04 +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
2bcacf92b7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57040: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56507: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1)
         55930: <<NOT IN 4.1.6>> Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
            55815: Merged DEV to V4.1-BUG-FIX (4.1.7)
               55430: MNT-8475 : Incorrect behaviour of RSS Feed on Alfresco + SSO
               Added webscript in Share for wiki rss to use /feedservice/* endpoint to be consistent with blogs,
               links and discussions rss feeds.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61674 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 18:51:20 +00:00
Alan Davis
c1a0351a73 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57029: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56496: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1)
         55754: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX
          54754: Merged V4.1.6 (4.1.6) to V4.1-BUG-FIX (4.1.7)
               54570: MNT-2258: IE's File Download box does not show a filename correctly when that have non-ASCII characters in the filename
               For file download in IE8 use legacy filename token with encoded value in "Content-Disposition" header


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 18:42:44 +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
Alan Davis
6dc92ead70 MNT-10589: Merged V4.2-BUG-FIX (4.2.2) to V4.2.1 (4.2.1)
60891: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/V4.2-BUG-FIX:
      60889: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX:
           60873: MNT-10560: Security: The Apache Xerces XML parser exposes security vulnerabilities
           60876: MNT-10560: Security: The Apache Xerces XML parser exposes security vulnerabilities
           60887: MNT-10560: Security: The Apache Xerces XML parser exposes security vulnerabilities


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/V4.2.1/root@60909 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-01 20:05:48 +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
Alan Davis
504d1a2ae3 MNT-10493: Merged V4.2-BUG-FIX (4.2.2) to V4.2.1 (4.2.1)
60523: MNT-10490: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
      60522: MNT-10489: Merged V3.4-BUG-FIX (3.4.14) to V4.1-BUG-FIX (4.1.8)
         60521: MNT-10488: Merged CLOUD-R31 to V3.4-BUG-FIX (3.4.14)
            60520: HOTFIX MNT-10484 [Security] Any OS file can be retrieved via WebDAV
               - Change suggested by Viachaslau Tikhanovich at 24-Jan-14 05:14 PM GMT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/V4.2.1/root@60527 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-24 21:30:46 +00:00
Alan Davis
d4fa4b1562 MNT-10492: Merged HEAD-BUG-FIX (Cloud 33/4.3) to HEAD (Cloud 32)
60524: MNT-10491: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60523: MNT-10490: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60522: MNT-10489: Merged V3.4-BUG-FIX (3.4.14) to V4.1-BUG-FIX (4.1.8)
            60521: MNT-10488: Merged CLOUD-R31 to V3.4-BUG-FIX (3.4.14)
               60520: HOTFIX MNT-10484
                  - Change suggested by Viachaslau Tikhanovich at 24-Jan-14 05:14 PM GMT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@60525 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-24 21:16:47 +00:00
Alan Davis
d8162777ba BDE-239 (4.2) Identify tests starting the repository which are not in suites
- Merged DEV to V4.1.2 (4.2.1)
      59645,59650-59651,59653-59654,59663,59750-59751,59754-59755,59758,59762-59763,
	  59768,59770,59834,59841,59946,60111,60115


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/V4.2.1/root@60129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-19 07:30:49 +00:00
Pavel Yurke
64d53b32a4 Merged DEV to PATCHES/V4.2.1 (4.2.1)
58668 : MNT-10074 : Impossible to use CMIS AtomPub binding when Kerberos is enable
      - Kerberos filter should correctly restart authentication using Negotiate method if Basic was recieved.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/V4.2.1/root@59780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-13 10:38:27 +00:00
Pavel Yurke
4acc1d8352 Merged DEV to V4.2-BUG-FIX (4.2.1)
59316: MNT-10300 : recover site name with existing sitename
      - Throw WebScriptException and set status to 409 on duplicate child node name


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59498 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-08 08:55:46 +00:00
David Webster
72c36dfd5d Change Norwegian locale from nb_NO to just nb for MNT-9954. Also adds Norwegian to web-client-config.xml (it should have been there but was missing for some reason)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59432 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-06 16:09:55 +00:00
Pavel Yurke
e90feb524a Merged DEV to V4.2-BUG-FIX (4.2.1)
59385 : MNT-10277 : REST API: When updating blog post via WebScript 200 response is returned but blog post is not updated in fact
      - BlogPut webscript should returne 400 Bad request when blog post is updated. This web script was desinged for updating external blog configuration


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59400 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-06 07:39:46 +00:00
Pavel Yurke
7801394c65 Merged DEV to V4.2-BUG-FIX (4.2.1)
59354 : MNT-10271 : Alfresco Webscript - copy-to return wrong name 
      - Return Id of copied node on copy-to-webscript success


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59356 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-03 09:59:26 +00:00
Alan Davis
f4ed168615 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
59346: MNT-9771: Merged V4.1.7 (4.1.7.1) to V4.1-BUG-FIX (4.1.8)
      59313: MNT-10231 : CLONE: Version History shows incorrect creator for previous versions
         -  Java-backed webscript CommentsPost added. Also auditable behavior is disabled around creating comment-node
      59326: MNT-10231 : CLONE: Version History shows incorrect creator for previous versions
         -  Posting activity item added to CommentsPost web-script. Also copyright message and comments added, @since changed to 4.1.7.1
      59334: MNT-10231: Merged DEV to V4.1.7 (4.1.7.1)
         56938: MNT-9771 : Version History shows incorrect creator for previous versions
            - Added a test to reproduce this issue


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59348 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-31 11:42:13 +00:00
Alan Davis
be5b563dad Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
59264: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8) AGAIN!
      58707: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
         58676: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Delete associated groups on callback when archived site is purged. Add unit test for case.
      58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
         58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
         58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Return beforePurgeNode callback binding to Site class.
      58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
         58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
      58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
         58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59268 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-22 10:36:40 +00:00
Alan Davis
44c236573e Reverse Merge attempt at merging from V4.1-BUG-FIX (will do it again)
AND record only merge the original commits 59231,59239 and reverse merge 59262 that took place on V4.1-BUG-FIX   
   59237: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
      59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
         58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
            58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
               - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
            58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
               - Return beforePurgeNode callback binding to Site class.
         58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
            58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
               - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
         58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
            58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
               - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.
   59240: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
      59239: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
         - The merge of the HF commit on 4.1.6 removed a variable that was not being used, but
           was being used in later versions.
   59241: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
      - Correct error in merge from V4.1-BUG-FIX to V4.2-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59266 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-22 08:16:06 +00:00
Alan Davis
7f69061f29 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
      58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
         58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
         58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Return beforePurgeNode callback binding to Site class.
      58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
         58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
      58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
         58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-20 19:55:48 +00:00
Alan Davis
0877fc37d1 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
59230: MNT-10236: Merged V4.1.3 (4.1.3.19) to V4.1-BUG-FIX (4.1.8)
      58548: MNT-10066: BFSIT - Auto-complete target field causes Solr to become unresponsive
      The auto-complete feature of target field has been removed from BFSIT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59234 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-20 19:27:31 +00:00
Alex Mukha
22176d154d MNT-10075: Merged HEAD (4.3/Cloud) to V4.2-BUG-FIX (4.2.1)
58873: 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/BRANCHES/DEV/V4.2-BUG-FIX/root@59202 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-20 11:19:03 +00:00
Alex Mukha
1017d9ecbc Reverse Merged as it caused regression MNT-10075
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

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-20 11:09:49 +00:00
Pavel Yurke
76a27e1aa2 Merged DEV to V4.2-BUG-FIX (4.2.1)
57540: MNT-9883: Consumer can add document comments via API, bypasses UI security checks
    - Only users with 'AddChildren' permission can start discussions. 
   58305: MNT-9883: Consumer can add document comments via API, bypasses UI security checks
    - Add unit test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59106 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-18 10:08:26 +00:00
Pavel Yurke
e952aa3ef6 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
58919 : MNT-9205 : Search by IM property with spaces doesn't work
      - Using correct regexp to split search term. Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59042 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-16 14:48:58 +00:00
Alan Davis
5cd5d0739c Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
58896: Merged DEV to V4.1-BUG-FIX (4.1.8)
      58426 : MNT-10035 : DELETE thumbnails webscript returns 500 Error: "Cannot locate template processor for template org/alfresco/repository/thumbnail/thumbnail.delete.json"
          - Files to delete thumbnail was added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@58997 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-16 07:08:04 +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
Matt Ward
7dd4868a88 CLOUD-2230: Merged BRANCHES/DEV/HEAD-BUG-FIX to HEAD:
57950: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
        57946: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
           57944: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
              57942: MNT-9987: Merged V4.1.3 (4.1.3.17) to V4.1.7 (4.1.7)
                 57555: MNT-9849 : Files cannot be deleted over WebDAV with HF 4.1.3.16
                  Was added check for delete permission in webdav/DeleteMethod.
                 57686: MNT-9849 : Files cannot be deleted over WebDAV with HF 4.1.3.16
                    - Catch exceptions that might be thrown in TimerTask and causing the Timer to no longer accept tasks to be scheduled.
                    - Tidy up some variable names



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@58869 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-11 14:08:08 +00:00
Samuel Langlois
72c054376a Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1) for ALF-19407
58793: MNT-10136 Fix Maven poms: bring back chemistry-tck-atompub and junit as compilation dependencies, since CMISTestRunnerWebScript depends on them and is not a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@58795 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-10 12:17:30 +00:00
Matt Ward
4f17f8504e WebDAV: lowered misleading "no root node for request" logging to DEBUG level.
For cloud, /alfresco/webdav/desktop.ini should return a 404 (rather than a 500) and not log this message: this should be corrected next.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@58789 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-10 10:59:35 +00:00