16725: Merged V3.1 to V3.2
16721: Merged DEV/BELARUS/V3.1 to V3.1
16483: Fix for ETHREEOH-2728 : WCM - Forms rendering issue using IE6
16889: Merged V3.1 to V3.2
16888: Merged V2.2 to V3.1
16694: Fix for ETHREEOH-1384/ACT 11135: Poor performance when using webscript based web forms
16787: Fixed Web-Client Eclipse project after recent chiba JAR file name change
16840: Resolution to issue in ETHREEOH-2633: Change to Common.js function implemented in CHK-5134 causes problems with missing icons in Navigator panel. Implemented configuration approach so that both modes can be supported.
16870: Fix for ETWOTWO-119 & ALFCOM-332: WCM config override issues where the OOTB web-client-config-wcm.xml file needed to be changed and the ability to define custom scripts to load to avoid the need to edit xforms.js or XFormsProcessor.java
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16681: Fixed ETHREEOH-2454 "It's possible to create a group with less than 3 symbols in JSF client, but it's impossible to find it in Share client"
- Group name can now only be between 3-100 characters in webclient
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16901 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13249: Fix for ETHREEOH-1064 and ETHREEOH-1286 and fix for issue where New Page action not activated in Share Wiki page list.
13251: Final part of fix for ETHREEOH-1270 - Group pickers in JSF client now use new findAuthorities() API to find groups for user searches - over 10x quicker for installations with many groups.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13173: Merged V2.1-A to V3.1
10964: Fix for ADB-81: String 'Template' in Japanese is not good format
10971: Fix for ADB-85: Configure dashboard wizard: long items description get truncated
10972: Fix for ADB-95: All templates should be parameterized using a such that they pickup the server name and port number of the current installation
10973: Fix for ADB-117: Configure Dashboard Wizard. Layout word (Step 3) not localized for japanese and french
13174: Merged V2.1-A to V3.1
10975: Fix for ADB-118: Content attributes not localized [client templates]
13182: Merged V2.1-A to V3.1
11058: Fix for ADB-121: Next & Finish button remain disabled in 'Create Content in your home space' wizard even after entering name when locale is set to French
11059: Fix for ADB-128: Date format is different for 'Manage Content Rules' in Japanese Locale
13190: Merged V2.1-A to V3.1
11070: Fix for ADB-120 ACT 4773
13192: Merged V2.1-A to V3.1
11195: Fix for ADB-130: The 'Finish' button doesn't work after editing the content
13193: Merged V2.1-A to V3.1
8395: Remove user and group admin actions from Admin console [added config switch - off by default]
8584: Removed option for user to change password [added config switch - off by default]
10203: Fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default]
10374: Further fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default]
13194: Merged V2.1-A to V3.1
12095: Fix for ADB-131
13195: Merged V2.1-A to V3.1
12097: Fix for ADB-133, ADB-134
12102: Fix for ADB-139
13196: Merged V2.1-A to V3.1
12350: Fix for ADB-142
13197: Merged V2.1-A to V3.1
12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards
12878: Merged record-only for V2.1-A to HEAD
12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards
13198: Merged V2.1-A to V3.1
12977: Fix for ADB-158: Intermittent error while accessing the login page
13142: Another fix for ADB-158: Intermittent error while accessing the login page
13199: Merged V2.1-A to V3.1
11589: Fix for ADB-95: All templates should be parameterized
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13570 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
13084: Merged V2.1-A to V3.1
7984: *RECORD-ONLY* Final part of fix for ACT 819, by default the web-client now generates WebScript content download API based URLs to allow relative paths to be resolved in HTML content files
13086: Merged V2.1-A to V3.1
7986: *RECORD-ONLY* Additional for ACT 819, View In Browser details page links and cm:link objects to content now output Content API webscript urls
13090: Merged V2.1-A to V3.1
7986: Language locale auto-selection based on browser locale - see ACT 1053
NOTE: a web-client-config setting has been added to enable this - it is off by default.
13093: Merged V2.1-A to V3.1
8255: Filetypes and PanelGenerator enhancements
13094: Merged V2.1-A to V3.1
8547: Branding changes from Mike [just filetypes merged]
13095: Merged V2.1-A to V3.1
8555: Webdav path support for ExternalAccessServlet browse navigation
13103: Merged V2.1-A to V3.1
8592: Fix for login page issue with language locale auto-selection - see ACT 1053
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12943: Port of support for ADB-47 from V2.1-A to 3.1
12948: Port of tests from CHK-2235 for ADB-20 from V2.1-A to 3.1
12965: Activated index tracker Quartz job by default
12974: Port for lazy creation of home folders with configuration from V2.1-A to V3.1: original CHK-2619, CHK-2716
12976: Merged V2.1A to V3.1
8562: (record-only) Fix to lazily create home folders - DO NOT MERGE
8694: (record-only) Added configuration for lazy or eager creation of home folders
12978: Merged V3.0 to V3.1
12920: Merged V2.2 to V3.0
12456: Wire up AVM locking service by interface to allow for potential over-ride
12457: Make AVM ChildKey case insensitive
12470: Merged V2.2.1-NBC-FIXES to V2.2
12156: Optimizations to WCMWorkflowEvaluator and WCMWorkflowDeletedEvaluator
12605: Hide annoying "Virtualisation Server not started" warnings (by making them debug)
12707: AVM console - "snap" also allows tag and description to be specified
12979: Build/test fix
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/DEV/V2.2.1-NBC-FIXES:r12156
Merged /alfresco/BRANCHES/V2.1-A:r8562,8694
Merged /alfresco/BRANCHES/V3.0:r12920
Merged /alfresco/BRANCHES/V2.2:r12456-12457,12470,12605,12707
Merged /alfresco/BRANCHES/V3.1:r12943,12948,12965,12974,12976,12978-12979
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13544 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7127: Merged V2.1 to V2.2
7118: Fixed overly-eager applicability of patches brought forward from previous releases
7119: Fixed SQL script patch schema numbering
7245: Merged V2.1 to V2.2:
7238: Serializes alfresco->alfresco deployments to the same target.
7241: Added AVM index tracking into the built-in, cron-controlled config.
7242: More DEBUG messages for index tracking, where required.
7243: Fix for url encoding issue as found by by Ishii Akinori
7372: Merged V2.1 to V2.2
7289: Fix for AWC-1542 where utf-8 characters not displaying correctly in RSS feed output
7300: Bumped up session size management values to reduce potential issues with mix-style, shorter transactions.
7303: Portlet updates for MSIE problems in Liferay.
7304: Added the <cifs-url-suffix>. AWC-1671.
7317: Fix OO shutdown
7319: Catch for raising rule executions using null NodeRefs.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7374 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
6486: Fix for AWC-1134 (Made minimum length for username and password configurable)
6487: Added "copy.verbose" property to build script to list all files being copied in the 'deploy-tomcat-exploded' and 'deploy-webclient-changes' targets
6488: Changed default CIFS server to remove underscore as it can cause problems with OpenOffice.
6489: Fix for WCM-498 (Expired items that are deleted are not represented as such in the change request dialog or submit dialog)
6490: Fix for WCM-446 and WCM-624. Multi-select and All operations in Modified Files list respect items in workflow and ignore them.
6491: Fixes profoundly brain dead behavior in AVMLockingService.init().
6492: Refactoring of LookupCache to be clustering compatible
6493: Staging and locking changes
6494: WCM Revert action moved to end of all action lists to avoid accidently clicking it (as it has no confirmation screen!)
6496: Fixes for WCM-746 and WCM-747 - Edit File Properties and Edit Folder Properties working correctly again for AVM objects.
6497: Enable virtualization server to be (re)started at any point prior or during the startup of the alfresco webapp (fixes WCM-750).
6498: WCM-742 - moving locks from the preview sandbox to the main user sandbox.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
New Template AVM API methods added to generate staging, user sandbox and path asset URLs for virtualisation server.
Some refactoring of constants used in AVMConstants into JNDIConstants to allow repository classes to also use them.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5624 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
