- 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
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
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
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
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
119072 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117355 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117262 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114826 gjames: BCRYPT RA-609: Not double hash encoders if not safe so fixing the test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119911 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
119051 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117333 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117241 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114510 adavis: Merged BCRYPT to 5.0.2-CLOUD
113765 gcornwell: MNT-14892: Users password now gets re-hashed when they login if it is not using the preferred encoding (removes old MD4 and SHA encoded passwords)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119889 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
ACE-4716 Can't rename a document in a virtual context from CMIS
ACE-4752 Type virtualization method does not work
ACE-4717 Document name is renamed when making "Check in" for a document edited in Google Docs
ACE-4700 Can't upload to a virtual folder when filename starts with a number and includes dashes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119450 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
117318: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
117293: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
- Changed the ClassBehaviourIndex#find as the main logic is handled by BehaviourFilterImpl#isEnabled
- Updated the BehaviourFilter interface accordingly.,
115822: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
- Reworked the solution to use only one new method: disable(QName className, boolean includeSubClasses)
- Modified the isEnabled(QName className) to correspond with the new logic
- Modified the JUnit tests.,
115078: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
115071: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
- Added new API for disabling behaviours.
- Added JUnit tests.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
117189 adavis: BDE-443 Check whether we can buy licenses for the GPL components we ship
- Removed unit test RenditionServiceIntegrationTest.testRenderPdfDocumentToFlash
The only one that failed in the build.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
