16841: Fix for ETHREEOH-3046 - discussion post replies and further post content now all set to UTF-8 encoding format.
16853: Merged V3.1 to V3.2
13681: Disable CMIS Web Services.
13958: ETHREEOH-1625 - Incorrect save file process via Office Addin
14026: ETHREEOH-1805 - update GET login web script description to recommend use of POST login web script instead.
16861: Merged V3.1 to V3.2
14162: ETHREEOH-1733 - multiday events display correctly
14273: fix for ETHREEOH-2031
14274: fix for event not adjusted by height issue in week view, after adding
16867: Merged V3.1 to V3.2
15429: The solution is to remove 'label' and 'description attributes' and add appropriate 'label-id' and 'description-id' attributes in
web-client\config\alfresco\web-client-config.xml for dashlets. Appropriate ids were added into webclient.properties.
16677: ETHREEOH-1208 - Upload/recall documents with apostrophe/accent via Alfresco Office plugin
16869: Merged V3.1 to V3.2
16848: Merged V2.2 to V3.1
15217: Fix for ETWOTWO-1268. Check for existence of desired control on first step of the dialog.
15218: Fix for ETWOTWO-1269. Remove node.hasPermission(PermissionService.CREATE_CHILDREN) from CheckoutDocEvaluator#evaluate method (like 3.2 version).
16849: Merged V2.2 to V3.1
15424: ETWOTWO-1349
16851: Merged V2.2 to V3.1
15432: **RECORD ONLY** Input characters validation script was modified to disallow !@#$%^&*().
15433: This check-in fixes ETWOTWO-1351, ETWOTWO-1352, ETWOTWO-1353 because their behaviour is similar.
16874: Merged DEV/TEMPORARY to V3.2
16789: ETHREEOH-1895: Incorrect working of Link Destination Details
16790: ETHREEOH-2372: Incorrect working of Link Destination Details
16791: ETHREEOH-2342: Error message appear when "Coordinator" try to remove himself from the space
16793: ETHREEOH-1364 & ETHREEOH-1367
16794: ETHREEOH-2358: Letters and special symbols can be typed in Date value of property while creation of Content Rule and it leads to error
16837: ETHREEOH-2631: two jsp:root elements cause compilation error in Weblogic 10.3.1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16956 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16673: Merged V3.1 to V3.2
16307: ETHREEOH-2814-2815
16393: ETHREEOH-2840: Failed to send email to group EVERYONE
16395: Just forget to add this file during previous (16393) CHECK-IN.
16430: Added license header to new Java file - applied coding standards and code comments.
16669: Merged V2.2 to V3.1
16650: ETWOTWO-1288 - Create Web project Wizard-Step3 :XSS attack can be made when configuring ASR or FSR
16668: Fix for ETWOTWO-1289 - My Web Files (Forms) dashlets XSS attack can be made when web project's details has been edited
16676: Merged V3.1 to V3.2
16675: Fix for ETHREEOH-2773 - Manage System users: system error happens when search is performed by a query that contains a space
16699: Fixes to SURF samples Login page - as per ALFCOM-3447 and ALFCOM-3448 contributions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
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
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
11982: Fix for ETHREEOH-906 - Writing the TICKET value directly to the page during template processing is a potential XSS security hole.
11983: Added back .html suffix to plain HTML form upload api call - added code comment to explain why it's there.
11984: Added debug/info level logging to Invite process.
11985: ETHREEOH-184: thumbnail assocs do not double up on check-in and thumbnail updates are done in one action
11986: Fix for ETHREEOH-905 - missing url encoding step for user password during webscript based login process.
11995: Unit test fixed up, fallout from runAs merge.
11998: Part of a fix for ETHREEOH-546 - Cannot save document to the any space for Microsoft Office
11999: Merged V2.2 to V3.0
11996: Fix for open Lucene ResultSet memory leaks
12000: ETHREEOH-692 - It is impossible to login to Alfresco from Microsoft Office add-in using NTLM authentication. ETHREEOH-546 - Cannot save document to the any space for Microsoft Office.
12001: Paging enabled by default in all Document Libraries
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12494 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
11829: Updated javadocs for RuntimeExec class
11830: Updated and wired in Spring source
11831: Fixed ETHREEOH-382: Can't run Lucene search via Node Browser
11832: Added unit test for V3.0 rev 11535
11834: Removed redundant TODO item
11835: ETHREEOH-798 Double clicking OK on most pop-up dialogs in Share causing multiple requests to be sent - and errors generated for the user
11836: Fix for a number of session based authentication and webscript authentication issues with NTLM from Share. Fixes ETHREEOH-806 and ETHREEOH-834 and first part of fix for ETHREEOH-789.
11838: Sharepoint Protocol Support
11843: Build fix
11846: Refactor of the SSO web filters (NTLM and Kerberos) for web-client and WebDAV.
11848: Added commented out entries for web-client and WebDAV Kerberos filter debugging.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7732: Support to cache null QName look ups ...
7733: Support for store ACLs
7741: Fix for over keen stiore ACLs ....
7794: Fix for WCM-1019, tasks show all assets as modified when only one has
7996: Fix for AWC-1519: cancelling discussion creation results in error
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7633: Fixed compilation fallout from PropertyValue changes
7640: Build Fix - missing purges for some stores
7645: Fixed line endings
7646: Tweaks to MySQL QName upgrade script after doing large 1.4.3 to 2.2 upgrade.
7648: Give more time per thread to cater for slow executions of test threads
7649: Fixed QName query flush modes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8440 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
