Commit Graph

1603 Commits

Author SHA1 Message Date
Raluca Munteanu
27333f1d39 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/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
386a4aca06 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/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:03:25 +00:00
Raluca Munteanu
9a889c69ea 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/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Raluca Munteanu
8fbfc61c54 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124493 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124467 amorarasu:       Reverse merged 5.0.N (5.0.4)
               124430 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
                  124322 adragoi: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
                     124254 amorarasu: MNT-15848: The PublishingRestApiTest.testPublishingQueuePost intermittently fails on SQL Server
                        - scheduled post publishing after 1500 milliseconds, to have time to test the SCHEDULED status.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124521 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-28 08:02:25 +00:00
Raluca Munteanu
cbad8bc789 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124488 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124430 aleahu:       124430 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               124322 adragoi: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
                  124254 amorarasu: MNT-15848: The PublishingRestApiTest.testPublishingQueuePost intermittently fails on SQL Server
                     - scheduled post publishing after 1500 milliseconds, to have time to test the SCHEDULED status.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-28 08:00:08 +00:00
Alexandra Leahu
3506ab2896 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124423 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124409 cturlica: MNT-15715: CLONE - The file extension of any unknown mimetype is lost during download and replaced by .bin.
         - Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               122029 amukha: MNT-14412: The file extension of any unknown mimetype is lost during download and replaced by .bin.
                  - Now the mimetype guessing is not done for IE if the mimetype is binary (possibly unknown for Alfresco)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124450 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-24 14:35:39 +00:00
Andreea Dragoi
eea38e0590 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124349 adavis: Merged 5.1.0-CLOUD43 (Cloud ) to 5.1.N (5.1.2)
      123596 skopf: ACE-2540


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124367 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-22 14:33:37 +00:00
Ancuta Morarasu
57c39e6ab1 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124146 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124109 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124108 amorarasu: MNT-15801 : onContentUpdate policies not working for updates via webdav
            - Fixed code merged from 4.1.N, a different LockInfo method is used.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124229 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:50:57 +00:00
Ancuta Morarasu
0fd5997ed2 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124145 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124106 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124105 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
            123915 rmunteanu: Merged V4.1.7 (4.1.7.18) to V4.1-BUG-FIX (4.1.11)
               MNT-15801 : onContentUpdate policies not working for updates via webdav
                  - Reverted changes made for MNT-11185 and MNT-10966 , reverts that will fix MNT-15746
                  - Changed fix for MNT-5882 by adding the ASPECT_NO_CONTENT after the content is updated, this way preventing MNT-10966 from reproducing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124228 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:50:49 +00:00
Alan Davis
7a8ad6e632 Merged 5.1.N (5.1.1) to HEAD (5.2)
123429 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      123347 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123049 rmunteanu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122966 rneamtu: MNT-15679: Delete comment updates the "Modifier" and "Modified date" properties of a file
               - Fixed compilation error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:34:47 +00:00
Alan Davis
d62ac8b95a Merged 5.1.N (5.1.1) to HEAD (5.2)
123428 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      123346 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123048 rmunteanu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122964 rneamtu: MNT-15679: Delete comment updates the "Modifier" and "Modified date" properties of a file
               - Fixed failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123703 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:34:39 +00:00
Alan Davis
6da9f1acc7 Merged 5.1.N (5.1.1) to HEAD (5.2)
123426 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      123344 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123045 rmunteanu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122858 rneamtu: MNT-15679: Delete comment updates the "Modifier" and "Modified date" properties of a file
               - Java-backed webscript CommentDelete added
               - Auditable behavior is disabled around deleting comment-node
               - Added unit test for case: CommentsApiTest.testDeleteCommentDoesNotChangeModifiedDate


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123701 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:34:24 +00:00
Alan Davis
b11b750d29 Merged 5.1.N (5.1.1) to HEAD (5.2)
122555 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122499 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122438 rneamtu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122396 amorarasu: MNT-13739: Site consumers are able to lock documents (they did not create) via WebDAV
               - Fixed failing tests + added a test for moving locked nodes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123677 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:31:16 +00:00
Alan Davis
26b47e74dd Merged 5.1.N (5.1.1) to HEAD (5.2)
122553 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122494 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122434 rneamtu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122333 amorarasu: Merged DEV to V4.2.6 (4.2.6)
               121922 122190 122271 122292 amorarasu: MNT-13739: Site consumers are able to lock documents (they did not create) via WebDAV
                  - Went back to using the secured lock service
                  - Unlock resource after MOVE only if the it was locked


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123676 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:31:09 +00:00
Alan Davis
7bcccda334 Merged 5.1.N (5.1.1) to HEAD (5.2)
122427 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      122412 nsmintanca: MNT-15642 CLONE - Request to join a moderated site multiple times
         -added validation on backend to prevent multiple requests for joining a site
         -updated unit tests
         -added widget to display "Cancel request" button


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:25:47 +00:00
Alan Davis
2d6b854cc5 Merged 5.1.N (5.1.1) to HEAD (5.1)
121691 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      121100 amorarasu: Merged DEV to 5.0.N (5.0.4)
         120779 amorarasu: MNT-14416: Click the document uploaded via protocol like AOS in Share site My Activities will take you to a folder view
            - Set null path for newly created files.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:42:48 +00:00
Alan Davis
1ca60fc47a Merged 5.1.N (5.1.1) to HEAD (5.1)
121627 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      121496 arebegea: MNT-14409 : Unable to configure search filter for TAG/SITE via extension
         - Modified the SolrFacetConfig QName resolver to use the FacetQNameUtils that was also used when added a filter from Share
         - Had to move the FacetQNameUtils and the test class FacetQNameUtilsTest to repository project
         - Added the FacetQNameUtilsTest test to the AllUnitTestsSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123645 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:42:09 +00:00
Alan Davis
2fc7b70449 Merged 5.1.N (5.1.1) to HEAD (5.1)
120777 aleahu: MNT-15480 : Intermittent failure  WebDAVMethodTest.expiryLockTest()
      - Increased timeout


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123629 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:39:56 +00:00
Alan Davis
98a4e139b4 Merged 5.1.N (5.1.1) to HEAD (5.1)
120594 cturlica: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120538 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123625 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:36:35 +00:00
Alan Davis
33bb9e3ad3 Merged 5.1.N (5.1.1) to HEAD (5.1)
120443 arebegea: Revert Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120350 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123622 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:36:10 +00:00
Alan Davis
d3d2a6612a Merged 5.1.N (5.1.1) to HEAD (5.1)
120429 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120350 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123621 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:36:00 +00:00
Alan Davis
de829cb701 Merged 5.1.N (5.1.1) to HEAD (5.1)
120428 arebegea: Revert Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120350 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:35:51 +00:00
Alan Davis
21549b96bc Merged 5.1.N (5.1.1) to HEAD (5.1)
120414 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120386 abozianu: Merged DEV to 5.0.N (5.0.4)
         120352 abozianu: MNT-14411 : Re-created user can't cancel created task
            - fix and unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:35:42 +00:00
Alan Davis
58efe344c2 Merged 5.1.N (5.1.1) to HEAD (5.1)
120413 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120350 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123618 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:35:34 +00:00
Alan Davis
021911fad0 Merged 5.1.N (5.1.1) to HEAD (5.1)
118424 cturlica: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      118394 amukha: Merged 5.0.1 (5.0.1.14) to 5.0.N (5.0.4)
         117907 abalmus: MNT-14631 : REST Processes and Tasks API for parameters/variables allowed MATCHES operator, operator is not case-insensitive
            - Fix on Alfresco side, test and updated pom.xml to use new Activiti jar


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123593 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:30:06 +00:00
Alan Davis
0e0e903b61 Merged 5.1.N (5.1.1) to HEAD (5.1)
117597 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      117582 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
         116652 amorarasu: MNT-14983: CMIS: Euro character not encoded correctly
            Merged V4.2.4 (4.2.4.19) to V4.2-BUG-FIX (4.2.6)
               115140 115998 116396 amorarasu: MNT-15044: CLONE - CMIS: Euro character not encoded correctly
                  - Removed the unicode interval that was used to escape characters from the categories: currency, general punctuation, subscripts and superscripts (2000-20FF).
                  - Changed the way the control characters are filtered + adapted tests.
                  - Removed unnecessary j_string use from the ftl and added proper xml encoding.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123586 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:27:03 +00:00
Alan Davis
2dc9c635c9 Merged 5.1.N (5.1.1) to HEAD (5.1)
115951 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      115852 cturlica: Merged DEV to 5.0.N (5.0.3)
         115849 cturlica: MNT-14367: Unable to connect to CMIS 1.0 and CMIS 1.1 API URL in 5.0.1 only with Kerberos SSO enabled
            - fixed issue caused by re-logon specific restart by the kerberos filter that shouldn't cause the SSO fallback (if fallback SSO is enabled)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123585 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:26:55 +00:00
Alan Davis
bd7b19bb61 Merged 5.1.N (5.1.1) to HEAD (5.1)
114992 rmunteanu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      114940 cturlica: Merged DEV to 5.0.N (5.0.3)
         114938 cturlica: MNT-14367: Unable to connect to CMIS 1.0 and CMIS 1.1 API URL in 5.0.1 only with Kerberos SSO enabled
            - added default fallback for new CMIS URLs and the possibility to disable this fallback if needed (new properties)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:26:29 +00:00
Alan Davis
0cc1587581 Merged 5.1.N (5.1.1) to HEAD (5.1)
114226 abozianu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      114208 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         114103 mrogers: MNT-14685 Fix to ISO8601Converter.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:26:21 +00:00
Alan Davis
1f322c24f3 Merged 5.1.N (5.1.1) to HEAD (5.1)
114225 abozianu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      114207 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         114064 mrogers: Merged DEV to V4.2-BUG-FIX
            112453 : 	MNT-14685	ISO8601Converter throws ClassCastException


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:26:13 +00:00
Tatyana Valkevych
74897b5af4 ACE-5040: Merged 5.1.N (5.1.1) to HEAD (5.1)
120106 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120071 rmunteanu: Merged 5.0.3 (5.0.3) to 5.0.N (5.0.4)
         119848 adragoi: Merged DEV to 5.0.3 (5.0.3)
            119808 adragoi: MNT-15338 : CMIS get object by path only shows the working copy file and not the original file
               - reverted commits related to "Ghost versions when Document is created with CheckinType CHECKOUT" stask :  
               100772 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  100260: MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                     - Fix for tests failures
               100824 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                     100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                        99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                           - Don't include PWC in a version series
                        99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                           - Return PWC as a part of version series. Fixes to pass TCK
               100837 : Fix another merge issue as a result of a re factor that has taken place in 5.0
                  Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                     100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                        100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                           99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                              - Don't include PWC in a version series
                           99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                              - Return PWC as a part of version series. Fixes to pass TCK
               101404 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  101273: Merged DEV to V4.2-GUB-FIX (4.2.5)
                     100792 : MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                        - Added init-method for CMISConnector. Test is added
               101597 : Merged DEV to 5.0.N (5.0.2)
                  101560 : MNT-13813 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                     - Fix to test failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@121388 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 12:16:13 +00:00
Jean-Pierre Huynh
f8fa061ba3 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119558 gcornwell: Merged code coverage improvements to 5.1-MC1 (5.1.0)
      r117774 gjames: RA-567: Increase /workflow/processes API code coverage
      r117773 gjames: RA-567: /workflow/processes coverage, removed unused ActivitiTypeConverter
      r116883 gjames: RA-531: reapplied change after merge, for MultiTServiceImpl test coverage
      r116629 gjames: RA-568 Increase /workflow/process-definitions API code coverage
      r116574 gjames: RA-569 Increase /workflow/tasks API code coverage
      r116286 gjames: RA-567: Increase /workflow/processes API code coverage
      r115853 gjames: RA-566: Increasing /people api coverage (description field)
      r115811 gjames: RA-566: Increasing /people api coverage
      r113007 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DynamicNamespacePrefixResolver RA-521
      r113006 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DictionaryComponent RA-514
      r112969 gjames: Adding additional test coverage for TemplateServiceImpl RA-530
      r112960 gjames: Alternative test approach for ModuleServiceImpl RA-520
      r112703 gjames: Adding additional test coverage for NodeLocatorService RA-522
      r112702 gjames: Adding additional test coverage for JobLockServiceImpl RA-516
      r112699 gjames: Adding additional test coverage for ModuleServiceImpl RA-520
      r112508 gjames: Adding additional test coverage for RenditionServiceImpl RA-526
      r112476 gjames: Adding additional test coverage for ContentServiceImpl RA-513
      r112475 gjames: Adding additional test coverage for MimetypeMap RA-519
      r112238 gjames: Adding additional test coverage for MimetypeMap RA-519
      r112237 gjames: Adding additional test coverage for TaggingService RA-529
      r112236 gjames: Adding additional test coverage for MultiTServiceImpl RA-531
      r112206 gjames: Adding additional test coverage for ContentServiceImpl RA-513
      r112167 gcornwell: RA-523: Increase NodeService code coverage (removed redundant code that was testing a version store we no longer use)
      r112102 gjames: Reverted changes to PermissionServiceImpl for RA-524
      r112048 gjames: Temporarily removed some PermissionServiceImpl code. I need to put it back.
      r111620 gjames: Adding additional test coverage for PermissionService RA-524
      r111619 gjames: Added some @Override to make Sonar happier
      r111456 gjames: Adding additional test coverage for AuthenticationService RA-509
      r111427 gjames: Adding additional test coverage for AttributeService RA-509
      r111317 gjames: Adding additional test coverage for WorkflowService RA-533


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:35:05 +00:00
Jean-Pierre Huynh
e0ff2eacee Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119083 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      118660 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         118618 gjames: RA-607 BCRYPT Improved the logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119924 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:22:01 +00:00
Jean-Pierre Huynh
921dbb04ae Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119082 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      118568 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         118398 gjames: RA-607 BCRYPT Improved the logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:17:10 +00:00
Jamal Kaabi-Mofrad
6f569467af ACE-4823: Fixed "list of a person's site memberships" REST API which only returned one of the two sites with identical titles.
- Also, fixed code standards.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119747 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 18:29:10 +00:00
Tom Page
ee8bd08296 ACE-4766 Fix intermittent unit test.
Previous fix for this issue changed the unit test to be consistent with the
alfresco-text-gen library, so that they both counted characters. Actually both
should count bytes. Fix the library to count bytes, update the dependency and
revert the change to the testLoad_15_default unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118819 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-30 08:51:28 +00:00
Tom Page
98db032925 ACE-4766 Fix intermittent unit test by verifying number of characters.
Previously we were verifying the number of bytes, which failed for strings
containing non-ASCII characters (such as £).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-27 10:13:18 +00:00
Gethin James
9421091283 ACE-4578 Workflow ProcessDefinitions Public Api doesn't use orderBy, fixed and added tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116443 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-06 15:30:31 +00:00
Alan Davis
4b2179865b Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115549 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      112033: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0)
         111936: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            111829: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               111784: Merged DEV to V4.2.5 (4.2.5)
                  111783: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - Extended QueryLikeTest in order to create test data folder with temporary aspect.,
      112919: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         112547 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112542: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               111974: Merged DEV to V4.2.5 (4.2.5)
                  111967: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - skipped deletion of test data,
      114016: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113902 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113818 abozianu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113605 adragoi: Merged DEV to V4.2.5 (4.2.5)
                  113579: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - skip deletion for test data for QueryForObject and QueryInFolderTest 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115686 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:16:17 +00:00
Alan Davis
114566a80e Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115475 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      114837 rmunteanu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114758 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114713 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114616 abozianu: MNT-14994: CLONE - Alfresco Mobile: All Sites is throwing error when listing sites
                  - added unit tests
                  - ran all test cases in a single test to improve the testing time by using the same test data


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115684 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:16:00 +00:00
Alan Davis
8361ff9820 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115473 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      114742 rmunteanu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114701 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114590 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114466 abozianu: MNT-14994 : CLONE - Alfresco Mobile: All Sites is throwing error when listing sites


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115682 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:15:02 +00:00
Alan Davis
b1577072fc Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115466 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      114587 amorarasu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114483 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114306 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114282 adragoi: Merged DEV to V4.2.5 (4.2.5)
                  114252: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - configured cmis tck timeout in tests property file


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:11:44 +00:00
Alan Davis
5d8d16d2fc Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115426 adavis: ACE-4520: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      << All the MNT-13871 commits at the end of phase 2 testing of 4.2.5 >>
      111899: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0) (PARTIAL MERGE)
         111834: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            111589: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
               111531: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
                  -  Added small changes required for compilation of authorization module.,
      111901: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0) (PARTIAL MERGE)
         111836: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            111765: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               111600: Merged V4.1-BUG-FIX (4.1.11) to PATCHES/V4.2.5 (4.2.5)
                  MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                     - Extra changes that are required to make authorization module build green.,
      112553: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         112540: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112447: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Added configuration required to compile authorised-users module.,
      113101: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         112930: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112707 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               112677 dvaserin: MNT-14780 (MNT-13871): Licence Error message when in overage
                - Place overage buffer information into License MBean and use it in admin license ftl.
               112634 adavis: MNT-13871: Merged DEV (V4.2.5-MNT-13871-LATEST) to V4.2.5 (4.2.5)
                  111550: Merged DEV (4.1.11) to DEV (4.2.5)
                     MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                        - Merged all made changes in core alfresco projects as single commit to fresh dev branch forked from V4.1-BUG-FIX.
                     MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                        - added try/finally approach to reset show delete users flag to default value.,
                  111574: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
                     - Added V4.2.5 specific changes.,
                  111582: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
                     - Updated the jar to correspond with the latest changes in authorised-users/4.2,
                  111751: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
                     - Removed unnecessary configuration.,
                  111752: Merged DEV (V4.1.11) to DEV (V4.2.5)
                     111632: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                        - Fixed unit tests for build plan: https://bamboo.alfresco.com/bamboo/browse/DEV-ENT414-1,
                  111753: Merged DEV (4.1.11) to DEV (V4.2.5)
                     111719: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                        - Updated authorization related icons with ones provided by Mark Howarth.
                        - Information message in Deauthorize Dialog was changed to the on provided by Mark Howarth.,
                  111754: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                     - Updated to the latest authorised-users lib.,
                  111761: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
                     - Fix for the SchemaReferenceFileTest.,
                  111800: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
                     - Modified the test to create a tenant in a retrying transaction to solve the DataIntegrityViolationException.,
                  111801: Megred DEV (4.1.11) to DEV (4.2.5)
                     111795: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                        - Updated Deleted column to display text instead of tick icon.
                        - Added name for actions column.,
                  111813: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
                     - Updated to the latest authorisation jar to fix the Scema Reference test.,
                  112020: MNT-14775: De-authorisation pop-up has similar title to first line of text
                    - Remove the duplicated text from the pop-up body
                    - Updated link to point the 4.2 documentation,
                  112134: MNT-14763: [UserAuth] New entries are added in the authorization table for each different username case
                   - Update authorization jar,
                  112144: MNT-13871: Optimized strings in users.get.properties,
                  112184: MNT-14762 : [UserAuth]Users from the ALFRESCO_ADMINISTRATORS LDAP group are not pre-authorized
                     - Updated authorized-users jar with fix for ldap administrators pre-authorization.,
                  112196: MNT-14729 : [UserAuth] The column header for the Deauthorize and Reauthorize button should have a name
                     - Updated name for re/de-authorize actions column.,
                  112202: MNT-14763: [UserAuth] New entries are added in the authorization table for each different username case
                   - Add new authorization jar to fix null errors,
                  112203: MNT-14779: System behaviour when system set read only due to licence exception
                   - Force read-write transaction for LoginPost script.,
                  112225: MNT-14763: [UserAuth] New entries are added in the authorization table for each different username case
                   - Add new authorization jar after unit test fixing.,
                  112226: MNT-14740 : [UserAuth] The message for the failed re authorization is not displayed onIE
                     - Code for reloading page was wrapped with YAHOO.lang.later() function.,
                  112247: MNT-14747 : [UserAuth]The Autorization State isn't change when the user logs via FTP.
                     - Updated authorization jar with fix for kerberos unit test.,
                  112259: MNT-14776: Heading banner text when using all allowed authorised users.
                     - Changed the message.
                     - Updated the authorised-users jar.,
                  112269: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
                   - Wrap methods that uses 'authenticationComponent.setCurrentUser' into RetryingTransaction for retrying on DataIntegrityViolationException.,
                  112285: MNT-14747 : [UserAuth]The Autorization State isn't change when the user logs via FTP.
                     - Updated version for authorized-users jar.,
                  112388: MNT-14809: [UserAuth] On a cluster setup after running the hourly job only one node goes into R/O mode
                     - Updated the authorised-users.jar,
                  112439: MNT-14815 : Wrong documentation link used in the deauthorize message window
                     - Corrected link to documentation.,
                  112445: MNT-14818 : [UserAuth] Missing quotation mark in the user reauthorization window message
                     - Corrected message for reauthorization dialog.,
                  112450: MNT-14802: [UserAuth] License warning message displayed for all the users
                     - Updated the authorised-users jar.,
                  112454: MNT-14780: Licence Error message when in overage
                   - Make license warn messages on admin console the same as banner warn messages.,
                  112471: MNT-14773 : Sort state not persisted after authorisation action
                     - Sorting/paging state is now persists in sessionStorage.,
                  112478: MNT-14773 : Sort state not persisted after authorisation action
                     - Corrected previous fix.,
                  112483: MNT-14814: [UserAuth] System goes into R/O mode after running the hourly job
                     - Updated the authorised-users jar to the latest version.,
                  112512: MNT-14833: [UserAuth] User cannot login on both nodes (cluster env.)
                   - Update authorization jar.,
                  112556: MNT-14787: [UserAuth] Login via NFS works when the license limit exceed
                     - Modified the exception handling of setCurrentUser method. Now all the exceptions are rethrown.,
                  112570: MNT-14838: Correct the Max Users string in the Admin Console License Screen
                     - Corrected the string, remove the incorrect translations from the bundle.,
                  112572: REVERSE MERGED  <<code is not worth to implement>>
                     112471 : MNT-14773 : Sort state not persisted after authorisation action
                        - Sorting/paging state is now persists in sessionStorage. 
                     112478 : MNT-14773 : Sort state not persisted after authorisation action
                        - Corrected previous fix. ,
                  112610: MNT-14837 : Report license overage to the log files on authorization/deauthorization of users
                     - Updated users authorization jar file.,
                  112627: MNT-14839: [UserAuth]Alfresco goes in read -only after reauthorize a user from LDAP ALFESCO_ADMINISTRATORS group
                     - Updated the authorised-users jar to the latest version.
         Merged DEV (V5.0.2-MNT-13871) to 5.0.N (5.0.3)
            111954: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Removed context reference to authorization.,
            112003: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               -  Added copying of sources and configuration from authorised-users to the output directory during build.,
            112014: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Modified the build configuration to unpack the resources to the test folders.,
            112027: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Added unpacking of authorisation resources to repoitory-crypto project.,
            112067: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Removed unpacking of resources, changed the context imports to point to authorization.,
         112952: Merged DEV (V5.0.2-MNT-13871) to 5.0.N (5.0.3)
            111887: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Corrected the authorised-users version to correspond to 5.0.,
         113060: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113059 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113058 adavis: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
                  - Version dependency for alfresco-authorised-users moved to top level pom,
      113103: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113036 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113030 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113019 amukha: MNT-14862 MNT-13871: [UserAuth] Login via FTP works when the license limit exceed
                  - Corrected the AlfrescoFtpAuthenticator to rollback teh transaction if an exception was thrown.,
      113215: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113213 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
            113209 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113124: MNT-13871: MNT-14875: The table creation code for authorised-user (MNT-13871) need to be moved back into the main Alfresco code base
                  - Added the scripts to the main code base.
                  - Updated the authorised-users.jar,
               113203: MNT-13871: MNT-14875: The table creation code for authorised-user (MNT-13871) need to be moved back into the main Alfresco code base
                  - Moved the patch to the main code.
                  - Updated the authorised-users.jar
               113128: MNT-14867 (MNT-13871) : [UserAuth] License user limit exceeded by adding users to ALFRESCO_ADMINISTRATORS LDAP group
                  - Updated auhtorised-users jar.,,
      113246: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
         - Try to fix one of the two build errors on 5.1.N as a result of r113101,
      113578: MNT-14901 MNT-13871: 4.2.5 User Auth code merged to 5.1.N caused 2 build failures
         - Fixed the test SiteServiceImplTest.testGroupMembership ,
      113647: MNT-14901 MNT-13871: 4.2.5 User Auth code merged to 5.1.N caused 2 build failures
         - Fixed the test SiteServiceImplTest.testListSiteMemberships that failed after testGroupMembership was fixed, but didn't delete the created site.,
      113935: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113924 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113914 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113903 gbroadbent: GERMAN: Updated bundle based on EN-rev112938,
      113936: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113925 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113915 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113904 gbroadbent: SPANISH: Updated bundle based on EN-rev112938,
      113937: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113926 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113916 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113905 gbroadbent: FRENCH: Updated bundle based on EN-rev112938,
      113939: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113927 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113917 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113906 gbroadbent: ITALIAN: Updated bundle based on EN-rev112938,
      113940: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113928 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113918 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113907 gbroadbent: JAPANESE: Updated bundle based on EN-rev112938,
      113941: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113929 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113919 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113908 gbroadbent: NORWEGIAN Bokmal: Updated bundle based on EN-rev112938,
      113942: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113930 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113920 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113909 gbroadbent: DUCTH: Updated bundle based on EN-rev112938,
      113943: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113931 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113921 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113910 gbroadbent: BRAZILIAN PORTUGUESE: Updated bundle based on EN-rev112938,
      113944: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113932 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113922 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113911 gbroadbent: SIMPLIFIED Chinese: Updated bundle based on EN-rev112938,
      113945: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113933 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113923 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113912 gbroadbent: RUSSIAN: Updated bundle based on EN-rev112938,
      114046: MNT-14901 MNT-13871: 4.2.5 User Auth code merged to 5.1.N caused 2 build failures
         - Removed the hardcoded value in the test.,
      114589: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114485 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114335 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
               114334 amukha: MNT-14984 MNT-13871: Modification to the User Authentication Warning wording.
                  - Changed the warning message.,
      114828: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114749 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114703 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114574 gbroadbent: GERMAN: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114829: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114750 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114704 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114575 gbroadbent: SPANISH: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114830: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114751 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114705 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114576 gbroadbent: FRENCH: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114831: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114752 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114706 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114577 gbroadbent: ITALIAN: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114832: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114753 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114708 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114578 gbroadbent: JAPANESE: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114833: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114754 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114709 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114579 gbroadbent: DUTCH: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114834: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114755 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114710 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114580 gbroadbent: RUSSIAN: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114835: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114756 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114711 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114593 gbroadbent: SIMP CHINESE: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114836: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114757 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114712 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114594 gbroadbent: NORWEGIAN Bokmal: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:09:37 +00:00
Mark Rogers
120c260353 ACE-4493 - [Upgrade] Workflow Type filter is not applying for some activiti workflows after upgrade from 4.1.10
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115157 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-26 12:04:40 +00:00
Jamal Kaabi-Mofrad
8855ef66f8 ACE-4469: Merged BRANCHES/DEV/HEAD-SFS (cherry picked) to HEAD
113520: SFS-179: Added multipart upload support into Public API framework.
   114561: SFS-179: Added tests for upload API, as well as minor fixes.
   114732: SFS-179: Changed the assert import from 3.X to 4.X.
   114734: SFS-179: Added unit tests for Public API framework multiPart support.
   114735: SFS-179: Fixed unit test failure.
- Also removed mergeinfo added in r112639

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-19 23:25:59 +00:00
Ray Gauss
a4c853d923 ACE-4248: Not able to preview 'webm' file in FireFox browser which is uploaded in the site document library
- Added check for invalid range requests with start greater than end
  - Added HttpRangeProcessorTest

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-16 15:21:18 +00:00
Steven Glover
9e464241db ACE-4347 "5.1 Build has had three transient failures related to locking"
Increase the logging for the failing tests to DEBUG so that we can see what's happening during the next failure

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114288 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-13 16:13:02 +00:00
Alan Davis
7a7818f1ec Merged 5.1.N (5.1.1) to HEAD (5.1)
113251 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      113194 abalmus: Merged DEV to 5.0.N (5.0.3)
         113149: MNT-13706 : Admin console unusable after we set any  busy port in Port Number Value for subsystem
            - Fixed issue that caused ACE-4194


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@113287 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-29 06:00:22 +00:00
Andrew Hind
6efcc5f134 Fix for ACE-4089 SOLR 4 - sharded - Remove the requirement for shard configuration on the Alfresco One Platform
- added basic index state, refined property bags, slaves register, fix config read from wrong property bag

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111421 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-03 13:48:24 +00:00
Andrew Hind
a57feb95b4 Fix for ACE-4089 SOLR 4 - sharded - Remove the requirement for shard configuration on the Alfresco One Platform
- vanilla support - currently not enterprise only and does not support slave shards

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111382 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-03 10:37:33 +00:00