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
13129: Merged V2.1-A to V3.1
8598: Fix for ADB-41 (ACT 1657)
13139: Merged V2.1-A to V3.1
8674: First phase of using group display name in UI
13148: Merged V2.1-A to V3.1
8679: Completion of using group display name in UI
13149: Merged V2.1-A to V3.1
8690: Fixed ADB-33 again
13150: Merged V2.1-A to V3.1
8775: Fix ACT-2399
13152: Merged V2.1-A to V3.1
8941: ACT-2631: added max users message to send email action page
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13565 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
11509: ETHREEOH-394: Incorrect message in activity feed when user accepts an invitation to a site
11510: Fix to set position
11511: Fix for ETHREEOH-533: Dialogs access via ExternalAccessServlet return to blank empty container.jsp page when Close button is clicked
11512: Fix DM ACL deletion after merge forward for shared and defining ACLs.
11513: Merged V2.2 to V3.0
11501: Expose if set permissions are inherited or not and fix relatd behaviour for import/copy
11514: Fix for ETHREEOH-476 (Impossible to create Site Invite Workflow) & ETHREEOH-254 (Default value at 'Start Advanced Workflow Wizard' page)
11515: Fix for ETHREEOH-446 and ETHREEOH-447
11517: Fix for ETHREEOH-225: Web Forms with repeating elements don't work
11518: Merged V2.2 to V3.0
11343: ACL upgrades may require a COW - it now warns when this happens.
11369: Always lock against staging - ETWOTWO-763
11519: Merged V2.2 to V3.0
11467: Fixed ETWOTWO-774: CreateVersionTxnListener.afterCommit() throws NPE
11468: More defensive coding on AVM txn listeners (avoid NPEs)
11475: More defensive checks to avoid NPE
11520: Merged V2.2 to V3.0
11478: Keep creator and owner as orihinally set in AVM - Fix for ETWOTWO-604
11521: RuntimeExec: Added optional directive SPLIT: to force argument tokenization
11522: Limited tests to just check the command format not execute it for "dir . .."
11523: Undid revision 11520 (Merged V2.2 11478)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12449 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6556: AVM performance tweaks
6557: WCM-758.
6558: Fixes WCM-753.
6559: better handling of rename, copy and paste for form instance data and renditions. addresses WCM-752 and partially addresses WCM-559.
6560: Renamed JndiTest.java until we decide to keep it or not.
6561: Oops.
6562: probable fix WCM-669
6563: Build fix after the removal of flushing suport
6564: Fix for WCM-728
6566: Support for avm index clustering via tracking - WCM-762
6567: Test fix after flush changes
6568: Fixed AWC-1517: Can now create space based on existing top-level space
6569: misc IE fixes.
6570: Various changes to improve AVM import performance and submit performance.
6571: Session flushing is now deprecated and doesn't fail with an exception.
6572: Reduced the iteration count to stress nextResults calls a bit more
6573: WS query sessions put back into cache after more results have been fetched.
6574: AR-1347: RepositoryServiceSoapBindingStub.queryAssociated() returns nothing when direction=target
6575: Fixed AR-1680: XPath metadata extraction now handles Node, NodeList and String return values
6577: Fix for AWC-1518 (User Homes renaming issue, and unreported issue with client config overriding of users home location)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5141 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@51352 .
- FLOSS
- Some files will need a follow-up
-root/projects/repository/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java (not yet on HEAD: 5094)
-root/projects/repository/source/java/org/alfresco/filesys/server/state/FileStateLockManager.java (not yet on HEAD: 5093)
-onContentUpdateRecord (not on HEAD)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- New action "Email Space Users" available on the details page for a space
- Users/Groups explicity invited to the space are shown for emailing
- Email Space Users UI with new JSF component for hiearchical selection of users/groups
- Template based email to selected users/groups
. Refactored beans using template based email into a helper bean reusable by other classes
. Renamed the old template based Dashboard View (on doc/space details screens) to Custom View
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3610 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
