15908: Merged V3.1 to V3.2 (record only)
15907: Merged V3.2 to V3.1
15683: Fixed potential concurrency issues in HeartBeat and LicenseComponent
15972: Merged V3.1 to V3.2
15429: **Record only** I18N message IDs for JSF dashlets
15947: ETHREEOH-2565: The content size shown in the preview popup is incorrect
15952: Part of fix for ETHREEOH-2493 - missing html encoding on webscript 404 html status page.
15953: Fix for ETHREEOH-2364 - LDAP sync missing last name displayed as null.
15956: Fix for ETHREEOH-2714 - html encoding in Create New User summary page.
15957: Merged DEV-TEMPORARY to V3.1
15865: Fix for ETHREEOH-2673
15958: Merged DEV-TEMPORARY to V3.1
15885: ETHREEOH-2615: Localization Issue - Japanese UI
15959: Merged DEV-TEMPORARY to V3.1
15882: ETHREEOH-2644: Sending Email using Template throws exception
15962: Fix for ETHREEOH-2390
15963: Fix ETHREEOH-1962: Hibernate flush ordering incorrect for alf_qname
15965: Merged DEV/BELARUS/V3.1
15949: ETHREEOH-2689: When upgrading from 2.1.7e to 3.1.0e/3.1.1e user roles are mapped incorrectly
15966: Merged V2.2 to V3.1
15948: (RECORD ONLY) Backport of the fix provided for ETHREEOH-1719.
15969: Prep for ETHREEOH-2295 fixes and associated merges.
15970: Merged DEV-TEMPORARY to V3.1
14360: ETHREEOH-1571, ETHREEOH-1656, ETHREEOH-1404, ETHREEOH-953, ALFCOM-2650, ETHREEOH-1572, ETHREEOH-1574
15331: ETHREEOH-2295 - LayeredFile: Layer file/folder is present when original file/folder is removed
15824: ETHREEOH-2295 - higlight stale object
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/DEV/BELARUS/V3.1:r15865,15882,15885,15949
Merged /alfresco/BRANCHES/DEV/3.1SP2:r14360,15331,15824
Merged /alfresco/BRANCHES/V2.2:r15948
Merged /alfresco/BRANCHES/V3.1:r15907,15947-15962,15964-15970
Merged /alfresco/BRANCHES/V3.2:r15908,15972
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13409: Fix for ETHREEOH-1337 - to escape query characters in Site/People service filter methods.
13410: Fix for ETHREEOH-1272 - another missing pager control.
13425: Italian lang pack for TinyMCE editors. Fixes ETHREEOH-1491.
13430: Fix for ETHREEOH-1488.
Also IDs added to a couple of pagers - not causing a bug, but completes the pager fixes.
13464: Fix for ETHREEOH-1474 - now possible to use NTLM auth with Alfresco and SURF apps hosted in same app-server with same user browser session in different tabs.
Added additional NTLM filter debugging info for Session ID.
13483: Fix for ETHREEOH-1547 - System error happens when trying to create any Web Project.
Also fixes issue where webproject FormImpl objects did not deserialize correctly due to unsafe service call usage in constructor.
13501: Fix for ETHREEOH-965 - disallow guest login until explicit Guest support is added to Share.
13507: Fix for ETHREEOH-1586 - language selectable at login working again.
13512: Fix for ETHREEOH-1522 - wiki RSS feed template variable named incorrectly.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13598 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7575: Permission changes for AVM.
7577: Incorporated most of the feedback provided by Kevin C earlier today
7578: Removed directory not removed by patch
7579: EmailServer bug fixes
AR-1902: Double posts when emailing to a document
AR-1904: Attachments via email should be allowed on forum posts
AR-1903: (Partial Fix) Text attachments should be treated the same way as other attachments
7583: Fixed WCM-961 & WCM-962: Added confirm dialog for 'Delete All Deployment Reports' and 'Release Server' actions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8434 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7531: Merged V2.1 to V2.2
7397: Fix and improvments to all web-client People pickers - all now search on Username and build Lucene queries rather than XPath. Fixes AWC-853, AWC-935, AWC-1180, AWC-1660
Merge conflicts resolved around query strings and client session cluster changes
7532: Added action to go back to last deployment report in history panel
7533: Moved deploy actions to resources panel header in review task dialog
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8400 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7462: Renamed ManageLinkValidationTaskDialog to ManageReviewTaskDialog as it is now more generic
Enabled deployment and link validation in parallel review tasks
Created separate JSP page for manage change request task dialog
When a server is edited it is now scrolled to
Some minor UI tidyup
7467: Added ability to define excludes for a deployment via a regular expression
7475: Incorporated new icons from Linton
7492: Allows multiple callbacks for deployment. Adds new FAILED deployment event.
7493: Added ability to view previous deployment attempts
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8380 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7452: Fixes submit breakage.
7456: Patch to redeploy new submission workflow definition
7457: Added 'View Deployment' action to workflow sandbox so reviewers can examine the last attempted deployment
Added 'Allocated' field to server config, tooltip shows which store the test server is allocated to
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8363 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7422: Deployment UI changes
7424: Deployment UI changes
7426: Created 'More Actions' menu for user sandboxes and moved various actions into it
7428: Server config UI
7433: Added ability to deploy a workflow sandbox to a test server
7434: Fixed confusing comment
7442: Enabled users with contributor and reviewer roles to reserve a test server and deploy to it
7443: Preparation for auto deployment
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6500: Office 2003 Add-ins: Fix for AWC-1505
6501: Fix for AWC-1361
6502: Fixes for locking issues regrading expired content
6503: Fix for AR-1615
6504: WCM-444, WCM-288, WCM-735, WCM-480
6505: WCM-498 wasn't fully fixed
6506: Fix for AWC-1462
6507: Fix for WCM-741 (link validation report for staging sandbox can get stuck)
6508: AR-1650: WS Unit tests fail
6509: Fix for WCM-751 which also solves WCM-570 - also fixed issue to allow deletion of any "broken" webprojects created due to either of those bugs.
6510: Fix for WCM-546 (workflow history panel should be expanded by default)
6511: Fix AWC-1128
6512: Fixes to several to a couple of bugs found under concurrent load.
6513: Build fix for test using an invalid noderef (now stripped out as it does not exist)
6514: Add support for the QueryFile transact request to the IPC$ named pipe handler. Fix for AR-1687.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6436: Support for virtualized cookie paths, aggressive cleanup of sockets when virt server is down.
6439: Fix for WCM-619 & WCM-571
6440: Encoding of text/html files created inline using the web-client now has sensible default. AWC-1324.
6442: Fix for WCM-621 (reviewer can not view or run links report)
6443: Fix for AWC-1488. Dashboard
6444: Fix for WCM-693 issue with submitting a deleted directory if no workflow associated with web project.
6445: Icons for use in fix for WCM-522
6446: Office Add-Ins: Fix for AWC-1481 - Login dialog can appear recursively
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
