2 Commits

Author	SHA1	Message	Date
Alan Davis	a4a7c5f8e7	Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) ... 99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE) 99482: Merged DEV to 5.0.N (5.0.1) 99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc typo in project alfresco-jlan 99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project alfresco-jlan 99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project core 99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project data-model 99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project file-transfer-receiver 99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project legacy-lucene 99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project qa-share 99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project remote-api 99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc in project Repository, letters S..Z 99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc in project Repository, letters A..R 99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project share-po 99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc typo in project slingshot 99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project slingshot 99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project solr 99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project solr4 99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project solr-client 99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project web-client 99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project web-framework-commons git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2015-03-27 23:00:01 +00:00
Dave Ward	91fcaf09dc	Merged V4.1-BUG-FIX to HEAD ... 39838: Minor fixes to yellowTheme rendering and title background 39871: ALF-610: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 39842: ALF-15294 CLONE Jodconvertor - no office manager available - Wire up 'startListener' logic better, so that it does not need to go in OpenOfficeContentTransformerWorker but in the SocketOpenOfficeConnection, which also avoids a test on start up. 39841: ALF-15294 CLONE Jodconvertor - no office manager available Changing the OOoDirect subsystem so that: - It will not start an OpenOffice process if the OOoJodconverter subsystem is also starting an process on the same port (8100 is still the default in both cases). An ERROR is logged on startup if there is a clash of ports. - It no longer tries to establishes a connection to an OpenOffice process if ooo.enabled is false, or there is a clash of port numbers with the OOoJodconverter subsystem. Both these checks are new. - ooo.enabled must now be true before it tries to connect to an OpenOffice process on a remote host (ooo.host must not be localhost). - It will no longer schedule a job to establish and test the connection if it is not being used. 39923: ALF-610: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 39922: ALF-15294 CLONE Jodconvertor - no office manager available - Start up problems with community version when the OOoJodconverter sub system is not there, because of the access to a Jod bean - Allow a default bean to be specified when the sub system bean could not be accessed. 39962: ALF-15158: Downloading Office 97 files with .doc extension result in file with .dot extension when using Google Chrome - Added more complete and intelligent content disposition header with the aim of supporting RFC 5987 39975: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX (Record Only) 39974: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX 39953: Refactored "Content I'm Editing" dashlet from synchronous (slowing down user dashboard initial display) to asynchronous client-side rendering. (ALF-13404) 39978: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_07_09 to BRANCHES/DEV/V4.1-BUG-FIX 39921: ALF-13473: IE9: can't login to awe. Upgrade YUI library to 2.9.0 for awe application. 39991: ALF-15339: Added empty-value check, caused group/user-search in workflows to fail 39999: Reversed revision 36174, thus removing Kofax 40025: Merged BRANCHES/V4.1 to BRANCHES/DEV/V4.1-BUG-FIX (Record Only) 40024: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/V4.1 40022: Fix for ALF-15144 - Slow Share doclib high-level folder browsing due to version history retrieval 40028: ALF-15346: Upgrade of Tika to 1.3-SNAPSHOT - Upgraded commons-codec from 1.4 to 1.5 - Upgraded commons-compress from 1.1 to 1.4.1 - Upgraded fontbox from 1.6.0 to 1.7.0 - Upgraded jempbox from 1.6.0 to 1.7.0 - Upgraded pdfbox from 1.6.0-patched to 1.7.0-patched - Upgraded metadata-extractor from 2.4.0-beta-1 to 2.6.2 - Upgraded poi-* from 3.9-beta1-20120329 to 3.9-beta1-20120801 - Upgraded tika-* from 1.2-20120518 to 1.3-20120801 - Added juniversalchardet version 1.0.3 - Added xmpcore version 5.1.2 - Added xz version 1.0 - Changed .classpaths, build.properties, and build.xml to correspond to above git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40268 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-08-09 17:24:37 +00:00