13424: ETHREEOH-1242: Sample LDAP authentication config breaks site invites in Share
13427: Fixes for ETHREEOH-1157: Propagate exceptions using ReportedException
13428: Fix ETHREEOH-1493: Upgrade from 2.1-A to 3.1 uses incorrect patch id and fixes_to_schema
13429: Specific fix for ETHREEOH-1157: duplicate/triplicate users not properly prohibited
13436: Merged V2.2 to V3.1
13435: Merged V2.1 to V2.2
12307: Merged DEV/V2.1SP7 to 2.1
11927: ETWOONE-396
12112: ETWOONE-396
13437: Fixed ETHREEOH-1498: Mismatched closing XML tag in ehcache-custom.xml.sample.cluster
13439: Fix for ETHREEOH-1157: JSF Dialogs Absorbing Exceptions
13456: Fixed ETHREEOH-1472: Changes to systemBootstrap cause bootstrapping ACP's not to work
13469: Upgrade patch to update internal version2Store counter (follow-on fix for ETHREEOH-1540)
13491: Chaining example for DOC-84
13492: Fixed paths in zip file
13494: Fixed GenericBootstrapPatch when overriding bootstrap views
13495: Added @version javadoc
13496: Minor logging updates
13497: Fixed ETHREEOH-1431: Authentication case sensitivity switch doesn't work
13500: Temporary fix for Sharepoint issue raised last week
13502: ETHREEOH-1575: It's impossible to create Change Request task
13511: Fix for ETHREEOH-1549: Impossible to create HTML web content
13529: Fix for ETHREEOH-1595
13531: Fix for ETHREEOH-1607: Error on chaining example xml - malformed comment
13537: Build fix ... exclude the system user from auto creation
13538: Build Fix - further contraints to aviod auto-creation of guest
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1:r12307
Merged /alfresco/BRANCHES/V2.2:r13435
Merged /alfresco/BRANCHES/V3.1:r
13424,13427-13429,13436-13437,13439,13442-13450,13452,13454-13456,
13469-13473,13475-13476,13479-13480,13491-13500,13502,13511,13529-13538
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13285: Fix for ETHREEOH-1353 - Share Document URLs and Download URLs now can be opened in fresh browser session.
13292: Merged V2.1-A to V3.1
9099: *RECORD-ONLY* Upgraded TinyMCE to 3.0.8 so Safari is supported
13294: Addition of TinyMCE lang packs for de, fr and jp.
Locale detection in JSPs that utilise TinyMCE editor.
NOTE: this makes the TinyMCE changes for rev 12136 on 2.1-A branch as merged.
13298: Fix for ETHREEOH-1365 - FreeMarker date info link now correct.
13299: I18N labels for page descriptions and associated fixes (from wabson)
13300: WebScript framework fixes for ETHREEOH-1357.
Set locale from browser headers when processing webscript directly via the webscript servlet.
Fix to caching of JSON webscript message resources based on current locale.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13589 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6636: Temporary hack to fix build.
6637: Better handling of binary string bufs, disable link validation when poll interval is <= 0
6638: Forgotten files for TXT to PDF transformer.
6639: Fix for AWC-1541
6641: Fix for WCM-792.
6642: A little extra PropertyValue support for createNode, too.
6643: Fix for WCM-791
6644: Closure of AR-1528: Check concurrency handling of DuplicateChildNodeNameException
6647: Fix WCM-794
6648: WCM-656
6650: Applied user supplied patch to fix AWC-1546 - Cannot mount AVM using CIFS on new alfresco installation.
6651: Index tidy ups
6654: Various minor updates for passthru authentication debugging and error handling.
6657: Fix for WCM-799 (Some items selected for submission were not present)
6659: Updated installers.
6660: Partial fix to AWC-1524
6661: Fix WCM-803
6664: Including hibernate-3.2.1.jar in $VIRTUAL_TOMCAT_HOME/server/lib/
6665: adding an automated unit test for output path patterns.
6668: Fixed to add shale-test-1.0.4.jar to Eclipse classpath (PHH oked)
6681: Fixes WCM-811 - Lookup.getIndirectionPath() had a bit of a howler in it.
6684: UncategorizedSQLException with the word 'deadlock' in the message is now cause for retrying a transaction.
6691: Fix for WCM-813 (lock not removed when expiration date set and no workflow on web project)
6696: Imporved SSO filters for SiteMinder etc + test filter
6697: Support for scheduled import
6699: Fix for the compliation target: compile-benchmarkframework
6701: Fix for 1.6 JVMs (1.5 gets by with lucky ordering)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6749 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- extracted file picker backing code into its own bean
- refactoring for to extract file picker bean
- refactoring to manage uploads from file picker outside of xforms context
- added some language utility methods to common.js
- refactored extension dialogs to deal with quirkyness of tinymce dialog codebase on IE - mostly works now and addressed bug WCM-471
- resourcifying a couple strings i missed in filepickerbean
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- WCM-351 fixes to select workflow screen on IE (weird onchange behavior)
- WCM-468 fixes to remove rendering engine
- doing the jsp 2.0 thing
- WCM-427 fix to encoding issue with parseXMLDocuements
- fix for remove rendering engine templates in create form (wasn't clearing the list in init)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- IE issues
- how to handle uploaded files from the create html context
- break out the filepicker backing code into its own bean (it's mingled into the XFormsBean at the moment)
also reorganizing and pruning the xforms unit test tree.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5613 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
- Added Edit and Delete actions for AVM files and Delete action for AVM folders
- Available on the Modified Items list for a user and also in the website sandbox browse screens
- Edit is working using the inline editors for plain text and HTML files - XML form content editing to be integrated shortly!
- Edit for non-inline editable files is working (i.e. download file), but no "Update" action available at present for saving updates
- Delete will delete files/folders structures from the current sandbox, deleted files in a layer are shown in My Modified Files (see below)
- User sandbox My Modified Files now shows deleted files as differences (as ghosted out rows)
- Refactoring of the modified Create Content Wizard into a new wizard Create Web Content Wizard
- responsible for creating content in the AVM store rather than usual SpacesStore
- removed XML specific handling from Create Content Wizard (now only present in Create Web Content Wizard)
- Create Content action added to sandbox view - NOTE: does not yet create content in the AVM world!
- Added "jsp" filetype as plain text format mimetype (to allow inline-edit for JSP files as website content)
- Open/closed state of My Modified Files panel is remembered between screen refreshes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
