17251: Merged DEV-TEMPORARY to V3.2
17225: ETHREEOH-1938: Empty 'Output path pattern' can be saved -Create Web Project wizard -step 4
17252: Removed old stuff; added proprietary db config
- (Merge: Only put PostgreSQL in)
17260: Merged V3.1 to V3.2
17028: Merged V2.2 to V3.1
17027: *RECORD ONLY* Fix for ETWOTWO-1158 - login.jsp does no longer redirects authenticated users.
17220: Fix for ETHREEOH-3077 Empty 'Title' can be saved -Create Web Project wizard -step 4
17221: Fix for ETHREEOH-1363 Next button is enabled when mandatory fields ...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18031 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
10982: Merged V2.1 to V2.2
10273: Fix for ETWOONE-317: Error from regenerate renditions wizard when templates are updated
10985: Merged V2.1 to V2.2
10717: Fix for ETWOONE-14: System Error message appears while clicking 'Manage Task' icon in ...
10742: Fix for ETWOONE-119: A user created with space characters at the begin and at the end can't login
10758: Fix for ETWOONE-183: URL addressability of forum spaces and topics
10760: Fix for ETWOONE-339: URL Addressability to discussions causes display issue
10761: Fix for ETWOONE-196: Attempt to post to the same forum by two or more users simultaneously leads to error appearance and impossibility to post for some of them
10772: Fix for ETWOONE-225: Validation.js does not properly handle trailing whitespace
10986: Added Hibernate src to Eclipse project
11004: Remove annoying exceptions on shutdown
11005: Minor javadoc fix
11012: Fixed ETWOTWO-423: Optionally inject the Open Office document converter instance to the transformer
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11202 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- fixed navigation issue with editing rules
- added links to details pages in forums area
- you can no longer create spaces, forums or topics with illegal characters in the name
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
