28650: Merged DEV/TEMPORARY to V3.4-BUG-FIX
28637: ALF-5601: WCM Reviewer should be able to modify 'Launch Date' of the review item.
Set "wcmwf:launchDate" to read-only on "submitpendingTask".
28697: Fix for ALF-2711 - Fix to handle incorrect (negative size!) content length headers sent by Adobe Flash when uploading files over 2GB.
28702: Merged DEV to V3.4-BUG-FIX
28693: ALF-9314: Unable to add to multi-valued properties via AVM Console
The node property value of Collection type must be set within square braces
as a comma separated values without spaces. E.g. [aaa,bbb,ccc]
28718: Merged PATCHES/V3.4.2 to V3.4-BUG-FIX
28569: ALF-9253 / ALF-9166: 'A valid SecureContext was not provided in the RequestContext' exception on startup following upgrade to 3.4.1
28618: ALF-8385 / ALF-9364: Merged DEV/TEMPORARY to PATCHES/V3.4.2
28565: ALF-5887 Addition of RenameUser command line toolContext
- PersonServiceImpl should not disable normal behaviour when handling duplicate Person NodeRefs as the userAuthorityCache does not get updated correctly
- Tool (base class for Import, Export and RenameUser command line tools) should not automatically login if setLogin(false) has been called.
28719: Merged V3.4 to V3.4-BUG-FIX
28648: ALF-9103: Remove obsolete (and mis-spelled) use-old-dm-alcs-context.xml.sample
28701: Corrected library for - Fix for ALF-7860 - Regression: Close button doesn't work in Node Browser
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13853: Merged V3.0 to V3.1
13008: Merged V2.2 to V3.0
12824: (record only) Change admin access to the web project staging store to be read-only in the virtualization view - ETWOTWO-933
13031: (Record only) AMP fix for ETWOTWO-968: Space rules are not run when saving from MS Word
13040: Merged V2.2 to V3.0
12824: (record-only) - already done via r13005 (ETWOTWO-933)
13145: Merged V2.2 to V3.0:
13089: (record-only) Fix "Read-Write transaction started within read-only transaction" exception. ETWOTWO-1055.
13091: (record-only) Fix for NFS server "Read-Write transaction started within read-only transaction" exception. ETWOTWO-1054.
13508: ETHREEOH-1548 - allow config to reset (even if null/cache)
13514: ETHREEOH-1548 (follow-on fix) - to allow config to reset (even if null/cache) and also reduce 5 caches to 1
13848: Merged V2.2 to V3.0
13188: *RECORD ONLY* Using correct ooo startup context - does not work for *nix. Fixed in 3.0sp1
13212: *RECORD ONLY* AMP for ETWOTWO-984
13342: *RECORD ONLY* Merge info stuff
13435: Merged V2.1 to V2.2
12307: Merged DEV/V2.1SP7 to 2.1
11927: ETWOONE-396
12112: ETWOONE-396
13442: *RECORD ONLY* Updated version to 2.2.4dev
13468: *RECORD ONLY* Removed svn:mergeinfo crud
13470: I18NUtil doesn't cause NPE if message key doesn't exist
13471: Fixed ETWOTWO-1133: Incorrect CRC32 Values for non-ASCII names
13475: Test fix: I18NUtil.getMessage() no longer returns null, leading to NPEs if message bundle is missing
13476: Reverted back to null return values. Will save for fixing on HEAD.
13749: Fixed ALFCOM-2655: MLTranslationInterceptor doesn't handle getType method
13803: ETWOTWO-710
13819: *RECORD ONLY* ACT-6420 - Office 2003 "Install for all users" - DO NOT MERGE
13827: ETWOTWO-1172 - authority exists now checks nodeRef result
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r12824,13008,13031,13040,13089,13091,13145,13848
Merged /alfresco/BRANCHES/V2.2:r12824,13188,13212,13342,13442,13468,13470-13471,13475-13476,13749,13803,13827
Merged /alfresco/BRANCHES/V3.1:r13853
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14763 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
9241: Merged V2.2 to V2.9
9119: Merged V2.1 to V2.2
8671: Fix for AR-2221 - JavaScript scriptable Map objects recursively converted to Freemarker accessable maps
9256: Merged V2.2 to V2.9
9100: Merged V2.1 to V2.2
8728 <Not required>: Latest AMP changes for AR-2212
8731: Faster content store cleaner
8738: Fix for AWC 1930 - support simple bind when building DNs that contain a comma
8835: Fix regression issue as discussed in ACT 2019
8861: Fix WCM-1158
8866: Fixed AR-2272: Module Management Tool distribution is broken
8872: Fixed distribution of benchmark executable jar after EHCache upgrade
8933: Fix for ACT-2469
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9260 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
- supporting content in ANY properties (for Content Service and Exporter)
- moving Content related permission to sys:base as type can support a property of datatype CONTENT
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2505 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
AR-395 - Provide abstract bean definition for DictionaryBootstrap
Fix build issue; JCR Import failed due to recent extension config changes
Fix issue in ISO9075 encoder; failed to encode colon properly meaning that Discussion Posts (with have colon seperated dates in their name) were not importing/exporting.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2299 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
