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
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
13371: Fix for ETHREEOH-1371, ETHREEOH-1373, ETHREEOH-1374.
Rule comparator now correctly deals with MLTEXT datatype fields such as name/title/description.
13372: Fix for ETHREEOH-1291.
Fixes the general issue that "decodeURI()" should not be used to decode javascript encoded strings -unless- you specifically want to ignore certain characters, "unescape()" should be used instead.
13373: Fix for ETHREEOH-1284. Clean up of generated javascript for UIDataPager component - also moved to include file for performance and ease of modification.
13384: Fix for ETHREEOH-1459.
Sweep through and clean up of the Edit Online/Offline editing and Checkin/Checkout process as per latest wireframes.
A number of minor fixes to JSF action evaluators and related JSPs also.
Icons updated as per wires.
13396: Fix for ETHREEOH-1424. Web-framework script connector now generates an Accept-Language header based on current user locale by default for remote calls.
13404: Missing paging controls added to task and workflow dialogs (part of ETHREEOH-1410).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13596 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
12310: Merged V2.2 to V3.0
12306: Merged V2.1 to V2.2
12212: Final set of XSS and HTML encoding fixes for ETWOONE-90
12312: Merged V2.2 to V3.0
12311: Merged V2.1 to V2.2
11667: Fix for ETWOONE-389 - Current page number not always visible on the browse screen.
12316: Fix for merge issue
12317: Merged 2.1 to 3.0
12313: Fix for regression introduced when fixing ETWOONE-91. Also fixes ETHREEOH-1043
12319: Final set of XSS fixes specific to 3.0 codeline see ETWOONE-90
12321: Missing file from previous checkin
12324: Merged 2.2 to 3.0
12320: Merged 2.1 to 2.2
11682: Fix for ETWOONE-87: Behavior of delete cascade
12326: Merge 2.1 to 3.0
11615: Fix for ETWOONE-188: After session has timed out, expanding a space in the Navigator results in unfriendly error
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
11590: Explict list of Win binaries to include in tomcat bundle
11592: Created an extra class between NTLanManAuthContext and the AuthContext base class. ETHREEOH-601.
11593: Base the AuthTokenAuthContext on the new ChallengeAuthContext, implemented getChallenge() to retrieve the NTLM challenge from the auth token. ETHREEOH-601.
11595: Changes to FTP base code required for passthru authentication.
11596: Passthru FTP authenticator implementation.
11604: Fix for ETHREEOH-715: Forms drop down is still present in 'Create Content Wizard'
11605: Fix for ETHREEOH-726 - Unable to accept/reject email invite from Share when NTLM filter is enabled on web-tier.
11609: Final part of fix for ETHREEOH-726 - fix to issue where login page would be displayed even though user had authenticated correctly over NTLM.
11610: Correct NTLM sample config for web-tier.
11611: Fix to ETHREEOH-728 - RSS feeds now work when NTLM is enabled.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12478 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
- help cursor mouse over added to help icon
- incorrect alt text removed
- renamed output path pattern help jsp page to standard naming convention
. Found that all "Required Field" images in our JSPs with ALT text were not I18N - find-and-replaced all occurances with an I18Ned message
. Some more WCM UI improvements/fixes
. Fix up of 3rd Party Eclipse project after xalan library changes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
