- Merges from 5.1.0 (when it was 5.1) that did not make it to HEAD:
122506,122513,123118-123119
- RECORD ONLY Merges from HEAD: 119613-119617,119622,119706-119708,
119752-119753,120076-120078,120116,120166-120178,120182-120183,
120185-120193,120197-120201,120378-120385,120387,120431,120526,
120604-120625,120832-120842,120844-120849,120977-120982,121142-121144,
121313,121347-121348,121410,121412-121417,121684-121687,121802-121805,
121810-121815,121861,122287,122342,122361,122439-122441,122579,122921
- RECORD ONLY merges: 119602,119821-119822,119849,120065,120107,
120159,120260,120295,120339,120342,120371,120411-120412,120524,120527,
120696-120697,120705,120720,120746,120761,120819,120822,120893,
120935-120936,120993,121045,121119,121121,121132,121156-121157,
121299,121301,121309,121394,121408,121442,121481,121624,121626,
121672,121675,121692,121753,121795,121798,121852,121898,121981,
122030,122088,122114,122142,122213,122215,122217,122277,122340,
122343,122426,122487,122552,122554,122607,122654,122734,122861,
122906,122982,122985,122988,122996,123014,123031,123090,
123115-123117,123120
- Merge from 5.1.N of fix that should have gone into 5.1 (found because of conflict on merge)
123128: ACE-5155 Garbled message in patch-service.properties
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
122910 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
122808 adavis: MNT-15738 Property to disable transformers by use (e.g. doclib thumbnail generation) in 4.2 is not working
- Allow 'use' style properties to be set
- Combine 'use' properties more flexibly with the default ones.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
122918 adragoi: Reverse merged HEAD (5.1)
122540 adragoi: Merged DEV to HEAD (5.1)
122252 ACE-5093 : Allow file content URLs to be generated by a provider
- implemented TimeBasedFileContentUrlProvider,VolumeAwareFileContentUrlProvider and test classes
121979 ACE-5093 : Allow file content URLs to be generated by a provider
- added deprecated annotation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122921 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
122540 adragoi: Merged DEV to HEAD (5.1)
122252 ACE-5093 : Allow file content URLs to be generated by a provider
- implemented TimeBasedFileContentUrlProvider,VolumeAwareFileContentUrlProvider and test classes
121979 ACE-5093 : Allow file content URLs to be generated by a provider
- added deprecated annotation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@122918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
122668 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
122625 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
122548 rmunteanu: Merged DEV to V4.2.6 (4.2.6)
122546: MNT-14204: Enterprise bulkimport tool is not versioning for inplace import from two different batches
- If only version files are imported, version history is no longer removed and the version number is incremented
- Added new in-place import test and updated one streaming import test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
122540 adragoi: Merged DEV to HEAD (5.1)
122252 ACE-5093 : Allow file content URLs to be generated by a provider
- implemented TimeBasedFileContentUrlProvider,VolumeAwareFileContentUrlProvider and test classes
121979 ACE-5093 : Allow file content URLs to be generated by a provider
- added deprecated annotation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
122252 ACE-5093 : Allow file content URLs to be generated by a provider
- implemented TimeBasedFileContentUrlProvider,VolumeAwareFileContentUrlProvider and test classes
121979 ACE-5093 : Allow file content URLs to be generated by a provider
- added deprecated annotation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@122540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- MNT-12716: 3.4 -> 4.2 Upgrade does not migrate locales of translated documents
- ACE-5143: CLONE - CleanAlfPropTables deleting more than it should
- The move of the SQL execution framework to a ScriptExecutor seems to have dropped the feature allowing --ASSIGN to have a default value
- Added back the feature
- Added check of variable assignment with system message giving details e.g.
Caused by: ... Variable assignment '--ASSIGN:PROP_DOUBLE_MAX_ID' produced no value. A default can be assigned e.g. '--ASSIGN:PROP_DOUBLE_MAX_ID!-1'. (line 80 of ...\CleanAlfPropTables.sql).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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/BRANCHES/DEV/5.1.N/root@122427 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
122280 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
122237 amukha: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
122236 amukha: Merged AMUKHA/MNT-15509 (4.2.6) to V4.2.6 (4.2.6)
122202 amukha: MNT-15509: Changing a Site from Private to Public duplicates permissions
- Removed duplicate permissions for ScripNodes
- Added JUnit test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122341 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
121772 amorarasu: Merged DEV to 5.0.N (5.0.4)
120891 121263 amorarasu: MNT-14951: Using CMIS it is not possible to retrieve the secondary or the list of the parents of a folder
- Changed getObjectParents() to return all the parents, not just the first one.
- Added junit test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121800 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
121764 nsmintanca: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
121709 rneamtu: Merged DEV to V4.2-BUG-FIX (4.2.7)
121670 rneamtu: MNT-13814 : Using MS word Save As pdf does not work correctly.
- Added new mimetype "application/applefile" and set it for files that starts with "._"
- Added new test for case
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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/BRANCHES/DEV/5.1.N/root@121627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
120555: Merged DEV to 5.0.N (5.0.4)
120544 rneamtu: MNT-13723 : Error message not clear, when de-activating a model dynamically deployed and content still exists.
- Added externalized error message, generic for both delete and deactivate
- Do not merge this forward, it will be merged manually
120572: MNT-13723 : Error message not clear, when de-activating a model dynamically deployed and content still exists.
- Fixed failing tests
- Do not merge this forward, it will be merged manually
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121494 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
120912 jkaabimofrad: ACE-4924: Added a patch to ensure 'cm: extensions' and 'cm: module-deployments' folders within the surf-config folder exists, then adds the ALFRESCO_MODEL_ADMINISTRATORS Group to their Permission list.
- Also, added ALFRESCO_MODEL_ADMINISTRATORS to the permission list for surf-config folders (i.e. cm:extensions and cm: module-deployments) created on bootstrap of a new install.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120979 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
120957 rneamtu: Merged NESS/5.0.N-2016-01-05/ (5.0.4) to 5.0.N (5.0.4)
120843: MNT-14386 : renditionService.render method is creating a temporary file in User's trashcan
- Added temporary aspect on temporary rendition before delete it
120927: MNT-14386 : renditionService.render method is creating a temporary file in User's trashcan
- Added a test for case
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120969 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
120952 aleahu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
120889 amukha: Merged AMUKHA/MNT-15398 (4.2.6) to V4.2-BUG-FIX (4.2.6)
120887 amukha: MNT-15398: Supportability - warn about MS-SQL server mis-configuration
- Added a check for the db.txn.isolation to be set to 4096 for the MS SQL Server dialect.
- Used the message bundle for all logger messages.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120968 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
120786 amukha: Merged AMUKHA/PLAT-HEAD-2016-01-11 (5.1) to HEAD (5.1)
120772 amukha: ACE-4909: [Win 10, Chrome] - Site Members: Searching users with two chars results in wrapped exception
- Added a check if the tenant is disabled;
- Added JUnit test for disabled tenant and for deleted tenant.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120848 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
120772 amukha: ACE-4909: [Win 10, Chrome] - Site Members: Searching users with two chars results in wrapped exception
- Added a check if the tenant is disabled;
- Added JUnit test for disabled tenant and for deleted tenant.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@120786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
120517 nsmintanca: Merged NESS/5.0.N-2016-01-05 (5.0.4) to 5.0.N (5.0.4)
120487: MNT-14958: User cannot create public/public moderated site after set site.public.group to group id does not begin with 'GROUP_'
MNT-14958: User cannot create public/public moderated site after set site.public.group to group id does not begin with 'GROUP_'
-added check and exception threat for double-prefixed authorities
-added unit test
-formatted code; removed tabs
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120593 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
