15297: Merged V3.1 to V3.2
15093: Merged V2.1-A to V3.1
12428: Fix for ADB-150
13461: Fix for ADB-163 - Generic picker now resizes but has minimum width
13462: Fix for ADB-164 ACT 7788 - Search button label now configurable as component attribute.
13757: Fix for ADB-155
14113: Fix for ABD-143
14115: Fix for ADB-144
14493: Fixes for ADB-155 (correction) and ADB-161, ADB-184, ADB-185, ADB-186, ADB-188, ADB-189.
15162: Fix for ETHREEOH-2278 - missed during merge of ABD-143
15278: Fix for ETHREEOH-2474 - search regression
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15298 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
6609: Portlet UI (doclist, myspaces, mytasks) updates following design review
6610: AR-1270
6611: debugging WCM-778.
6612: Improved API documentation.
6613: Added store lookup cache to EHCache config for default and extended cluster sample
6614: AWC-1531 and AWC-1146. Link objects that have targets which the user does not have access to are now filtered from the view.
6615: AR-1664: Bootstraping from full export fails if file names differs only with a space: my file, my file
6616: Fixed AR-1519: Possible duplicate entries when moving nodes between stores
6617: Removed deprecated aspects; Added emailed aspect to messages; Added OOo command line options
6618: Fix for AWC-1350
6619: Fix for AWC-1509
6620: AWC-1179: Searching for users in Invite User Wizard is slow with large number of users
6621: Changed shutdown logic to avoid classloader cleanup race.
6622: Fix for AWC-1533 (can't save office docs to Company Home)
6623: Fix for AR-1705
6624: Better fix for AWC-1256 (links generated by tinyMCE editor)
6625: Fixed AR-1713: Transformers that do nothing don't break full text indexing
6626: Fixed AWC-1438: Added explcit TXT to PDF converter that wraps the PDFBox TextToPDF class
6627: Portlet templates now handle missing description property on web form
6628: Fix WCM-788
6635: Make workflow available for users who cannot see company home
Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\workflow\jbpm\JBPMEngine.java'
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6580: AVM bulk import performance tweaks.
6582: WCM-767, WCM-768
6583: Fix for AWC-1528 (potential NPE in ErrorsRenderer)
6584: Fix for AWC-1256 (Links produced by inline HTML editor are incorrect)
6585: AR-1635: event listeners added in a beforeCommit event are now executed successfully
6586: AR-1561 Update Web Scripts readme.html to be consistent with "Category Search Sample" (or vice-versa)
6587: Fix for AWC-1390 (Paste all doesn't work for forum items)
6588: AR-1701 Script getDocument call doesn't check for non-existent content
6589: Fix for AWC-1530 - Saved search does not work for custom properties of type d:text with list constraint
6591: Improvement for submit speed.
6592: Removed obsolete tests.
6594: Index tracking sample to include AVM index tracking
6595: Added the AVM helpers methods from the FreeMarker AVM API that were missing from the JavaScript API
6597: Rationalize post commit execution hooks for deployment receiver
6598: Properly escape path names for ProgramRunnable.
6599: AVM store name lookup cache is (theoretically) clusterable.
6600: Some or other gramatically incorrect stuff about Chiba.
6601: Fix for AR-1121 and AR-1673
6602: AR-1655: Versioning is not MLText aware
6603: Updated messages from lang packs
6604: Fixed AR-1476: JCR import end element escaping
6605: Updated Japanese lang messages
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6746 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
